Changeset 9ac3d3

Timestamp:

Jul 19, 2018, 2:39:51 PM (6 years ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.6.1

Children:

209f4c

Parents:

ca2880

git-author:

Frederik Heber <frederik.heber@…> (07/19/18 14:39:04)

git-committer:

Frederik Heber <frederik.heber@…> (07/19/18 14:39:51)

Message:

FIX: Constrained locking in CodePattern's Notification and Observable.

• this is not a full soluton to possible race conditions with Qt's own threading but seems to help for the guichecks.

Location:

ThirdParty/CodePatterns/src/Observer

Files:

• Notification.cpp (modified) (1 diff)
• Observable.cpp (modified) (6 diffs)

ThirdParty/CodePatterns/src/Observer/Notification.cpp

@@ -52 +52 @@
 void Notification::notifyAll(Observable * const publisher)
 {
-  boost::recursive_mutex::scoped_lock guard(TargetsLock);
-  // copy such that signOff() within receiving update() does not affect iterating
-  // this is because within the same thread and with the update() signOff() may be
-  // called and when executed it modifies targets
-  targets_t temp_targets = targets;
+  targets_t temp_targets;
+  {
+    boost::recursive_mutex::scoped_lock guard(TargetsLock);
+    // copy such that signOff() within receiving update() does not affect iterating
+    // this is because within the same thread and with the update() signOff() may be
+    // called and when executed it modifies targets
+    temp_targets = targets;
+  }
   for(targets_t::iterator it=temp_targets.begin();
       it!=temp_targets.end();++it){

ThirdParty/CodePatterns/src/Observer/Observable.cpp

@@ -152 +152 @@
   // and call all observers
   try {
-    boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
-    GlobalObservableInfo::calltable_t& callTable = GlobalObservableInfo::getInstance().getcallTable();
-    const bool callTable_contains = callTable.find(this) != callTable.end();
+    bool callTable_contains;
+    {
+      boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+      GlobalObservableInfo::calltable_t& callTable = GlobalObservableInfo::getInstance().getcallTable();
+      callTable_contains = callTable.find(this) != callTable.end();
+    }
     if (callTable_contains) {
+      GlobalObservableInfo::callees_t callees;
+      {
+        boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+        GlobalObservableInfo::calltable_t& callTable = GlobalObservableInfo::getInstance().getcallTable();
+        callees = callTable[this];
+      }
       // elements are stored sorted by keys in the multimap
       // so iterating over it gives us a the callees sorted by
@@ -162 +171 @@
       // this is because within the same thread and with the updateKilled() signOff() may be
       // called and when executed it modifies targets
-      GlobalObservableInfo::callees_t callees = callTable[this];
       GlobalObservableInfo::callees_t::iterator iter;
       for(iter=callees.begin();iter!=callees.end();++iter){
@@ -178 +186 @@
   // send out all notifications that need to be done
   {
-    boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
-    GlobalObservableInfo::notificationSet currentNotifications =
-        (GlobalObservableInfo::getInstance().getnotifications())[this];
+    GlobalObservableInfo::notificationSet currentNotifications;
+    {
+      boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+      currentNotifications = (GlobalObservableInfo::getInstance().getnotifications())[this];
+    }
     for(GlobalObservableInfo::notificationSet::iterator it = currentNotifications.begin();
         it != currentNotifications.end();++it){
@@ -224 +234 @@
   }
   else {
-    boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
-    // see if we are in the process of changing ourselves
-    // if we are changing ourselves at the same time our sub-observables change
-    // we do not need to publish all the changes at each time we are called
-    std::map<Observable*, int>& depth = GlobalObservableInfo::getInstance().getdepth();
-    const bool depth_contains = depth.find(this)==depth.end();
+    bool depth_contains;
+    {
+      boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+      // see if we are in the process of changing ourselves
+      // if we are changing ourselves at the same time our sub-observables change
+      // we do not need to publish all the changes at each time we are called
+      std::map<Observable*, int>& depth = GlobalObservableInfo::getInstance().getdepth();
+      depth_contains = depth.find(this)==depth.end();
+    }
     if(depth_contains) {
 #ifdef LOG_OBSERVER
@@ -409 +422 @@
   }
   if(CallTable_contains) {
-    // copy the list from the map
-    boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
-    // copy such that signOff() within receiving subjectKilled() does not affect iterating
-    // this is because within the same thread and with the subjectKilled() signOff() may be
-    // called and when executed it modifies targets
-    GlobalObservableInfo::callees_t callees = (GlobalObservableInfo::getInstance().getcallTable())[this];
+    GlobalObservableInfo::callees_t callees;
+    {
+      // copy the list from the map
+      boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+      // copy such that signOff() within receiving subjectKilled() does not affect iterating
+      // this is because within the same thread and with the subjectKilled() signOff() may be
+      // called and when executed it modifies targets
+      callees = (GlobalObservableInfo::getInstance().getcallTable())[this];
+    }
     // delete all entries for this observable
     GlobalObservableInfo::callees_t::iterator iter;
@@ -420 +436 @@
       (*iter).second->subjectKilled(this);
     // erase the list in the map
-    (GlobalObservableInfo::getInstance().getcallTable()).erase(this);
+    {
+      boost::recursive_mutex::scoped_lock lock(GlobalObservableInfo::getInstance().getObservablesMapMutex());
+      (GlobalObservableInfo::getInstance().getcallTable()).erase(this);
+    }
   }