Skip to content

testing/ostest: split the fork test into task_fork, vfork and fork #3673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
casaroli wants to merge 1 commit into
base: master
Choose a base branch
from
Open

testing/ostest: split the fork test into task_fork, vfork and fork #3673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion interpreters/python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,11 @@ ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
else
@echo "export ac_cv_func_fork=\"no\"" >> $@
endif
ifneq ($(CONFIG_ARCH_HAVE_VFORK)$(CONFIG_ARCH_HAVE_FORK),)
@echo "export ac_cv_func_vfork=\"yes\"" >> $@
else
@echo "export ac_cv_func_vfork=\"no\"" >> $@
endif
ifeq ($(CONFIG_SYSTEM_SYSTEM),y)
@echo "export ac_cv_func_system=\"yes\"" >> $@
else
Expand All @@ -135,7 +140,10 @@ endif

$(SETUP_LOCAL):
$(Q) ( cp $(SETUP_LOCAL).in $(SETUP_LOCAL))
ifneq ($(CONFIG_ARCH_HAVE_FORK),y)
# _posixsubprocess is the fork-then-exec path, so vfork() is enough for it;
# os.fork() itself needs a real fork() and is governed by ac_cv_func_fork
# above.
ifeq ($(CONFIG_ARCH_HAVE_FORK)$(CONFIG_ARCH_HAVE_VFORK),)
@echo "_posixsubprocess" >> $@
endif
ifneq ($(CONFIG_LIBC_DLFCN),y)
Expand Down
7 changes: 7 additions & 0 deletions netutils/libwebsockets/lws_config_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,10 @@
/* #undef USE_CYASSL */

/* Define to 1 if you have the `fork' function. */

#ifdef CONFIG_ARCH_HAVE_FORK
#define LWS_HAVE_FORK
#endif

#ifndef CONFIG_DISABLE_ENVIRON
/* Define to 1 if you have the `getenv' function. */
Expand Down Expand Up @@ -111,10 +114,14 @@
/* #undef LWS_HAVE_VFORK_H */

/* Define to 1 if `fork' works. */
#ifdef CONFIG_ARCH_HAVE_FORK
#define LWS_HAVE_WORKING_FORK
#endif

/* Define to 1 if `vfork' works. */
#if defined(CONFIG_ARCH_HAVE_VFORK) || defined(CONFIG_ARCH_HAVE_FORK)
#define LWS_HAVE_WORKING_VFORK
#endif

/* Define to 1 if execvpe() exists */
#define LWS_HAVE_EXECVPE
Expand Down
5 changes: 5 additions & 0 deletions system/libuv/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ if(CONFIG_LIBUV)
${LIBUV_TEST_DIR}/run-tests.c ${LIBUV_TEST_DIR}/runner.c
${LIBUV_TEST_DIR}/runner-unix.c ${LIBUV_TEST_DIR}/echo-server.c)
file(GLOB TEST_CSRCS ${LIBUV_TEST_DIR}/test-*.c)

# See system/libuv/Makefile.

list(REMOVE_ITEM TEST_CSRCS ${LIBUV_TEST_DIR}/test-fork.c
${LIBUV_TEST_DIR}/test-pipe-close-stdout-read-stdin.c)
list(APPEND LIBUV_UTILS_TEST_SRCS ${TEST_CSRCS})
nuttx_add_application(
NAME
Expand Down
10 changes: 9 additions & 1 deletion system/libuv/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,15 @@ CSRCS += runner.c
CSRCS += runner-unix.c
CSRCS += echo-server.c

CSRCS += $(wildcard libuv/test/test-*.c)
# test-fork.c and test-pipe-close-stdout-read-stdin.c call fork(). Every
# test they define is already excluded from the task list on NuttX by
# 0001-libuv-port-for-nuttx.patch, so they are dead code here.

LIBUV_TEST_CSRCS = $(wildcard libuv/test/test-*.c)
LIBUV_TEST_CSRCS := $(filter-out libuv/test/test-fork.c,$(LIBUV_TEST_CSRCS))
LIBUV_TEST_CSRCS := $(filter-out libuv/test/test-pipe-close-stdout-read-stdin.c,$(LIBUV_TEST_CSRCS))

CSRCS += $(LIBUV_TEST_CSRCS)
endif

ifneq ($(CONFIG_LIBUV_UTILS_BENCHMARK),)
Expand Down
1 change: 1 addition & 0 deletions testing/drivers/nand_sim/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
config TESTING_NAND_SIM
boolean "NAND Flash Simulator"
depends on MTD_NAND_RAM && ENABLE_ALL_SIGNALS
depends on TASK_FORK || (ARCH_HAVE_FORK && !ARCH_HAVE_TASK_FORK)
default n
---help---
Enable the NAND Flash Simulator device.
Expand Down
13 changes: 11 additions & 2 deletions testing/drivers/nand_sim/nand_sim_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
****************************************************************************/

#include <nuttx/debug.h>
#include <sched.h>
#include <stdio.h>
#include <unistd.h>

#include <nuttx/drivers/drivers.h>
#include <nuttx/mtd/nand.h>
Expand Down Expand Up @@ -140,9 +142,16 @@ int main(int argc, FAR char *argv[])
int ret;
pid_t pid;

/* Daemon */
/* task_fork() rather than fork(): this wants a clone that outlives the
* caller and shares its memory. The fallback below covers a nuttx that
* does not have task_fork() yet.
*/

pid = fork();
#ifndef CONFIG_TASK_FORK
# define task_fork() fork()
#endif

pid = task_fork();

if (pid > 0)
{
Expand Down
4 changes: 4 additions & 0 deletions testing/fs/fdsantest/fdsantest_simple.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ static void test_case_overflow(void **state)
assert_int_equal(open_count, close_count);
}

#if defined(CONFIG_ARCH_HAVE_VFORK) || defined(CONFIG_ARCH_HAVE_FORK)
static void test_case_vfork(void **state)
{
int fd = open("/dev/null", O_RDONLY);
Expand All @@ -112,6 +113,7 @@ static void test_case_vfork(void **state)

android_fdsan_close_with_tag(fd, 0xbadc0de);
}
#endif

/****************************************************************************
* Public Functions
Expand All @@ -129,7 +131,9 @@ int main(int argc, FAR char *argv[])
cmocka_unit_test(test_case_unowned_tagged_close),
cmocka_unit_test(test_case_owned_tagged_close),
cmocka_unit_test(test_case_overflow),
#if defined(CONFIG_ARCH_HAVE_VFORK) || defined(CONFIG_ARCH_HAVE_FORK)
cmocka_unit_test(test_case_vfork),
#endif
};

return cmocka_run_group_tests(tests, NULL, NULL);
Expand Down
6 changes: 6 additions & 0 deletions testing/ltp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ if(CONFIG_TESTING_LTP)
list(APPEND BLACKWORDS "pthread_spin_init" "pthread_spin_destroy"
"pthread_spin_trylock")
endif()

# See testing/ltp/Makefile.

if(NOT CONFIG_ARCH_HAVE_FORK AND NOT CONFIG_FORK_IS_TASK_FORK)

@xiaoxiang781216 xiaoxiang781216 Jul 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why need CONFIG_FORK_IS_TASK_FORK

@casaroli casaroli Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a retro compatibility flag disabled by default. It is available to alias fork() to task_fork() in non MMU systems, in case someone depends on the exact current NuttX behavior without needing to update their program source code.

@casaroli casaroli Jul 31, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's config FORK_IS_TASK_FORK in arch/Kconfig in apache/nuttx#19562 — default n, depends on TASK_FORK && !ARCH_HAVE_FORK

list(APPEND BLACKWORDS "[^v_]fork(")
endif()
list(
APPEND
BLACKWORDS
Expand Down
7 changes: 7 additions & 0 deletions testing/ltp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ BLACKWORDS += "pthread_spin_destroy"
BLACKWORDS += "pthread_spin_trylock"
endif

# Where NuttX does not declare fork(), a test that calls it cannot be built.
# The pattern spares vfork() and task_fork(), which remain available.

ifeq ($(CONFIG_ARCH_HAVE_FORK)$(CONFIG_FORK_IS_TASK_FORK),)
BLACKWORDS += "[^v_]fork("
endif

BLACKWORDS += "CHILD_MAX"
BLACKWORDS += "setpgid("
BLACKWORDS += "PTHREAD_SCOPE_PROCESS"
Expand Down
18 changes: 14 additions & 4 deletions testing/ostest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,20 @@ if(CONFIG_TESTING_OSTEST)
endif()
endif()

if(CONFIG_ARCH_HAVE_FORK)
if(CONFIG_SCHED_WAITPID)
list(APPEND SRCS vfork.c)
endif()
# See testing/ostest/ostest.h for the one transitional exception.

if(CONFIG_TASK_FORK)
list(APPEND SRCS task_fork.c)
elseif(CONFIG_ARCH_HAVE_FORK AND NOT CONFIG_ARCH_HAVE_TASK_FORK)
list(APPEND SRCS task_fork.c)
endif()

if(CONFIG_ARCH_HAVE_VFORK)
list(APPEND SRCS vfork.c)
endif()

if(CONFIG_ARCH_HAVE_FORK AND CONFIG_ARCH_HAVE_VFORK)
list(APPEND SRCS fork.c)
endif()

if(CONFIG_ARCH_SETJMP_H)
Expand Down
19 changes: 18 additions & 1 deletion testing/ostest/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,27 @@ CSRCS += sigev_thread.c
endif
endif

# Each test is built where the primitive it tests exists. See ostest.h for the
# one transitional exception.

ifeq ($(CONFIG_TASK_FORK),y)
CSRCS += task_fork.c
else ifeq ($(CONFIG_ARCH_HAVE_TASK_FORK),)
# A nuttx with no ARCH_HAVE_TASK_FORK at all is the pre-split one, where
# fork() is task_fork(). This branch comes out with the split.
ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
ifeq ($(CONFIG_SCHED_WAITPID),y)
CSRCS += task_fork.c
endif
endif

ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
CSRCS += vfork.c
endif

ifeq ($(CONFIG_ARCH_HAVE_FORK),y)
ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
CSRCS += fork.c
endif
endif

ifeq ($(CONFIG_ARCH_SETJMP_H),y)
Expand Down
Loading
Loading