[Sumover-dev] [svn commit] r4751 - vic/branches/cc/cc

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Wed Mar 31 17:34:12 2010
New Revision: 4751

Modified:
   vic/branches/cc/cc/cc_timer.cpp
   vic/branches/cc/cc/cc_timer.h

Log:
fixing timer issue



Modified: vic/branches/cc/cc/cc_timer.cpp
==============================================================================
--- vic/branches/cc/cc/cc_timer.cpp	(original)
+++ vic/branches/cc/cc/cc_timer.cpp	Wed Mar 31 17:34:12 2010
@@ -40,21 +40,23 @@
 		abort();
 
 	msched((int)delay);
-	status_ = TIMER_HANDLING;
+	//status_ = TIMER_HANDLING;
+	set_timer_pending();
 }
 
 void CcTimerHandler::resched(double delay) {
-	fprintf(stderr, "resched by %d\n", (int)delay);
 	if (status_ == TIMER_PENDING)
 		return;
 
 	msched((int)delay);
-	status_ = TIMER_HANDLING;
+	//status_ = TIMER_HANDLING;
+	set_timer_pending();
 }
 
 void CcTimerHandler::cancel() {
 	if (status_ != TIMER_PENDING)
 		abort();
 
-	status_ = TIMER_IDLE;
+	//status_ = TIMER_IDLE;
+	set_timer_idle();
 }

Modified: vic/branches/cc/cc/cc_timer.h
==============================================================================
--- vic/branches/cc/cc/cc_timer.h	(original)
+++ vic/branches/cc/cc/cc_timer.h	Wed Mar 31 17:34:12 2010
@@ -46,6 +46,9 @@
 	void cancel();
 	enum CcTimerStatus {TIMER_IDLE, TIMER_PENDING, TIMER_HANDLING};
 	inline int status() { return status_; };
+	inline void set_timer_idle() { status_ = TIMER_IDLE; };
+	inline void set_timer_pending() { status_ = TIMER_PENDING; };
+	inline void set_timer_handling() { status_ = TIMER_HANDLING; };
 
 protected:
 	int status_;