[Wormux-dev] [PATCH] Protect action list better against concurrent modification.

Wed, 09 Sep 2009 12:40:40 -0700 

---
 src/include/action_handler.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/include/action_handler.cpp b/src/include/action_handler.cpp
index 43043f9..30ab8a1 100644
--- a/src/include/action_handler.cpp
+++ b/src/include/action_handler.cpp
@@ -1106,18 +1106,16 @@ void ActionHandler::ExecActions()
 {
   Action * a;
   std::list<Action*>::iterator it;
+  Lock();
   for (it = queue.begin(); it != queue.end() ;)
   {
-    Lock();
     a = (*it);
     //Time::GetInstance()->RefreshMaxTime((*it)->GetTimestamp());
     // If action is in the future, wait for next refresh
     if (a->GetTimestamp() > Time::GetInstance()->Read()) {
-      UnLock();
       it++;
       continue;
     }
-    UnLock();
 
     // Do not execute actions from Network if we are not connected anymore
     if (!a->GetCreator()
@@ -1131,6 +1129,7 @@ void ActionHandler::ExecActions()
     delete *it;
     it = queue.erase(it);
   }
+  UnLock();
 }
 
 void ActionHandler::NewAction(Action* a, bool repeat_to_network)
-- 
1.6.0.4


_______________________________________________
Wormux-dev mailing list
Wormux-dev@gna.org
https://mail.gna.org/listinfo/wormux-dev

Répondre à