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

Merge pull request #16406 from opensourcerouting/fix/remove_deprecation_for_show_threads

Browse Source 
Drop deprecation for `show thread ...`
This commit is contained in:
Jafar Al-Gharaibeh 2024-07-19 13:19:17 -04:00 committed by GitHub
commit 7aeb51e194
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
lib/event.c
View File

@ -304,9 +304,6 @@ static uint8_t parse_filter(const char *filterstr)
return filter; return filter;
} }
#if CONFDATE > 20240707
CPP_NOTICE("Remove `show thread ...` commands")
#endif
DEFUN_NOSH (show_event_cpu, DEFUN_NOSH (show_event_cpu,
show_event_cpu_cmd, show_event_cpu_cmd,
"show event cpu [FILTER]", "show event cpu [FILTER]",
@ -332,14 +329,6 @@ DEFUN_NOSH (show_event_cpu,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(show_event_cpu,
show_thread_cpu_cmd,
"show thread cpu [FILTER]",
SHOW_STR
"Thread information\n"
"Thread CPU usage\n"
"Display filter (rwtex)\n")
DEFPY (service_cputime_stats, DEFPY (service_cputime_stats,
service_cputime_stats_cmd, service_cputime_stats_cmd,
"[no] service cputime-stats", "[no] service cputime-stats",
@ -440,19 +429,15 @@ DEFUN_NOSH (show_event_poll,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(show_event_poll, #if CONFDATE > 20241231
show_thread_poll_cmd, CPP_NOTICE("Remove `clear thread cpu` command")
"show thread poll", #endif
SHOW_STR DEFUN (clear_event_cpu,
"Thread information\n" clear_event_cpu_cmd,
"Show poll FD's and information\n") "clear event cpu [FILTER]",
DEFUN (clear_thread_cpu,
clear_thread_cpu_cmd,
"clear thread cpu [FILTER]",
"Clear stored data in all pthreads\n" "Clear stored data in all pthreads\n"
"Thread information\n" "Event information\n"
"Thread CPU usage\n" "Event CPU usage\n"
"Display filter (rwtexb)\n") "Display filter (rwtexb)\n")
{ {
uint8_t filter = (uint8_t)-1U; uint8_t filter = (uint8_t)-1U;
@ -472,6 +457,14 @@ DEFUN (clear_thread_cpu,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS (clear_event_cpu,
clear_thread_cpu_cmd,
"clear thread cpu [FILTER]",
"Clear stored data in all pthreads\n"
"Thread information\n"
"Thread CPU usage\n"
"Display filter (rwtexb)\n")
static void show_event_timers_helper(struct vty *vty, struct event_loop *m) static void show_event_timers_helper(struct vty *vty, struct event_loop *m)
{ {
const char *name = m->name ? m->name : "main"; const char *name = m->name ? m->name : "main";
@ -507,26 +500,17 @@ DEFPY_NOSH (show_event_timers,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS(show_event_timers,
show_thread_timers_cmd,
"show thread timers",
SHOW_STR
"Thread information\n"
"Show all timers and how long they have in the system\n")
void event_cmd_init(void) void event_cmd_init(void)
{ {
install_element(VIEW_NODE, &show_thread_cpu_cmd);
install_element(VIEW_NODE, &show_event_cpu_cmd); install_element(VIEW_NODE, &show_event_cpu_cmd);
install_element(VIEW_NODE, &show_thread_poll_cmd);
install_element(VIEW_NODE, &show_event_poll_cmd); install_element(VIEW_NODE, &show_event_poll_cmd);
install_element(ENABLE_NODE, &clear_thread_cpu_cmd); install_element(ENABLE_NODE, &clear_thread_cpu_cmd);
install_element(ENABLE_NODE, &clear_event_cpu_cmd);
install_element(CONFIG_NODE, &service_cputime_stats_cmd); install_element(CONFIG_NODE, &service_cputime_stats_cmd);
install_element(CONFIG_NODE, &service_cputime_warning_cmd); install_element(CONFIG_NODE, &service_cputime_warning_cmd);
install_element(CONFIG_NODE, &service_walltime_warning_cmd); install_element(CONFIG_NODE, &service_walltime_warning_cmd);
install_element(VIEW_NODE, &show_thread_timers_cmd);
install_element(VIEW_NODE, &show_event_timers_cmd); install_element(VIEW_NODE, &show_event_timers_cmd);
} }
/* CLI end ------------------------------------------------------------------ */ /* CLI end ------------------------------------------------------------------ */

3
vtysh/vtysh.c
View File

@ -3058,9 +3058,6 @@ static int show_one_daemon(struct vty *vty, struct cmd_token **argv, int argc,
return ret; return ret;
} }
#if CONFDATE > 20240707
CPP_NOTICE("Remove `show thread ...` commands")
#endif
DEFUN (vtysh_show_event_timer, DEFUN (vtysh_show_event_timer,
vtysh_show_event_timer_cmd, vtysh_show_event_timer_cmd,
"show event timers", "show event timers",