Changeset 7468 for source/ariba/utility

Timestamp:

Jan 25, 2010, 10:50:57 AM (14 years ago)

Author:

Christoph Mayer

Message:

-timer delete fix (noch auskommentiert), -interface cleanup

Location:

source/ariba/utility/system

Files:

• SystemQueue.cpp (modified) (2 diffs)
• SystemQueue.h (modified) (2 diffs)
• Timer.cpp (modified) (1 diff)
• Timer.h (modified) (1 diff)

source/ariba/utility/system/SystemQueue.cpp

@@ -95 +95 @@
 }
 
+void SystemQueue::dropAll( const SystemEventListener* mlistener){
+#ifndef UNDERLAY_OMNET
+        directScheduler.dropAll(mlistener);
+        delayScheduler.dropAll(mlistener);
+#endif
+}
+
 bool SystemQueue::isEmpty() {
 #ifndef UNDERLAY_OMNET
@@ -192 +199 @@
 }
 
+void SystemQueue::QueueThread::dropAll( const SystemEventListener* mlistener) {
+        boost::mutex::scoped_lock lock( queueMutex );
+
+        bool deleted = false;
+        do{
+                EventQueue::iterator i = eventsQueue.begin();
+                EventQueue::iterator iend = eventsQueue.end();
+
+                for( ; i != iend; i++){
+                        if((*i).getListener() == mlistener){
+                                eventsQueue.erase(i);
+                                deleted = true;
+                                break;
+                        }
+                }
+        }while(deleted);
+}
+
 void SystemQueue::QueueThread::threadFunc( QueueThread* obj ) {
 

source/ariba/utility/system/SystemQueue.h

@@ -125 +125 @@
 
         /**
+         * Drop all queued events for that listener
+         */
+        void dropAll( const SystemEventListener* mlistener);
+
+        /**
          * Check wheter this queue has items or not.
          *
@@ -182 +187 @@
                 void enter();
                 void leave();
+                void dropAll( const SystemEventListener* mlistener);
 
         protected:

source/ariba/utility/system/Timer.cpp

@@ -100 +100 @@
         running = false;
         reset(); // cause the sleep to abort
+        //SystemQueue::instance().dropAll(this);
 }
 

source/ariba/utility/system/Timer.h

@@ -40 +40 @@
 #define __TIMER_H
 
+#include <stdint.h>
 #include "ariba/utility/system/SystemEventListener.h"
 #include "ariba/utility/system/SystemQueue.h"