Skip to content

Small optimization: remove needless code from internal sched() calls #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Small optimization: remove needless code from internal sched() calls #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions timeout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,37 +320,53 @@ static inline int timeout_slot(int wheel, timeout_t expires) {
return WHEEL_MASK & ((expires >> (wheel * WHEEL_BIT)) - !!wheel);
} /* timeout_slot() */

static void timeouts_sched_nopending(struct timeouts *T, struct timeout *to);
static void timeouts_sched_future_nopending(struct timeouts *T, struct timeout *to);

static void timeouts_sched(struct timeouts *T, struct timeout *to, timeout_t expires) {
timeout_t rem;
int wheel, slot;

timeouts_del(T, to);

to->expires = expires;

TO_SET_TIMEOUTS(to, T);

if (expires > T->curtime) {
rem = timeout_rem(T, to);

/* rem is nonzero since:
* rem == timeout_rem(T,to),
* == to->expires - T->curtime
* and above we have expires > T->curtime.
*/
wheel = timeout_wheel(rem);
slot = timeout_slot(wheel, to->expires);

to->pending = &T->wheel[wheel][slot];
TAILQ_INSERT_TAIL(to->pending, to, tqe);
timeouts_sched_nopending(T, to);
} /* timeouts_sched() */

T->pending[wheel] |= WHEEL_C(1) << slot;
} else {
/* As 'timeouts_sched_future_nopending', but do not require that to->expires
* is in the future. */
static void timeouts_sched_nopending(struct timeouts *T, struct timeout *to) {
if (to->expires > T->curtime) {
timeouts_sched_future_nopending(T, to);
} else {
to->pending = &T->expired;
TAILQ_INSERT_TAIL(to->pending, to, tqe);
}
} /* timeouts_sched() */
}
} /* timeouts_sched_nopending() */

/* Insert 'to' into 'T'. Requres that to->expires is set, and set some time
* in the future. Requires that to is not pending or expired. Requires that
* TO_SET_TIMEOUTS has been set. */
static void timeouts_sched_future_nopending(struct timeouts *T, struct timeout *to) {
timeout_t rem;
int wheel, slot;

rem = timeout_rem(T, to);

/* rem is nonzero since:
* rem == timeout_rem(T,to),
* == to->expires - T->curtime
* and above we have expires > T->curtime.
*/
wheel = timeout_wheel(rem);
slot = timeout_slot(wheel, to->expires);

to->pending = &T->wheel[wheel][slot];
TAILQ_INSERT_TAIL(to->pending, to, tqe);

T->pending[wheel] |= WHEEL_C(1) << slot;
} /* timeouts_sched_future_nopending() */


#ifndef TIMEOUT_DISABLE_INTERVALS
Expand All @@ -367,7 +383,7 @@ static void timeouts_readd(struct timeouts *T, struct timeout *to) {
to->expires = T->curtime + (to->interval - r);
}

timeouts_sched(T, to, to->expires);
timeouts_sched_future_nopending(T, to);
} /* timeouts_readd() */
#endif

Expand Down Expand Up @@ -454,7 +470,7 @@ TIMEOUT_PUBLIC void timeouts_update(struct timeouts *T, abstime_t curtime) {
TAILQ_REMOVE(&todo, to, tqe);
to->pending = NULL;

timeouts_sched(T, to, to->expires);
timeouts_sched_nopending(T, to);
}

return;
Expand Down