]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: Remove wheel name it is no longer used
authorDonald Sharp <sharpd@nvidia.com>
Thu, 31 Oct 2024 17:55:48 +0000 (13:55 -0400)
committerDonald Sharp <sharpd@nvidia.com>
Thu, 31 Oct 2024 17:55:48 +0000 (13:55 -0400)
With commit:
60a3efec2458d9a1531f8204d0e4a91729d3fc00

The ability for the wheel code to display the name of what
wheel was actually being run was removed from the system.
Since we can no longer do this and it's been 4 years since it's
been in, let's just remove this bit of dead code.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
lib/wheel.c
lib/wheel.h

index 2520e81d49698369231368357e683d51b5402839..3e90693b455b5fdc78c2d06997ece21cd2bdc1c4 100644 (file)
@@ -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);
 }
 
index 0d9ac10020720017e724df77f6ca26428bc50835..a8fa2f956492235e817d08b94c1a067ebef2db5f 100644 (file)
@@ -12,7 +12,6 @@ extern "C" {
 #endif
 
 struct timer_wheel {
-       char *name;
        struct event_loop *master;
        int slots;
        long long curr_slot;