From f7b7532a4114b831f5ef66ed992d28e65fb3973f Mon Sep 17 00:00:00 2001 From: patacongo Date: Wed, 6 Feb 2013 15:43:28 +0000 Subject: Changed needed to fix issues with task_restart() git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5615 42af7a65-404d-4744-a932-0658087f49c3 --- apps/ChangeLog.txt | 3 +- apps/examples/ostest/Makefile | 2 +- apps/examples/ostest/mqueue.c | 12 +-- apps/examples/ostest/ostest.h | 4 + apps/examples/ostest/ostest_main.c | 6 ++ apps/examples/ostest/restart.c | 197 +++++++++++++++++++++++++++++++++++++ 6 files changed, 216 insertions(+), 8 deletions(-) create mode 100644 apps/examples/ostest/restart.c (limited to 'apps') diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index bb568ee53..5b61a1277 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -515,4 +515,5 @@ creating a pthread. * apps/examples and nshlib: Change name of _TCB to struct tcb_s to match NuttX name change. - + * apps/examples/ostest/restart.c: Add a test case to verify + task_restart(). diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index 5a8ff7293..fd8ef79e0 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -46,7 +46,7 @@ STACKSIZE = 2048 # NuttX OS Test ASRCS = -CSRCS = ostest_main.c dev_null.c +CSRCS = ostest_main.c dev_null.c restart.c ifeq ($(CONFIG_ARCH_FPU),y) CSRCS += fpu.c diff --git a/apps/examples/ostest/mqueue.c b/apps/examples/ostest/mqueue.c index 0bb3473dc..b747af089 100644 --- a/apps/examples/ostest/mqueue.c +++ b/apps/examples/ostest/mqueue.c @@ -415,17 +415,17 @@ void mqueue_test(void) * message queue open. */ - if (result == PTHREAD_CANCELED && g_send_mqfd) + if (result == PTHREAD_CANCELED && g_recv_mqfd) { - if (mq_close(g_send_mqfd) < 0) + if (mq_close(g_recv_mqfd) < 0) { printf("mqueue_test: ERROR mq_close failed\n"); } } - else if (result != PTHREAD_CANCELED && g_send_mqfd) + else if (result != PTHREAD_CANCELED && g_recv_mqfd) { printf("mqueue_test: ERROR send mqd_t left open\n"); - if (mq_close(g_send_mqfd) < 0) + if (mq_close(g_recv_mqfd) < 0) { printf("mqueue_test: ERROR mq_close failed\n"); } @@ -433,10 +433,10 @@ void mqueue_test(void) /* Make sure that the receive queue is closed as well */ - if (g_recv_mqfd) + if (g_send_mqfd) { printf("mqueue_test: ERROR receive mqd_t left open\n"); - if (mq_close(g_recv_mqfd) < 0) + if (mq_close(g_send_mqfd) < 0) { printf("sender_thread: ERROR mq_close failed\n"); } diff --git a/apps/examples/ostest/ostest.h b/apps/examples/ostest/ostest.h index 5217f0a0c..9c6bb082b 100644 --- a/apps/examples/ostest/ostest.h +++ b/apps/examples/ostest/ostest.h @@ -111,6 +111,10 @@ int dev_null(void); void fpu_test(void); +/* restart.c ****************************************************************/ + +void restart_test(void); + /* waitpid.c ****************************************************************/ #ifdef CONFIG_SCHED_WAITPID diff --git a/apps/examples/ostest/ostest_main.c b/apps/examples/ostest/ostest_main.c index d83adc413..978f72f9e 100644 --- a/apps/examples/ostest/ostest_main.c +++ b/apps/examples/ostest/ostest_main.c @@ -329,6 +329,12 @@ static int user_main(int argc, char *argv[]) check_test_memory_usage(); #endif + /* Checkout task_restart() */ + + printf("\nuser_main: task_restart test\n"); + restart_test(); + check_test_memory_usage(); + #ifdef CONFIG_SCHED_WAITPID /* Check waitpid() and friends */ diff --git a/apps/examples/ostest/restart.c b/apps/examples/ostest/restart.c new file mode 100644 index 000000000..335aa3694 --- /dev/null +++ b/apps/examples/ostest/restart.c @@ -0,0 +1,197 @@ +/**************************************************************************** + * examples/ostest/restart.c + * + * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include "ostest.h" + +#ifdef CONFIG_SCHED_WAITPID + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define PRIORITY 100 +#define NARGS 3 + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +static char * const g_argv[NARGS+1] = +{ + "This is argument 1", + "Argument 2 here", + "Lastly, the 3rd argument", + NULL +}; + +static const char g_varname[] = "VarName"; +static const char g_varvalue[] = "VarValue"; +static bool g_restarted; + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +static int restart_main(int argc, char *argv[]) +{ +#ifndef CONFIG_DISABLE_ENVIRON + char *actual; +#endif + int i; + + printf("restart_main: Started with argc=%d\n", argc); + + /* Verify passed arguments */ + + if (argc != NARGS + 1) + { + printf("restart_main: ERROR: Expected argc=%d got argc=%d\n", + NARGS+1, argc); + } + + for (i = 0; i <= NARGS; i++) + { + printf("restart_main: argv[%d]=\"%s\"\n", i, argv[i]); + if (i > 0 && strcmp(argv[i], g_argv[i-1]) != 0) + { + printf("restart_main: ERROR: Expected argv[%d]=\"%s\" got \"%s\"\n", + i, argv[i], g_argv[i-1]); + } + } + +#ifndef CONFIG_DISABLE_ENVIRON + actual = getenv(g_varname); + if (actual) + { + if (strcmp(actual, g_varvalue) == 0) + { + printf("restart_main: Variable=%s has value=%s\n", g_varname, + g_varvalue); + } + else + { + printf("restart_main: ERROR Variable=%s has the wrong value\n", g_varname); + printf("restart_main: found=%s expected=%s\n", actual, g_varvalue); + } + } + else + { + printf("restart_main: ERROR: Variable=%s has no value\n", g_varname); + } +#endif + + /* Were we restarted? */ + + if (!g_restarted) + { + /* No.. this is the first time we have been here */ + + g_restarted = true; + + /* Now just wait to be restarted */ + + for (;;) + { + sleep(2); + printf("restart_main: I am still here\n"); + } + } + + return 0; /* Won't get here */ +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +void restart_test(void) +{ + int ret; + + /* Start the children and wait for first one to complete */ + + printf("\nTest task_restart()\n"); + g_restarted = false; + + /* Set up an environment variables */ + +#ifndef CONFIG_DISABLE_ENVIRON + printf("restart_main: setenv(%s, %s, TRUE)\n", g_varname, g_varvalue); + setenv(g_varname, g_varvalue, TRUE); /* Variable1=GoodValue1 */ +#endif + + /* Start the task */ + + ret = TASK_CREATE("ostest", PRIORITY, STACKSIZE, restart_main, g_argv); + if (ret < 0) + { + printf("restart_main: ERROR Failed to start restart_main\n"); + } + else + { + pid_t pid = ret; + + printf("restart_main: Started restart_main at PID=%d\n", pid); + + /* Wait a bit and restart the task */ + + sleep(5); + ret = task_restart(pid); + if (ret < 0) + { + printf("restart_main: ERROR: task_restart failed\n"); + } + + sleep(1); + } + + printf("restart_main: Exitting\n"); +} + +#endif /* CONFIG_SCHED_WAITPID */ -- cgit v1.2.3