kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-02 06:38:04 +00:00
Code Issues Projects Releases Wiki Activity

Improve error handling

Browse Source
This commit is contained in:
Christopher Rienzo 2011-12-06 22:36:05 +00:00
parent 4e5560a980
commit 0ed06ad710
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mod/timers/mod_posix_timer/mod_posix_timer.c
View File

@ -82,15 +82,16 @@ static switch_status_t posix_timer_start_interval(interval_timer_t *it, int inte
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
it->users++; if (it->users <= 0) {
if (it->users > 1) { /* reset */
return SWITCH_STATUS_SUCCESS;
}
it->tick = 0; it->tick = 0;
it->users = 0;
/* reuse, if possible */
if (it->mutex == NULL) {
switch_mutex_init(&it->mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&it->mutex, SWITCH_MUTEX_NESTED, globals.pool);
switch_thread_cond_create(&it->cond, globals.pool); switch_thread_cond_create(&it->cond, globals.pool);
}
/* create the POSIX timer. Will notify the posix_timer_notify thread on ticks. */ /* create the POSIX timer. Will notify the posix_timer_notify thread on ticks. */
memset(&sigev, 0, sizeof(sigev)); memset(&sigev, 0, sizeof(sigev));
@ -110,7 +111,9 @@ static switch_status_t posix_timer_start_interval(interval_timer_t *it, int inte
if (timer_settime(it->timer, 0, &val, NULL) == -1) { if (timer_settime(it->timer, 0, &val, NULL) == -1) {
return SWITCH_STATUS_GENERR; return SWITCH_STATUS_GENERR;
} }
}
it->users++;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
@ -119,12 +122,13 @@ static switch_status_t posix_timer_start_interval(interval_timer_t *it, int inte
*/ */
static switch_status_t posix_timer_stop_interval(interval_timer_t *it) static switch_status_t posix_timer_stop_interval(interval_timer_t *it)
{ {
if (it->users > 0) {
it->users--; it->users--;
if (it->users > 0) if (it->users == 0) {
return SWITCH_STATUS_SUCCESS;
timer_delete(it->timer); timer_delete(it->timer);
memset(&it->timer, 0, sizeof(it->timer)); memset(&it->timer, 0, sizeof(it->timer));
}
}
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }