osd: switching dispatch_running to be a counter

Now it works with multiple messengers dispatching.

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f532b65270053dac2c7acb0ee35b3106a37bf452..c52a8b713f055b0522c74417af970c9ca0c29fe0 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1846,9 +1846,9 @@ bool OSD::ms_dispatch(Message *m)
 {
   // lock!
   osd_lock.Lock();
-  dispatch_running = true;
+  ++dispatch_running;
   _dispatch(m);
-  dispatch_running = false;
+  --dispatch_running;
   do_waiters();
   osd_lock.Unlock();
   return true;

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 8e86991f46a7a6e3fb70d1898afd82029bc176d9..462513cfcff21151b265231d71a9be6f94d2b09e 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -130,7 +130,7 @@ protected:
     }
   };
 
-  bool dispatch_running;
+  int dispatch_running;
 
   void open_logger();
   void start_logger();