Modularize starting of worker threads to better isolate individual initialization characteristics

3 files changed, 49 insertions, 118 deletions

diff --git a/nuttx/libc/wqueue/Make.defs b/nuttx/libc/wqueue/Make.defs
index 87c5437e3..2b953626e 100644
--- a/nuttx/libc/wqueue/Make.defs
+++ b/nuttx/libc/wqueue/Make.defs
@@ -40,10 +40,10 @@ ifeq ($(CONFIG_SCHED_WORKQUEUE),y)
 CSRCS += work_process.c work_queue.c work_cancel.c work_signal.c
 
 ifeq ($(CONFIG_BUILD_PROTECTED),y)
-CSRCS += work_usrstart.c work_usrthread.c
+CSRCS += work_usrthread.c
 else
 ifeq ($(CONFIG_BUILD_KERNEL),y)
-CSRCS += work_usrstart.c work_usrthread.c
+CSRCS += work_usrthread.c
 endif
 endif
 
diff --git a/nuttx/libc/wqueue/work_usrstart.c b/nuttx/libc/wqueue/work_usrstart.c
deleted file mode 100644
index 00264cbe8..000000000
--- a/nuttx/libc/wqueue/work_usrstart.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/****************************************************************************
- * libc/wqueue/work_usrstart.c
- *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * 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 <nuttx/config.h>
-
-#include <sched.h>
-#include <errno.h>
-#include <assert.h>
-#include <debug.h>
-
-#include <nuttx/wqueue.h>
-
-#if defined(CONFIG_BUILD_PROTECTED) && !defined(__KERNEL__) && \
-    defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_SCHED_USRWORK)
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Type Declarations
- ****************************************************************************/
-
-/****************************************************************************
- * Public Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Variables
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-/****************************************************************************
- * Name: work_usrstart
- *
- * Description:
- *   Start the user mode work queue.
- *
- * Input parameters:
- *   None
- *
- * Returned Value:
- *   The task ID of the worker thread is returned on success.  A negated
- *   errno value is returned on failure.
- *
- ****************************************************************************/
-
-int work_usrstart(void)
-{
-  /* Start a user-mode worker thread for use by applications. */
-
-  svdbg("Starting user-mode worker thread\n");
-
-  g_usrwork[USRWORK].pid = task_create("usrwork",
-                                       CONFIG_SCHED_USRWORKPRIORITY,
-                                       CONFIG_SCHED_USRWORKSTACKSIZE,
-                                       (main_t)work_usrthread,
-                                       (FAR char * const *)NULL);
-
-  DEBUGASSERT(g_usrwork[USRWORK].pid > 0);
-  if (g_usrwork[USRWORK].pid < 0)
-    {
-      int errcode = errno;
-      DEBUGASSERT(errcode > 0);
-
-      sdbg("task_create failed: %d\n", errcode);
-      return -errcode;
-    }
-
-  return g_usrwork[USRWORK].pid;
-}
-
-#endif /* CONFIG_BUILD_PROTECTED && !__KERNEL__ CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_USRWORK */
diff --git a/nuttx/libc/wqueue/work_usrthread.c b/nuttx/libc/wqueue/work_usrthread.c
index f46924a06..b20babcea 100644
--- a/nuttx/libc/wqueue/work_usrthread.c
+++ b/nuttx/libc/wqueue/work_usrthread.c
@@ -39,6 +39,8 @@
 
 #include <nuttx/config.h>
 
+#include <debug.h>
+
 #include <nuttx/wqueue.h>
 
 #if defined(CONFIG_SCHED_WORKQUEUE) && defined(CONFIG_SCHED_USRWORK) && \
@@ -87,7 +89,7 @@ extern struct wqueue_s g_usrwork;
  *
  ****************************************************************************/
 
-int work_usrthread(int argc, char *argv[])
+static int work_usrthread(int argc, char *argv[])
 {
   /* Loop forever */
 
@@ -103,4 +105,48 @@ int work_usrthread(int argc, char *argv[])
   return OK; /* To keep some compilers happy */
 }
 
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: work_usrstart
+ *
+ * Description:
+ *   Start the user mode work queue.
+ *
+ * Input parameters:
+ *   None
+ *
+ * Returned Value:
+ *   The task ID of the worker thread is returned on success.  A negated
+ *   errno value is returned on failure.
+ *
+ ****************************************************************************/
+
+int work_usrstart(void)
+{
+  /* Start a user-mode worker thread for use by applications. */
+
+  svdbg("Starting user-mode worker thread\n");
+
+  g_usrwork.pid = task_create("uwork",
+                              CONFIG_SCHED_USRWORKPRIORITY,
+                              CONFIG_SCHED_USRWORKSTACKSIZE,
+                              (main_t)work_usrthread,
+                              (FAR char * const *)NULL);
+
+  DEBUGASSERT(g_usrwork.pid > 0);
+  if (g_usrwork.pid < 0)
+    {
+      int errcode = errno;
+      DEBUGASSERT(errcode > 0);
+
+      sdbg("task_create failed: %d\n", errcode);
+      return -errcode;
+    }
+
+  return g_usrwork.pid;
+}
+
 #endif /* CONFIG_SCHED_WORKQUEUE && CONFIG_SCHED_USRWORK && !__KERNEL__*/