1 files changed, 28 insertions, 26 deletions

diff --git a/AudioManagerUtilities/include/CAmSocketHandler.h b/AudioManagerUtilities/include/CAmSocketHandler.h
index 717f792..db3207e 100644
--- a/AudioManagerUtilities/include/CAmSocketHandler.h
+++ b/AudioManagerUtilities/include/CAmSocketHandler.h
@@ -215,6 +215,15 @@ public:
   */
 class CAmSocketHandler
 {
+    typedef enum:uint8_t
+    {
+        ADD     = 0u, // new, uninitialized element which needs to be added to ppoll array
+        UPDATE  = 1u, // update of event information therefore update ppoll array
+        VALID   = 2u, // it is a valid element in ppoll array
+        REMOVE  = 3u, // remove from ppoll array and internal map
+        INVALID = 4u  // uninit element requested to be removed from internal map only
+    } poll_states_e;
+
     struct sh_poll_s //!<struct that holds information about polls
     {
         sh_pollHandle_t handle; //!<handle to uniquely adress a filedesriptor
@@ -224,9 +233,10 @@ class CAmSocketHandler
         std::function<bool(const sh_pollHandle_t handle, void* userData)> checkCB; //check callback
         std::function<bool(const sh_pollHandle_t handle, void* userData)> dispatchCB; //dispatch callback
         void* userData;
+        poll_states_e state;
 
         sh_poll_s() :
-                handle(0), pollfdValue(), prepareCB(), firedCB(), checkCB(), dispatchCB(), userData(0)
+            handle(0), pollfdValue(), prepareCB(), firedCB(), checkCB(), dispatchCB(), userData(0), state(ADD)
         {}
     };
 
@@ -244,7 +254,7 @@ class CAmSocketHandler
         sh_timer_s() :
                 handle(0)
 #ifdef WITH_TIMERFD
-                        , fd(0)
+                        , fd(-1)
 #endif
                         , countdown(), callback(), userData(0)
         {}
@@ -271,42 +281,43 @@ class CAmSocketHandler
     };
 
     typedef std::reverse_iterator<sh_timer_s> rListTimerIter; //!<typedef for reverseiterator on timer lists
-    typedef std::vector<pollfd> VectorListPollfd_t; //!<vector of filedescriptors
-    typedef std::vector<sh_poll_s> VectorListPoll_t; //!<list for the callbacks
+    typedef std::vector<pollfd> VectorPollfd_t; //!<vector of filedescriptors
+    typedef std::map<int, sh_poll_s> MapShPoll_t; //!<list for the callbacks
     typedef std::vector<sh_signal_s> VectorSignalHandlers_t; //!<list for the callbacks
 
     typedef enum:uint8_t
     {
-        NO_ERROR = 0u,   // OK
-        PIPE_ERROR = 1u, // Pipe error
-        FD_ERROR = 2u,   // Invalid file descriptor
-        SFD_ERROR = 4u,
+        NO_ERROR = 0u,    // OK
+        FD_ERROR = 1u,    // Invalid file descriptor
+        MT_ERROR = 2u     // Multi-thread issue
     } internal_codes_e;
     typedef uint8_t internal_codes_t;
 
-    int mPipe[2];
+    int mEventFd;
+    int mSignalFd;
     bool mDispatchDone; //this starts / stops the mainloop
+    MapShPoll_t mMapShPoll; //!<list that holds all information for the ppoll
 
     sh_identifier_s mSetPollKeys; //!A set of all used ppoll keys
-    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
     internal_codes_t mInternalCodes;
-    sh_pollHandle_t mSignalFdHandle;
 #ifndef WITH_TIMERFD
     timespec mStartTime; //!<here the actual time is saved for timecorrection
 #endif
+
 private:
     bool fdIsValid(const int fd) const;
+    void wakeupWorker(const std::string & func, const uint64_t value = 1u);
 
     timespec* insertTime(timespec& buffertime);
 #ifdef WITH_TIMERFD      
     am_Error_e createTimeFD(const itimerspec & timeouts, int & fd);
-
 #else 
     void timerUp();
     void timerCorrection();
@@ -408,28 +419,21 @@ private:
       * @param a
       * @return
       */
-    inline static void fire(sh_poll_s& a);
-
-    /**
-      * functor to return all fired events
-      * @param a
-      * @return
-      */
-    inline static bool eventFired(const pollfd& a);
+    inline static void fire(const sh_poll_s& a);
 
     /**
       * functor to help find the items that do not need dispatching
       * @param a
       * @return
       */
-    inline static bool noDispatching(const sh_poll_s& a);
+    inline static bool noDispatching(const sh_poll_s* a);
 
     /**
       * checks if dispatching is already finished
       * @param a
       * @return
       */
-    inline static bool dispatchingFinished(const sh_poll_s& a);
+    inline static bool dispatchingFinished(const sh_poll_s* a);
 
     /**
       * timer fire callback
@@ -444,9 +448,7 @@ private:
       * @return handle
       */
     bool nextHandle(sh_identifier_s & handle);
-    
-    am_Error_e getFDPollData(const sh_pollHandle_t handle, sh_poll_s & outPollData);
-    
+
 public:
 
     CAmSocketHandler();