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

Merge pull request #14571 from FRRouting/mergify/bp/dev/9.1/pr-14563

Browse Source 
lib: Suppress HOB/STARVATION warnings when running in vtysh (backport #14563)
This commit is contained in:
Donatas Abraitis 2023-10-12 14:46:31 +03:00 committed by GitHub
commit 2d8357445a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/event.c
View File

@ -1946,6 +1946,7 @@ void event_getrusage(RUSAGE_T *r)
void event_call(struct event *thread) void event_call(struct event *thread)
{ {
RUSAGE_T before, after; RUSAGE_T before, after;
bool suppress_warnings = EVENT_ARG(thread);
/* if the thread being called is the CLI, it may change cputime_enabled /* if the thread being called is the CLI, it may change cputime_enabled
* ("service cputime-stats" command), which can result in nonsensical * ("service cputime-stats" command), which can result in nonsensical
@ -2006,6 +2007,9 @@ void event_call(struct event *thread)
atomic_fetch_or_explicit(&thread->hist->types, 1 << thread->add_type, atomic_fetch_or_explicit(&thread->hist->types, 1 << thread->add_type,
memory_order_seq_cst); memory_order_seq_cst);
if (suppress_warnings)
return;
if (cputime_enabled_here && cputime_enabled && cputime_threshold if (cputime_enabled_here && cputime_enabled && cputime_threshold
&& cputime > cputime_threshold) { && cputime > cputime_threshold) {
/* /*

7
vtysh/vtysh_main.c
View File

@ -221,7 +221,9 @@ static struct event *vtysh_rl_read_thread;
static void vtysh_rl_read(struct event *thread) static void vtysh_rl_read(struct event *thread)
{ {
event_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, bool *suppress_warnings = EVENT_ARG(thread);
event_add_read(master, vtysh_rl_read, suppress_warnings, STDIN_FILENO,
&vtysh_rl_read_thread); &vtysh_rl_read_thread);
rl_callback_read_char(); rl_callback_read_char();
} }
@ -230,11 +232,12 @@ static void vtysh_rl_read(struct event *thread)
static void vtysh_rl_run(void) static void vtysh_rl_run(void)
{ {
struct event thread; struct event thread;
bool suppress_warnings = true;
master = event_master_create(NULL); master = event_master_create(NULL);
rl_callback_handler_install(vtysh_prompt(), vtysh_rl_callback); rl_callback_handler_install(vtysh_prompt(), vtysh_rl_callback);
event_add_read(master, vtysh_rl_read, NULL, STDIN_FILENO, event_add_read(master, vtysh_rl_read, &suppress_warnings, STDIN_FILENO,
&vtysh_rl_read_thread); &vtysh_rl_read_thread);
while (!vtysh_loop_exited && event_fetch(master, &thread)) while (!vtysh_loop_exited && event_fetch(master, &thread))