diff --git a/lib/wheel.c b/lib/wheel.c index 2520e81d49..3e90693b45 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -18,7 +18,7 @@ static int debug_timer_wheel = 0; static void wheel_timer_thread(struct event *t); -static void wheel_timer_thread_helper(struct event *t) +static void wheel_timer_thread(struct event *t) { struct listnode *node, *nextnode; unsigned long long curr_slot; @@ -51,15 +51,6 @@ static void wheel_timer_thread_helper(struct event *t) wheel->nexttime * slots_to_skip, &wheel->timer); } -static void wheel_timer_thread(struct event *t) -{ - struct timer_wheel *wheel; - - wheel = EVENT_ARG(t); - - event_execute(wheel->master, wheel_timer_thread_helper, wheel, 0, NULL); -} - struct timer_wheel *wheel_init(struct event_loop *master, int period, size_t slots, unsigned int (*slot_key)(const void *), @@ -70,7 +61,6 @@ struct timer_wheel *wheel_init(struct event_loop *master, int period, wheel = XCALLOC(MTYPE_TIMER_WHEEL, sizeof(struct timer_wheel)); - wheel->name = XSTRDUP(MTYPE_TIMER_WHEEL, run_name); wheel->slot_key = slot_key; wheel->slot_run = slot_run; @@ -101,7 +91,6 @@ void wheel_delete(struct timer_wheel *wheel) EVENT_OFF(wheel->timer); XFREE(MTYPE_TIMER_WHEEL_LIST, wheel->wheel_slot_lists); - XFREE(MTYPE_TIMER_WHEEL, wheel->name); XFREE(MTYPE_TIMER_WHEEL, wheel); } diff --git a/lib/wheel.h b/lib/wheel.h index 0d9ac10020..a8fa2f9564 100644 --- a/lib/wheel.h +++ b/lib/wheel.h @@ -12,7 +12,6 @@ extern "C" { #endif struct timer_wheel { - char *name; struct event_loop *master; int slots; long long curr_slot;