proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 01:47:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: introduce dedicated dataplane pthread

Browse Source 
Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2018-08-30 13:48:05 -04:00
parent 8e42765666
commit d8c16a9519
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zebra/main.c
View File

@ -390,6 +390,9 @@ int main(int argc, char **argv)
vty_config_lockless(); vty_config_lockless();
zebrad.master = frr_init(); zebrad.master = frr_init();
/* Initialize pthread library */
frr_pthread_init();
/* Zebra related initialize. */ /* Zebra related initialize. */
zebra_router_init(); zebra_router_init();
zserv_init(); zserv_init();
@ -445,9 +448,6 @@ int main(int argc, char **argv)
/* Needed for BSD routing socket. */ /* Needed for BSD routing socket. */
pid = getpid(); pid = getpid();
/* Intialize pthread library */
frr_pthread_init();
/* Start Zebra API server */ /* Start Zebra API server */
zserv_start(zserv_path); zserv_start(zserv_path);

29
zebra/zebra_dplane.c
View File

@ -176,6 +176,9 @@ static struct zebra_dplane_globals {
_Atomic uint32_t dg_routes_queued_max; _Atomic uint32_t dg_routes_queued_max;
_Atomic uint32_t dg_route_errors; _Atomic uint32_t dg_route_errors;
/* Dataplane pthread */
struct frr_pthread *dg_pthread;
/* Event-delivery context 'master' for the dplane */ /* Event-delivery context 'master' for the dplane */
struct thread_master *dg_master; struct thread_master *dg_master;
@ -1004,13 +1007,23 @@ static void zebra_dplane_init_internal(struct zebra_t *zebra)
zdplane_info.dg_max_queued_updates = DPLANE_DEFAULT_MAX_QUEUED; zdplane_info.dg_max_queued_updates = DPLANE_DEFAULT_MAX_QUEUED;
/* TODO -- register default kernel 'provider' during init */ /* TODO -- register default kernel 'provider' during init */
zdplane_info.dg_run = true;
/* Start dataplane pthread */
zdplane_info.dg_run = true; zdplane_info.dg_run = true;
/* TODO -- start dataplane pthread. We're using the zebra struct frr_pthread_attr pattr = {
* core/main thread temporarily .start = frr_pthread_attr_default.start,
*/ .stop = frr_pthread_attr_default.stop
zdplane_info.dg_master = zebra->master; };
zdplane_info.dg_pthread = frr_pthread_new(&pattr, "Zebra dplane thread",
"Zebra dplane");
zdplane_info.dg_master = zdplane_info.dg_pthread->master;
frr_pthread_run(zdplane_info.dg_pthread, NULL);
} }
/* Indicates zebra shutdown/exit is in progress. Some operations may be /* Indicates zebra shutdown/exit is in progress. Some operations may be
@ -1122,8 +1135,12 @@ void zebra_dplane_shutdown(void)
THREAD_OFF(zdplane_info.dg_t_update); THREAD_OFF(zdplane_info.dg_t_update);
/* TODO */ frr_pthread_stop(zdplane_info.dg_pthread, NULL);
/* frr_pthread_stop(...) */
/* Destroy pthread */
frr_pthread_destroy(zdplane_info.dg_pthread);
zdplane_info.dg_pthread = NULL;
zdplane_info.dg_master = NULL;
/* Notify provider(s) of final shutdown */ /* Notify provider(s) of final shutdown */