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

Merge pull request #9811 from donaldsharp/rib_update_fix

Browse Source 
Various thread functional fixes
This commit is contained in:
Igor Ryzhov 2021-10-20 19:44:45 +03:00 committed by GitHub
commit 5db95752c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/thread.c
View File

@ -2059,3 +2059,11 @@ void debug_signals(const sigset_t *sigs)
zlog_debug("%s: %s", __func__, buf); zlog_debug("%s: %s", __func__, buf);
} }
bool thread_is_scheduled(struct thread *thread)
{
if (thread == NULL)
return false;
return true;
}

1
lib/thread.h
View File

@ -273,6 +273,7 @@ extern pthread_key_t thread_current;
extern char *thread_timer_to_hhmmss(char *buf, int buf_size, extern char *thread_timer_to_hhmmss(char *buf, int buf_size,
struct thread *t_timer); struct thread *t_timer);
extern bool thread_is_scheduled(struct thread *thread);
/* Debug signal mask */ /* Debug signal mask */
void debug_signals(const sigset_t *sigs); void debug_signals(const sigset_t *sigs);

12
zebra/zebra_rib.c
View File

@ -3890,14 +3890,16 @@ void rib_update(enum rib_update_event event)
{ {
struct rib_update_ctx *ctx; struct rib_update_ctx *ctx;
ctx = rib_update_ctx_init(0, event); if (thread_is_scheduled(t_rib_update_threads[event]))
return;
ctx = rib_update_ctx_init(0, event);
ctx->vrf_all = true; ctx->vrf_all = true;
if (!thread_add_event(zrouter.master, rib_update_handler, ctx, 0, thread_add_event(zrouter.master, rib_update_handler, ctx, 0,
&t_rib_update_threads[event])) &t_rib_update_threads[event]);
rib_update_ctx_fini(&ctx); /* Already scheduled */
else if (IS_ZEBRA_DEBUG_EVENT) if (IS_ZEBRA_DEBUG_EVENT)
zlog_debug("%s: Scheduled VRF (ALL), event %s", __func__, zlog_debug("%s: Scheduled VRF (ALL), event %s", __func__,
rib_update_event2str(event)); rib_update_event2str(event));
} }