Skip to content

Commit 687c1ca

Browse files
JianyuWang0623xiaoxiang781216
authored andcommitted
nshlib/cmd_wait: Wait failed if "PROCFS/PROCES" not enabled
Env sim:nsh - CONFIG_FS_PROCFS_EXCLUDE_PROCES=y Error nsh> sleep 5 & sh [4:100] nsh> wait 4 nsh: wait: wait failed: 2 cmd_wait(): snprintf(path, sizeof(path), "/proc/%d/status", tid); Signed-off-by: wangjianyu3 <wangjianyu3@xiaomi.com>
1 parent 9f859e9 commit 687c1ca

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

nshlib/Kconfig

+1
Original file line numberDiff line numberDiff line change
@@ -715,6 +715,7 @@ config NSH_DISABLE_WAIT
715715
bool "Disable wait"
716716
default DEFAULT_SMALL
717717
depends on SCHED_WAITPID
718+
depends on FS_PROCFS && !FS_PROCFS_EXCLUDE_PROCESS
718719

719720
config NSH_DISABLE_WATCH
720721
bool "Disable watch"

nshlib/nsh.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1238,7 +1238,8 @@ int cmd_watch(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
12381238
#endif
12391239

12401240
#if !defined(CONFIG_NSH_DISABLE_WAIT) && defined(CONFIG_SCHED_WAITPID) && \
1241-
!defined(CONFIG_DISABLE_PTHREAD)
1241+
!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_FS_PROCFS) && \
1242+
!defined(CONFIG_FS_PROCFS_EXCLUDE_PROCESS)
12421243
int cmd_wait(FAR struct nsh_vtbl_s *vtbl, int argc, FAR char **argv);
12431244
#endif
12441245

nshlib/nsh_command.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,8 @@ static const struct cmdmap_s g_cmdmap[] =
679679
CMD_MAP("xd", cmd_xd, 3, 3, "<hex-address> <byte-count>"),
680680
#endif
681681
#if !defined(CONFIG_NSH_DISABLE_WAIT) && defined(CONFIG_SCHED_WAITPID) && \
682-
!defined(CONFIG_DISABLE_PTHREAD)
682+
!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_FS_PROCFS) && \
683+
!defined(CONFIG_FS_PROCFS_EXCLUDE_PROCESS)
683684
CMD_MAP("wait", cmd_wait, 1, CONFIG_NSH_MAXARGUMENTS,
684685
"pid1 [pid2 [pid3] ...]"),
685686
#endif

nshlib/nsh_wait.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
#include "nsh_console.h"
3636

3737
#if !defined(CONFIG_NSH_DISABLE_WAIT) && defined(CONFIG_SCHED_WAITPID) && \
38-
!defined(CONFIG_DISABLE_PTHREAD)
38+
!defined(CONFIG_DISABLE_PTHREAD) && defined(CONFIG_FS_PROCFS) && \
39+
!defined(CONFIG_FS_PROCFS_EXCLUDE_PROCESS)
3940

4041
static const char g_groupid[] = "Group:";
4142

0 commit comments

Comments
 (0)