diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2022-12-11 17:20:40 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-03-24 13:32:17 +0100 |
| commit | 2453d15dbf7fff2d897c2182886486732be8ac35 (patch) | |
| tree | 7a054859acf25689f67d5df7aa9d50b20bca4b62 /ldpd | |
| parent | *: Convert a bunch of thread_XX to event_XX (diff) | |
| download | frr-2453d15dbf7fff2d897c2182886486732be8ac35.tar.xz frr-2453d15dbf7fff2d897c2182886486732be8ac35.zip | |
*: Convert struct thread_master to struct event_master and it's ilk
Convert the `struct thread_master` to `struct event_master`
across the code base.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'ldpd')
| -rw-r--r-- | ldpd/ldp_snmp.c | 4 | ||||
| -rw-r--r-- | ldpd/ldp_zebra.c | 3 | ||||
| -rw-r--r-- | ldpd/ldpd.c | 4 | ||||
| -rw-r--r-- | ldpd/ldpd.h | 6 |
4 files changed, 8 insertions, 9 deletions
diff --git a/ldpd/ldp_snmp.c b/ldpd/ldp_snmp.c index 9a26a8d17..7ddd7bc88 100644 --- a/ldpd/ldp_snmp.c +++ b/ldpd/ldp_snmp.c @@ -1173,7 +1173,7 @@ static int ldp_snmp_nbr_state_change(struct nbr * nbr, int old_state) return 0; } -static int ldp_snmp_init(struct thread_master *tm) +static int ldp_snmp_init(struct event_master *tm) { hook_register(agentx_enabled, ldp_snmp_agentx_enabled); @@ -1182,7 +1182,7 @@ static int ldp_snmp_init(struct thread_master *tm) return 0; } -static int ldp_snmp_register_mib(struct thread_master *tm) +static int ldp_snmp_register_mib(struct event_master *tm) { static int registered = 0; diff --git a/ldpd/ldp_zebra.c b/ldpd/ldp_zebra.c index 6f0f990e4..1773d9c11 100644 --- a/ldpd/ldp_zebra.c +++ b/ldpd/ldp_zebra.c @@ -690,8 +690,7 @@ static zclient_handler *const ldp_handlers[] = { [ZEBRA_OPAQUE_MESSAGE] = ldp_zebra_opaque_msg_handler, }; -void -ldp_zebra_init(struct thread_master *master) +void ldp_zebra_init(struct event_master *master) { if_zapi_callbacks(ldp_ifp_create, ldp_ifp_up, ldp_ifp_down, ldp_ifp_destroy); diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c index c87bf1ea1..30c0472d9 100644 --- a/ldpd/ldpd.c +++ b/ldpd/ldpd.c @@ -77,7 +77,7 @@ static pid_t lde_pid; static struct frr_daemon_info ldpd_di; -DEFINE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm)); +DEFINE_HOOK(ldp_register_mib, (struct event_master * tm), (tm)); static void ldp_load_module(const char *name) { @@ -104,7 +104,7 @@ enum ldpd_process ldpd_process; #define LDP_VTY_PORT 2612 /* Master of threads. */ -struct thread_master *master; +struct event_master *master; /* ldpd privileges */ static zebra_capabilities_t _caps_p [] = diff --git a/ldpd/ldpd.h b/ldpd/ldpd.h index 4f20989c0..3d0615cc0 100644 --- a/ldpd/ldpd.h +++ b/ldpd/ldpd.h @@ -883,11 +883,11 @@ const char *pw_type_name(uint16_t); const char *pw_error_code(uint8_t); /* quagga */ -extern struct thread_master *master; +extern struct event_master *master; extern char ctl_sock_path[MAXPATHLEN]; /* ldp_zebra.c */ -void ldp_zebra_init(struct thread_master *); +void ldp_zebra_init(struct event_master *m); void ldp_zebra_destroy(void); int ldp_sync_zebra_send_state_update(struct ldp_igp_sync_if_state *); int ldp_zebra_send_rlfa_labels(struct zapi_rlfa_response * @@ -904,7 +904,7 @@ void ldp_zebra_regdereg_zebra_info(bool want_register); (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_INTFACELOCAL)) #endif -DECLARE_HOOK(ldp_register_mib, (struct thread_master * tm), (tm)); +DECLARE_HOOK(ldp_register_mib, (struct event_master * tm), (tm)); extern void ldp_agentx_enabled(void); |