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

Fix some compilation errors when child status disabled; new waitpid logic not encoding/decoding status properly

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5561 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-25 00:01:08 +00:00
parent 00cde57256
commit d36101683c
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@ -493,3 +493,5 @@
* apps/netutils/telnetd/telnetd_driver: Was stuck in a loop if * apps/netutils/telnetd/telnetd_driver: Was stuck in a loop if
recv[from]() ever returned a value <= 0. recv[from]() ever returned a value <= 0.
* apps/examples/nettest and poll: Complete Kconfig files. * apps/examples/nettest and poll: Complete Kconfig files.
* apps/examples/ostest/waitpid.c: Need to use WEXITSTATUS()
to decode the correct exit status.

18
examples/ostest/waitpid.c
View File

@ -113,14 +113,14 @@ static void waitpid_last(void)
printf("waitpid_last: ERROR: PID %d waitpid failed: %d\n", printf("waitpid_last: ERROR: PID %d waitpid failed: %d\n",
g_waitpids[NCHILDREN-1], errcode); g_waitpids[NCHILDREN-1], errcode);
} }
else if (stat_loc != RETURN_STATUS) else if (WEXITSTATUS(stat_loc) != RETURN_STATUS)
{ {
printf("waitpid_last: ERROR: PID %d return status is %d, expected %d\n", printf("waitpid_last: ERROR: PID %d return status is %d, expected %d\n",
g_waitpids[NCHILDREN-1], stat_loc, RETURN_STATUS); g_waitpids[NCHILDREN-1], WEXITSTATUS(stat_loc), RETURN_STATUS);
} }
else else
{ {
printf("waitpid_last: PID %d waitpid succeeded with stat_loc=%d\n", printf("waitpid_last: PID %d waitpid succeeded with stat_loc=%04x\n",
g_waitpids[NCHILDREN-1], stat_loc); g_waitpids[NCHILDREN-1], stat_loc);
} }
} }
@ -155,14 +155,14 @@ int waitpid_test(void)
printf("waitpid_test: ERROR: PID %d wait returned PID %d\n", printf("waitpid_test: ERROR: PID %d wait returned PID %d\n",
g_waitpids[0], ret); g_waitpids[0], ret);
} }
else if (stat_loc != RETURN_STATUS) else if (WEXITSTATUS(stat_loc) != RETURN_STATUS)
{ {
printf("waitpid_test: ERROR: PID %d return status is %d, expected %d\n", printf("waitpid_test: ERROR: PID %d return status is %d, expected %d\n",
g_waitpids[0], stat_loc, RETURN_STATUS); g_waitpids[0], WEXITSTATUS(stat_loc), RETURN_STATUS);
} }
else else
{ {
printf("waitpid_test: PID %d waitpid succeeded with stat_loc=%d\n", printf("waitpid_test: PID %d waitpid succeeded with stat_loc=%04x\n",
g_waitpids[0], stat_loc); g_waitpids[0], stat_loc);
} }
@ -246,14 +246,14 @@ int waitpid_test(void)
int errcode = errno; int errcode = errno;
printf("waitpid_test: ERROR: wait failed: %d\n", errcode); printf("waitpid_test: ERROR: wait failed: %d\n", errcode);
} }
else if (stat_loc != RETURN_STATUS) else if (WEXITSTATUS(stat_loc) != RETURN_STATUS)
{ {
printf("waitpid_test: ERROR: PID %d return status is %d, expected %d\n", printf("waitpid_test: ERROR: PID %d return status is %d, expected %d\n",
ret, stat_loc, RETURN_STATUS); ret, WEXITSTATUS(stat_loc), RETURN_STATUS);
} }
else else
{ {
printf("waitpid_test: PID %d wait succeeded with stat_loc=%d\n", printf("waitpid_test: PID %d wait succeeded with stat_loc=%04x\n",
ret, stat_loc); ret, stat_loc);
} }