From ee4dcee834a2e16ce0085902a6c3bbd55cac99a9 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Wed, 14 Apr 2021 00:04:12 +0200
Subject: [PATCH] vtysh: add lib/thread.c to vtysh_scan

Signed-off-by: David Lamparter <equinox@diac24.net>
---
 lib/subdir.am       |  1 +
 lib/thread.c        | 26 +++++++++++++-------------
 vtysh/extract.pl.in |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/subdir.am b/lib/subdir.am
index bd24ccbfb8..b7efec4882 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -148,6 +148,7 @@ vtysh_scan += \
 	lib/routemap.c \
 	lib/routemap_cli.c \
 	lib/spf_backoff.c \
+	lib/thread.c \
 	lib/vrf.c \
 	lib/vty.c \
 	# end
diff --git a/lib/thread.c b/lib/thread.c
index 866090341e..e0b6b24595 100644
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -300,13 +300,13 @@ static uint8_t parse_filter(const char *filterstr)
 }
 
 #ifndef EXCLUDE_CPU_TIME
-DEFUN (show_thread_cpu,
-       show_thread_cpu_cmd,
-       "show thread cpu [FILTER]",
-       SHOW_STR
-       "Thread information\n"
-       "Thread CPU usage\n"
-       "Display filter (rwtex)\n")
+DEFUN_NOSH (show_thread_cpu,
+	    show_thread_cpu_cmd,
+	    "show thread cpu [FILTER]",
+	    SHOW_STR
+	    "Thread information\n"
+	    "Thread CPU usage\n"
+	    "Display filter (rwtex)\n")
 {
 	uint8_t filter = (uint8_t)-1U;
 	int idx = 0;
@@ -367,12 +367,12 @@ static void show_thread_poll_helper(struct vty *vty, struct thread_master *m)
 	}
 }
 
-DEFUN (show_thread_poll,
-       show_thread_poll_cmd,
-       "show thread poll",
-       SHOW_STR
-       "Thread information\n"
-       "Show poll FD's and information\n")
+DEFUN_NOSH (show_thread_poll,
+	    show_thread_poll_cmd,
+	    "show thread poll",
+	    SHOW_STR
+	    "Thread information\n"
+	    "Show poll FD's and information\n")
 {
 	struct listnode *node;
 	struct thread_master *m;
diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in
index 2b26d366f8..af974771cc 100755
--- a/vtysh/extract.pl.in
+++ b/vtysh/extract.pl.in
@@ -139,7 +139,7 @@ sub scan_file {
 	elsif ($file =~ /lib\/spf_backoff\.c$/) {
 	    $protocol = "VTYSH_ISISD";
 	}
-        elsif ($file =~ /lib\/vty\.c$/) {
+        elsif ($file =~ /lib\/(vty|thread)\.c$/) {
            $protocol = "VTYSH_ALL";
         }
         elsif ($file =~ /librfp\/.*\.c$/ || $file =~ /rfapi\/.*\.c$/) {