Changeset 4828

Timestamp:

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

Author:

Christoph Mayer

Message:

timer reset function

Location:

source/ariba/utility/system

Files:

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

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;

source/ariba/utility/system/Timer.h

@@ -65 +65 @@
         ~Timer();
 
+        /**
+         * Set the interval for the timer
+         *
+         * @param millis Timer interval in milliseconds
+         * @param oneshot Is this a one-shot or periodic timer
+         */
         void setInterval(unsigned int millis, bool oneshot=false);
+
+        /**
+         * Start the timer
+         */
         void start();
+
+        /**
+         * Stop the timer
+         */
         void stop();
+
+        /**
+         * Reset a running timer and ignore the remaining interval
+         * time. Start the timer with a new timer interval.
+         */
+        void reset();
 
 protected: