kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 02:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

sched: Make sched_settime() return void because it cannot fail

Browse Source 
Change-Id: I66b8b2b2778f186919d73ae9bf592104b8fb1cd5
This commit is contained in:
Sean Bright
2019-01-17 10:56:35 -05:00
parent 44a862fb57
commit 011e46d5a6
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main/sched.c
View File

@@ -483,7 +483,7 @@ static void schedule(struct ast_sched_context *con, struct sched *s)
* given the last event *tv and the offset in milliseconds 'when', * given the last event *tv and the offset in milliseconds 'when',
* computes the next value, * computes the next value,
*/ */
static int sched_settime(struct timeval *t, int when) static void sched_settime(struct timeval *t, int when)
{ {
struct timeval now = ast_tvnow(); struct timeval now = ast_tvnow();
@@ -505,7 +505,6 @@ static int sched_settime(struct timeval *t, int when)
if (ast_tvcmp(*t, now) < 0) { if (ast_tvcmp(*t, now) < 0) {
*t = now; *t = now;
} }
return 0;
} }
int ast_sched_replace_variable(int old_id, struct ast_sched_context *con, int when, ast_sched_cb callback, const void *data, int variable) int ast_sched_replace_variable(int old_id, struct ast_sched_context *con, int when, ast_sched_cb callback, const void *data, int variable)
@@ -536,12 +535,10 @@ int ast_sched_add_variable(struct ast_sched_context *con, int when, ast_sched_cb
tmp->variable = variable; tmp->variable = variable;
tmp->when = ast_tv(0, 0); tmp->when = ast_tv(0, 0);
tmp->deleted = 0; tmp->deleted = 0;
if (sched_settime(&tmp->when, when)) {
sched_release(con, tmp); sched_settime(&tmp->when, when);
} else { schedule(con, tmp);
schedule(con, tmp); res = tmp->sched_id->id;
res = tmp->sched_id->id;
}
} }
#ifdef DUMP_SCHEDULER #ifdef DUMP_SCHEDULER
/* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */ /* Dump contents of the context while we have the lock so nothing gets screwed up by accident. */
@@ -787,11 +784,8 @@ int ast_sched_runq(struct ast_sched_context *con)
* If they return non-zero, we should schedule them to be * If they return non-zero, we should schedule them to be
* run again. * run again.
*/ */
if (sched_settime(&current->when, current->variable? res : current->resched)) { sched_settime(&current->when, current->variable ? res : current->resched);
sched_release(con, current); schedule(con, current);
} else {
schedule(con, current);
}
} else { } else {
/* No longer needed, so release it */ /* No longer needed, so release it */
sched_release(con, current); sched_release(con, current);