sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some problems with the vfork() test on the STM32F3Discovery

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5628 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-02-08 22:53:14 +00:00
parent b956e3109e
commit 2ad5349d4c
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ostest/Makefile
View File

@ -89,8 +89,10 @@ CSRCS += posixtimer.c
endif endif
ifeq ($(CONFIG_ARCH_HAVE_VFORK),y) ifeq ($(CONFIG_ARCH_HAVE_VFORK),y)
ifeq ($(CONFIG_SCHED_WAITPID),y)
CSRCS += vfork.c CSRCS += vfork.c
endif endif
endif
ifneq ($(CONFIG_DISABLE_SIGNALS),y) ifneq ($(CONFIG_DISABLE_SIGNALS),y)
ifneq ($(CONFIG_DISABLE_PTHREAD),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y)

3
examples/ostest/ostest.h
View File

@ -175,7 +175,8 @@ void priority_inheritance(void);
/* vfork.c ******************************************************************/ /* vfork.c ******************************************************************/
#ifdef CONFIG_ARCH_HAVE_VFORK #if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) && \
!defined(CONFIG_DISABLE_SIGNALS)
int vfork_test(void); int vfork_test(void);
#endif #endif

3
examples/ostest/ostest_main.c
View File

@ -451,7 +451,8 @@ static int user_main(int argc, char *argv[])
check_test_memory_usage(); check_test_memory_usage();
#endif /* CONFIG_PRIORITY_INHERITANCE && !CONFIG_DISABLE_SIGNALS && !CONFIG_DISABLE_PTHREAD */ #endif /* CONFIG_PRIORITY_INHERITANCE && !CONFIG_DISABLE_SIGNALS && !CONFIG_DISABLE_PTHREAD */
#ifdef CONFIG_ARCH_HAVE_VFORK #if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) && \
!defined(CONFIG_DISABLE_SIGNALS)
printf("\nuser_main: vfork() test\n"); printf("\nuser_main: vfork() test\n");
vfork_test(); vfork_test();
#endif #endif

9
examples/ostest/vfork.c
View File

@ -47,6 +47,9 @@
#include "ostest.h" #include "ostest.h"
#if defined(CONFIG_ARCH_HAVE_VFORK) && defined(CONFIG_SCHED_WAITPID) && \
!defined(CONFIG_DISABLE_SIGNALS)
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
@ -55,9 +58,7 @@
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_ARCH_HAVE_VFORK) && !defined(CONFIG_DISABLE_SIGNALS)
static volatile bool g_vforkchild; static volatile bool g_vforkchild;
#endif
/**************************************************************************** /****************************************************************************
* Public Functions * Public Functions
@ -65,7 +66,6 @@ static volatile bool g_vforkchild;
int vfork_test(void) int vfork_test(void)
{ {
#if defined(CONFIG_ARCH_HAVE_VFORK) && !defined(CONFIG_DISABLE_SIGNALS)
pid_t pid; pid_t pid;
g_vforkchild = false; g_vforkchild = false;
@ -97,7 +97,8 @@ int vfork_test(void)
return -1; return -1;
} }
} }
#endif
return 0; return 0;
} }
#endif /* CONFIG_ARCH_HAVE_VFORK && CONFIG_SCHED_WAITPID && !CONFIG_DISABLE_SIGNALS */