diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2018-03-27 16:00:38 +0200 |
|---|---|---|
| committer | Jens Lorenz <jlorenz@de.adit-jv.com> | 2018-04-09 17:00:47 +0200 |
| commit | ea6b62611af630e4bbfb06573d4cae322d71bde7 (patch) | |
| tree | 197b8bb986717d7902f414cc033117e7826b22b8 /AudioManagerUtilities/include/CAmSocketHandler.h | |
| parent | 8dd6a05689138a7cbb38f99ef775fe27df614f52 (diff) | |
| download | audiomanager-ea6b62611af630e4bbfb06573d4cae322d71bde7.tar.gz | |
AMUtil: Improve timer implementation and ensure that no fd leak happens
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerUtilities/include/CAmSocketHandler.h')
| -rw-r--r-- | AudioManagerUtilities/include/CAmSocketHandler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h index 717f792..0a696a7 100644 --- a/AudioManagerUtilities/include/CAmSocketHandler.h +++ b/AudioManagerUtilities/include/CAmSocketHandler.h @@ -244,7 +244,7 @@ class CAmSocketHandler sh_timer_s() : handle(0) #ifdef WITH_TIMERFD - , fd(0) + , fd(-1) #endif , countdown(), callback(), userData(0) {} @@ -291,7 +291,9 @@ class CAmSocketHandler VectorListPoll_t mListPoll; //!<list that holds all information for the ppoll sh_identifier_s mSetTimerKeys; //!A set of all used timer keys std::list<sh_timer_s> mListTimer; //!<list of all timers +#ifndef WITH_TIMERFD std::list<sh_timer_s> mListActiveTimer; //!<list of all currently active timers +#endif sh_identifier_s mSetSignalhandlerKeys; //!A set of all used signal handler keys VectorSignalHandlers_t mSignalHandlers; bool mRecreatePollfds; //!<when this is true, the poll list needs to be recreated |