kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

That's all, folks. Not going to update the Makefile until res_jabber is

Browse Source 
converted (snuffy, you there? :))


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137110 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-10 20:57:25 +00:00
parent 790fde68d9
commit 74bf61579f
4 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/sched.c
View File

@@ -245,17 +245,17 @@ static void schedule(struct sched_context *con, struct sched *s)
* given the last event *tv and the offset in milliseconds 'when',
* computes the next value,
*/
static int sched_settime(struct timeval *tv, int when)
static int sched_settime(struct timeval *t, int when)
{
struct timeval now = ast_tvnow();
/*ast_debug(1, "TV -> %lu,%lu\n", tv->tv_sec, tv->tv_usec);*/
if (ast_tvzero(*tv)) /* not supplied, default to now */
*tv = now;
*tv = ast_tvadd(*tv, ast_samp2tv(when, 1000));
if (ast_tvcmp(*tv, now) < 0) {
if (ast_tvzero(*t)) /* not supplied, default to now */
*t = now;
*t = ast_tvadd(*t, ast_samp2tv(when, 1000));
if (ast_tvcmp(*t, now) < 0) {
ast_debug(1, "Request to schedule in the past?!?!\n");
*tv = now;
*t = now;
}
return 0;
}
@@ -428,7 +428,7 @@ char *ast_sched_report(struct sched_context *con, char *buf, int bufsiz, struct
void ast_sched_dump(const struct sched_context *con)
{
struct sched *q;
struct timeval tv = ast_tvnow();
struct timeval when = ast_tvnow();
#ifdef SCHED_MAX_CACHE
ast_debug(1, "Asterisk Schedule Dump (%d in Q, %d Total, %d Cache, %d high-water)\n", con->schedcnt, con->eventcnt - 1, con->schedccnt, con->highwater);
#else
@@ -439,7 +439,7 @@ void ast_sched_dump(const struct sched_context *con)
ast_debug(1, "|ID Callback Data Time (sec:ms) |\n");
ast_debug(1, "+-----+-----------------+-----------------+-----------------+\n");
AST_DLLIST_TRAVERSE(&con->schedq, q, list) {
struct timeval delta = ast_tvsub(q->when, tv);
struct timeval delta = ast_tvsub(q->when, when);
ast_debug(1, "|%.4d | %-15p | %-15p | %.6ld : %.6ld |\n",
q->id,
@@ -458,7 +458,7 @@ void ast_sched_dump(const struct sched_context *con)
int ast_sched_runq(struct sched_context *con)
{
struct sched *current;
struct timeval tv;
struct timeval when;
int numevents;
int res;
@@ -472,8 +472,8 @@ int ast_sched_runq(struct sched_context *con)
* help us get more than one event at one time if they are very
* close together.
*/
tv = ast_tvadd(ast_tvnow(), ast_tv(0, 1000));
if (ast_tvcmp(AST_DLLIST_FIRST(&con->schedq)->when, tv) != -1)
when = ast_tvadd(ast_tvnow(), ast_tv(0, 1000));
if (ast_tvcmp(AST_DLLIST_FIRST(&con->schedq)->when, when) != -1)
break;
current = AST_DLLIST_REMOVE_HEAD(&con->schedq, list);