Changeset 5302

Timestamp:

02/22/08 10:55:25 (7 months ago)

Author:

morris

Message:

Execute timer outside of lock so the timer function can reschedule another timer

Files:

• libwired/trunk/libwired/thread/wi-timer.c (modified) (2 diffs)

libwired/trunk/libwired/thread/wi-timer.c

@@ -140 +140 @@
-
-                        if(timer && timer->fire - interval <= _WI_TIMER_EPSILON)
-timer
+wi_retain(timer)
-                } else {
-                        diff = timer->fire - interval;
-
-                        if(diff <= _WI_TIMER_EPSILON) {
-timer
+wi_retain(timer)
-
-                                locked = false;
-                        } else {
-                                if(!wi_condition_lock_lock_when_condition(_wi_timer_lock, 1, diff))
-array_first_data(_wi_timers
+retain(wi_array_first_data(_wi_timers)
-                        } 
-                }
+
+                if(locked)
+                        wi_condition_lock_unlock_with_condition(_wi_timer_lock, 0);
-                
-                if(fire_timer) {
@@ -161 +164 @@
-                        if(timer->repeats)
-                                _wi_timer_schedule(fire_timer);
+                        
+                        wi_release(fire_timer);
-                }
-
-                if(locked)
-                        wi_condition_lock_unlock_with_condition(_wi_timer_lock, 0);
-                
-                if(++i % 100 == 0)