Fix for issue #79

[modules/shaper.git] / src / Events / Events_Loop.cpp

diff --git a/src/Events/Events_Loop.cpp b/src/Events/Events_Loop.cpp
index 40917a64f710c5b7d7c815fb3e8f62313ed0bd0d..95e9ea6a9b2fcb350d7e252783475f873debdb61 100644 (file)
--- a/src/Events/Events_Loop.cpp
+++ b/src/Events/Events_Loop.cpp
@@ -24,8 +24,12 @@ Events_ID Events_Loop::eventByName(const char* theName)
   char* aResult;
   string aName(theName);
   map<string, char*>::iterator aFound = CREATED_EVENTS.find(aName);
-  if (aFound == CREATED_EVENTS.end()) { //not created yet
-    aResult = strdup(theName); // copy to make unique internal pointer
+  if (aFound == CREATED_EVENTS.end()) {  //not created yet
+#ifdef WIN32
+    aResult = _strdup(theName);  // copy to make unique internal pointer
+#else
+    aResult = strdup(theName);  // copy to make unique internal pointer
+#endif
     CREATED_EVENTS[aName] = aResult;
   } else
     aResult = aFound->second;
@@ -33,19 +37,22 @@ Events_ID Events_Loop::eventByName(const char* theName)
   return Events_ID(aResult);
 }
 
-void Events_Loop::send(Events_Message& theMessage, bool isGroup)
+void Events_Loop::send(const boost::shared_ptr<Events_Message>& theMessage, bool isGroup)
 {
   // if it is grouped message, just accumulate it
   if (isGroup) {
-    Events_MessageGroup* aGroup = dynamic_cast<Events_MessageGroup*>(&theMessage);
+    boost::shared_ptr<Events_MessageGroup> aGroup = 
+      boost::dynamic_pointer_cast<Events_MessageGroup>(theMessage);
     if (aGroup) {
-      std::map<char*, Events_MessageGroup*>::iterator aMyGroup = 
-        myGroups.find(aGroup->eventID().eventText());
-      if (aMyGroup == myGroups.end()) { // create a new group of messages for accumulation
+      std::map<char*, boost::shared_ptr<Events_Message> >::iterator aMyGroup = myGroups.find(
+          aGroup->eventID().eventText());
+      if (aMyGroup == myGroups.end()) {  // create a new group of messages for accumulation
         myGroups[aGroup->eventID().eventText()] = aGroup->newEmpty();
         aMyGroup = myGroups.find(aGroup->eventID().eventText());
       }
-      aMyGroup->second->Join(*aGroup);
+      boost::shared_ptr<Events_MessageGroup> aStored =
+        boost::dynamic_pointer_cast<Events_MessageGroup>(aMyGroup->second);
+      aStored->Join(aGroup);
       return;
     }
   }
@@ -53,58 +60,64 @@ void Events_Loop::send(Events_Message& theMessage, bool isGroup)
   // TO DO: make it in thread and with usage of semaphores
 
   map<char*, map<void*, list<Events_Listener*> > >::iterator aFindID = myListeners.find(
-      theMessage.eventID().eventText());
+      theMessage->eventID().eventText());
   if (aFindID != myListeners.end()) {
     map<void*, list<Events_Listener*> >::iterator aFindSender = aFindID->second.find(
-        theMessage.sender());
+        theMessage->sender());
     if (aFindSender != aFindID->second.end()) {
       list<Events_Listener*>& aListeners = aFindSender->second;
-      for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
-        (*aL)->processEvent(&theMessage);
+      for (list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+        (*aL)->processEvent(theMessage);
     }
-    if (theMessage.sender()) { // also call for NULL senders registered
+    if (theMessage->sender()) {  // also call for NULL senders registered
       aFindSender = aFindID->second.find(NULL);
       if (aFindSender != aFindID->second.end()) {
         list<Events_Listener*>& aListeners = aFindSender->second;
-        for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
-          (*aL)->processEvent(&theMessage);
+        for (list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+          (*aL)->processEvent(theMessage);
       }
     }
   }
 }
 
 void Events_Loop::registerListener(Events_Listener* theListener, const Events_ID theID,
-                                  void* theSender)
+                                   void* theSender)
 {
   map<char*, map<void*, list<Events_Listener*> > >::iterator aFindID = myListeners.find(
       theID.eventText());
-  if (aFindID == myListeners.end()) { // create container associated with ID
+  if (aFindID == myListeners.end()) {  // create container associated with ID
     myListeners[theID.eventText()] = map<void*, list<Events_Listener*> >();
     aFindID = myListeners.find(theID.eventText());
   }
 
   map<void*, list<Events_Listener*> >::iterator aFindSender = aFindID->second.find(theSender);
-  if (aFindSender == aFindID->second.end()) { // create container associated with sender
+  if (aFindSender == aFindID->second.end()) {  // create container associated with sender
     aFindID->second[theSender] = list<Events_Listener*>();
     aFindSender = aFindID->second.find(theSender);
   }
   // check that listener was not registered wit hsuch parameters before
   list<Events_Listener*>& aListeners = aFindSender->second;
-  for(list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
+  for (list<Events_Listener*>::iterator aL = aListeners.begin(); aL != aListeners.end(); aL++)
     if (*aL == theListener)
-      return; // avoid duplicates
+      return;  // avoid duplicates
 
   aListeners.push_back(theListener);
 }
 
 void Events_Loop::flush(const Events_ID& theID)
 {
-  std::map<char*, Events_MessageGroup*>::iterator aMyGroup = 
+  if (!myFlushActive)
+    return;
+  std::map<char*, boost::shared_ptr<Events_Message>>::iterator aMyGroup =
     myGroups.find(theID.eventText());
-  if (aMyGroup != myGroups.end()) { // really sends
-    Events_MessageGroup* aGroup = aMyGroup->second;
+  if (aMyGroup != myGroups.end()) {  // really sends
+    boost::shared_ptr<Events_Message> aGroup = aMyGroup->second;
     myGroups.erase(aMyGroup);
-    send(*aGroup, false);
-    delete aGroup;
+    send(aGroup, false);
   }
 }
+
+void Events_Loop::activateFlushes(const bool theActivate)
+{
+  myFlushActive = theActivate;
+}