diff options
| -rw-r--r-- | lib/wheel.c | 15 | ||||
| -rw-r--r-- | lib/wheel.h | 10 | ||||
| -rw-r--r-- | zebra/zebra_rib.c | 26 |
3 files changed, 1 insertions, 50 deletions
diff --git a/lib/wheel.c b/lib/wheel.c index 6e9c88de9d..f2776d6091 100644 --- a/lib/wheel.c +++ b/lib/wheel.c @@ -118,21 +118,6 @@ void wheel_delete(struct timer_wheel *wheel) XFREE(MTYPE_TIMER_WHEEL, wheel); } -int wheel_stop(struct timer_wheel *wheel) -{ - THREAD_OFF(wheel->timer); - return 0; -} - -int wheel_start(struct timer_wheel *wheel) -{ - if (!wheel->timer) - thread_add_timer_msec(wheel->master, wheel_timer_thread, wheel, - wheel->nexttime, &wheel->timer); - - return 0; -} - int wheel_add_item(struct timer_wheel *wheel, void *item) { long long slot; diff --git a/lib/wheel.h b/lib/wheel.h index 401789e1a0..1e5a31b9a6 100644 --- a/lib/wheel.h +++ b/lib/wheel.h @@ -90,16 +90,6 @@ struct timer_wheel *wheel_init(struct thread_master *master, int period, void wheel_delete(struct timer_wheel *); /* - * Pause the Wheel from running - */ -int wheel_stop(struct timer_wheel *wheel); - -/* - * Start the wheel running again - */ -int wheel_start(struct timer_wheel *wheel); - -/* * wheel - The Timer wheel being modified * item - The generic data structure that will be handed * to the slot_run function. diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index d5375105a9..fb684c3ecc 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -4337,25 +4337,6 @@ void rib_update_table(struct route_table *table, enum rib_update_event event, } } -static void rib_update_handle_vrf(vrf_id_t vrf_id, enum rib_update_event event, - int rtype) -{ - struct route_table *table; - - if (IS_ZEBRA_DEBUG_EVENT) - zlog_debug("%s: Handling VRF %s event %s", __func__, - vrf_id_to_name(vrf_id), rib_update_event2str(event)); - - /* Process routes of interested address-families. */ - table = zebra_vrf_table(AFI_IP, SAFI_UNICAST, vrf_id); - if (table) - rib_update_table(table, event, rtype); - - table = zebra_vrf_table(AFI_IP6, SAFI_UNICAST, vrf_id); - if (table) - rib_update_table(table, event, rtype); -} - static void rib_update_handle_vrf_all(enum rib_update_event event, int rtype) { struct zebra_router_table *zrt; @@ -4371,7 +4352,6 @@ static void rib_update_handle_vrf_all(enum rib_update_event event, int rtype) struct rib_update_ctx { enum rib_update_event event; - bool vrf_all; vrf_id_t vrf_id; }; @@ -4399,10 +4379,7 @@ static void rib_update_handler(struct thread *thread) ctx = THREAD_ARG(thread); - if (ctx->vrf_all) - rib_update_handle_vrf_all(ctx->event, ZEBRA_ROUTE_ALL); - else - rib_update_handle_vrf(ctx->vrf_id, ctx->event, ZEBRA_ROUTE_ALL); + rib_update_handle_vrf_all(ctx->event, ZEBRA_ROUTE_ALL); rib_update_ctx_fini(&ctx); } @@ -4422,7 +4399,6 @@ void rib_update(enum rib_update_event event) return; ctx = rib_update_ctx_init(0, event); - ctx->vrf_all = true; thread_add_event(zrouter.master, rib_update_handler, ctx, 0, &t_rib_update_threads[event]); |