Wed Jan 28 12:01:13 CST 2009 Pekka Pessi <first.last@nokia.com>
* su_timer.c: timers_remove() now set sut_heap_index to 0 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11850 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
b3256ae861
commit
8247926a88
|
@ -1 +1 @@
|
||||||
Wed Feb 11 11:14:50 CST 2009
|
Wed Feb 11 11:15:31 CST 2009
|
||||||
|
|
|
@ -225,7 +225,7 @@ su_timer_set0(su_timer_queue_t *timers,
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (SU_TIMER_IS_SET(t))
|
if (SU_TIMER_IS_SET(t))
|
||||||
timers_remove(timers[0], t->sut_heap_index)->sut_heap_index = 0;
|
timers_remove(timers[0], t->sut_heap_index);
|
||||||
|
|
||||||
t->sut_wakeup = wakeup;
|
t->sut_wakeup = wakeup;
|
||||||
t->sut_arg = arg;
|
t->sut_arg = arg;
|
||||||
|
@ -481,7 +481,7 @@ int su_timer_reset(su_timer_t *t)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (SU_TIMER_IS_SET(t))
|
if (SU_TIMER_IS_SET(t))
|
||||||
timers_remove(timers[0], t->sut_heap_index)->sut_heap_index = 0;
|
timers_remove(timers[0], t->sut_heap_index);
|
||||||
|
|
||||||
t->sut_wakeup = NULL;
|
t->sut_wakeup = NULL;
|
||||||
t->sut_arg = NULL;
|
t->sut_arg = NULL;
|
||||||
|
@ -526,7 +526,7 @@ int su_timer_expire(su_timer_queue_t * const timers,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
timers_remove(timers[0], 1)->sut_heap_index = 0;
|
timers_remove(timers[0], 1);
|
||||||
|
|
||||||
f = t->sut_wakeup; t->sut_wakeup = NULL;
|
f = t->sut_wakeup; t->sut_wakeup = NULL;
|
||||||
assert(f);
|
assert(f);
|
||||||
|
@ -609,7 +609,7 @@ int su_timer_reset_all(su_timer_queue_t *timers, su_task_r task)
|
||||||
if (su_task_cmp(task, t->sut_task))
|
if (su_task_cmp(task, t->sut_task))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
timers_remove(timers[0], i)->sut_heap_index = 0;
|
timers_remove(timers[0], i);
|
||||||
|
|
||||||
su_free(NULL, t);
|
su_free(NULL, t);
|
||||||
n++;
|
n++;
|
||||||
|
|
Loading…
Reference in New Issue