Changeset 4828 for source/ariba/utility/system/Timer.cpp

Timestamp:

Jul 9, 2009, 11:08:45 AM (16 years ago)

Author:

Christoph Mayer

Message:

timer reset function

File:

• source/ariba/utility/system/Timer.cpp (modified) (2 diffs)

source/ariba/utility/system/Timer.cpp

@@ -84 +84 @@
 }
 
+void Timer::reset(){
+#ifndef UNDERLAY_OMNET
+        if(timerThread == NULL) return;
+        timerThread->interrupt();
+#else
+        #error timer interruption not implemented for omnet
+#endif
+}
+
 void Timer::stop() {
         running = false;
+        reset(); // cause the sleep to abort
 }
 
@@ -97 +107 @@
 
         while( obj->running ) {
-                boost::this_thread::sleep( boost::posix_time::milliseconds(obj->millis) );
+
+                try{
+                        boost::this_thread::sleep( boost::posix_time::milliseconds(obj->millis) );
+                }catch(boost::thread_interrupted e){
+                        // exception called when Timer::reset is called
+                        // don't need to handle the exception
+                }
+
                 if (obj->running) SystemQueue::instance().scheduleEvent( SystemEvent( obj, TimerEventType, NULL), 0 );
                 if( obj->oneshot ) break;