Various changes while debugging posix_spawn

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5510 42af7a65-404d-4744-a932-0658087f49c3

examples/elf/tests/hello/hello.c

@@ -63,13 +63,13 @@ int main(int argc, char **argv)
     {
       printf("argv[%d]\t= ", i);
       if (argv[i])
-	{
+        {
-	  printf("(0x%p) \"%s\"\n", argv[i], argv[i]);
+          printf("(0x%p) \"%s\"\n", argv[i], argv[i]);
-	}
+        }
       else
-	{
+        {
-	  printf("NULL?\n");
+          printf("NULL?\n");
-	}
+        }
     }
 
   printf("argv[%d]\t= 0x%p\n", argc, argv[argc]);

examples/posix_spawn/Makefile

@@ -64,8 +64,8 @@ ROOTDEPPATH	= --dep-path . --dep-path filesystem
 
 VPATH = filesystem
 
-all: .built
+all: build
-.PHONY: really_build clean_filesystem clean depend distclean
+.PHONY: build clean_filesystem clean depend distclean
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -74,17 +74,16 @@ $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)
 
 # This is a little messy.  The build is broken into two pieces:  (1) the
-# filesystem/ subdir build that auto-generates several files, and (2) the real
+# filesystem/ subdir build that auto-generates several files, and (2) the library
 # build.  This is done because we need a fresh build context after auto-
 # generating the source files.
 
-really_build: $(OBJS)
+build_lib: $(OBJS)
 	$(call ARCHIVE, $(BIN), $(OBJS))
-	@touch .built
 
-.built:
+build:
 	@$(MAKE) -C filesystem TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
-	@$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build
+	@$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" build_lib
 
 context:
 
@@ -100,11 +99,13 @@ clean_filesystem:
 	@$(MAKE) -C filesystem TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean
 
 clean: clean_filesystem
-	$(call DELFILE, .built)
 	$(call CLEAN)
 
 distclean: clean
 	$(call DELFILE, Make.dep)
 	$(call DELFILE, .depend)
 
+# There are no dependencies in this directory.  We should are code some of
+# more important dependencies here:
+
 -include Make.dep

examples/posix_spawn/filesystem/Makefile

@@ -44,22 +44,28 @@ ROMFS_HDR = $(FILESYSTEM_DIR)$(DELIM)romfs.h
 SYMTAB_SRC = $(FILESYSTEM_DIR)$(DELIM)symtab.c
 
 all: $(ROMFS_HDR) $(SYMTAB_SRC)
-.PHONY: all program clean install populate
+.PHONY: all hello redirect clean install populate
 
 # Create the romfs directory
 
 $(ROMFS_DIR):
 	$(Q) mkdir $(ROMFS_DIR)
 
-# Build the test program
+# Build the hello test program
 
-program: $(ROMFS_DIR)
+hello: $(ROMFS_DIR)
-	$(Q) $(MAKE) -C program program TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+	$(Q) $(MAKE) -C hello hello TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
 
-# Install the test program in the romfs directory
+# Build the redirection test program
 
-install: program testdata.txt
+redirect: $(ROMFS_DIR)
-	$(Q) $(MAKE) -C program install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+	$(Q) $(MAKE) -C redirect redirect TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+
+# Install the test programs in the romfs directory
+
+install: hello redirect testdata.txt
+	$(Q) $(MAKE) -C hello install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+	$(Q) $(MAKE) -C redirect install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
 	$(Q) install --mode=0644 testdata.txt $(ROMFS_DIR)/testdata.txt
 
 # Create the romfs.img file from the romfs directory
@@ -74,12 +80,13 @@ $(ROMFS_HDR) : $(ROMFS_IMG)
 
 # Create the exported symbol table
 
-$(SYMTAB_SRC): program
+$(SYMTAB_SRC): hello/hello redirect/redirect testdata.txt
 	$(Q) $(FILESYSTEM_DIR)$(DELIM)mksymtab.sh $(ROMFS_DIR) >$@
 
 # Clean each subdirectory
 
 clean:
-	$(Q) $(MAKE) -C program clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+	$(Q) $(MAKE) -C hello clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
+	$(Q) $(MAKE) -C redirect clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" ROMFS_DIR="$(ROMFS_DIR)"
 	$(Q) rm -f $(ROMFS_HDR) $(ROMFS_IMG) $(SYMTAB_SRC)
 	$(Q) rm -rf $(ROMFS_DIR)

examples/posix_spawn/filesystem/hello/Makefile

@@ -0,0 +1,59 @@
+############################################################################
+# examples/elf/tests/hello/Makefile
+#
+#   Copyright (C) 2012 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.
+#
+############################################################################
+
+-include $(TOPDIR)/Make.defs
+
+BIN = hello
+
+SRCS = $(BIN).c
+OBJS = $(SRCS:.c=.o)
+
+all: $(BIN)
+
+$(OBJS): %.o: %.c
+	@echo "CC: $<"
+	$(Q) $(CC) -c $(CELFFLAGS) $< -o $@
+
+$(BIN): $(OBJS)
+	@echo "LD: $<"
+	$(Q) $(LD) $(LDELFFLAGS) -o $@ $^
+
+clean: 
+	$(call DELFILE, $(BIN))
+	$(call CLEAN)
+
+install:
+	$(Q) mkdir -p $(ROMFS_DIR)
+	$(Q) install $(BIN) $(ROMFS_DIR)/$(BIN)

examples/posix_spawn/filesystem/hello/hello.c

@@ -0,0 +1,78 @@
+/****************************************************************************
+ * examples/posix_spawn/filesystem/hello/hello.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 <stdio.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char **argv)
+{
+  int i;
+
+  /* Mandatory "Hello, world!" */
+
+  puts("Getting ready to say \"Hello, world\"\n");
+  printf("Hello, world!\n");
+  puts("It has been said.\n");
+
+  /* Print arguments */
+
+  printf("argc\t= %d\n", argc);
+  printf("argv\t= 0x%p\n", argv);
+
+  for (i = 0; i < argc; i++)
+    {
+      printf("argv[%d]\t= ", i);
+      if (argv[i])
+        {
+          printf("(0x%p) \"%s\"\n", argv[i], argv[i]);
+        }
+      else
+        {
+          printf("NULL?\n");
+        }
+    }
+
+  printf("argv[%d]\t= 0x%p\n", argc, argv[argc]);
+  printf("Goodbye, world!\n");
+  return 0;
+}

examples/posix_spawn/filesystem/redirect/Makefile

@@ -1,5 +1,5 @@
 ############################################################################
-# examples/posix_spawn/filesystem/program/Makefile
+# examples/posix_spawn/filesystem/redirect/Makefile
 #
 #   Copyright (C) 2013 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -35,7 +35,7 @@
 
 -include $(TOPDIR)/Make.defs
 
-BIN = program
+BIN = redirect
 
 SRCS = $(BIN).c
 OBJS = $(SRCS:.c=.o)

examples/posix_spawn/filesystem/redirect/redirect.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/posix_spawn/filesystem/program/program.c
+ * examples/posix_spawn/filesystem/redirect/redirect.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,6 +47,8 @@ int main(int argc, char **argv)
 {
   int ch;
 
+  printf("Entering the stdin redirection test\n");
+
   /* stdin should have been redirected to testdata.txt.  Read and print until
    * we hit the end of file.
    */
@@ -56,5 +58,6 @@ int main(int argc, char **argv)
       putchar(ch);
     }
 
+  printf("Exit-ing the stdin redirection test\n");
   return 0;
 }

examples/posix_spawn/spawn_main.c

@@ -138,11 +138,15 @@ static unsigned int g_mmstep;     /* Memory Usage at beginning of test step */
 
 static const char delimiter[] =
   "****************************************************************************";
-static const char program[] = "program";
+static const char g_redirect[] = "redirect";
-static const char data[]    = "testdata.txt";
+static const char g_hello[]    = "hello";
+static const char g_data[]     = "testdata.txt";
 
 static char fullpath[128];
 
+static char * const g_argv[4] =
+  { "Argument 1", "Argument 2", "Argument 3", NULL };
+
 /****************************************************************************
  * Symbols from Auto-Generated Code
  ****************************************************************************/
@@ -284,11 +288,15 @@ int spawn_main(int argc, char *argv[])
 
   exec_setsymtab(exports, nexports);
 
+  /*************************************************************************
+   * Case 1: Simple program with arguments
+   *************************************************************************/
+
   /* Output a seperated so that we can clearly discriminate the output of
    * this program from the others.
    */
 
-  testheader(program);
+  testheader(g_hello);
 
   /* Initialize the attributes file actions structure */
 
@@ -297,12 +305,86 @@ int spawn_main(int argc, char *argv[])
     {
       err("ERROR: posix_spawn_file_actions_init failed: %d\n", ret);
     }
+  posix_spawn_file_actions_dump(&file_actions);
 
   ret = posix_spawnattr_init(&attr);
   if (ret != 0)
     {
       err("ERROR: posix_spawnattr_init failed: %d\n", ret);
     }
+  posix_spawnattr_dump(&attr);
+
+  mm_update(&g_mmstep, "after file_action/attr init");
+
+  /* If the binary loader does not support the PATH variable, then
+   * create the full path to the executable program.  Otherwise,
+   * use the relative path so that the binary loader will have to
+   * search the PATH variable to find the executable.
+   */
+
+#ifdef CONFIG_BINFMT_EXEPATH
+  filepath = g_hello;
+#else
+  snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_hello);
+  filepath = fullpath;
+#endif
+
+  /* Execute the program */
+
+  mm_update(&g_mmstep, "before posix_spawn");
+
+  ret = posix_spawn(&pid, filepath, &file_actions, &attr, NULL, (FAR char * const*)&g_argv);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawn failed: %d\n", ret);
+    }
+
+  sleep(4);
+  mm_update(&g_mmstep, "after posix_spawn");
+
+  /* Free attibutes and file actions */
+
+  ret = posix_spawn_file_actions_destroy(&file_actions);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawn_file_actions_destroy failed: %d\n", ret);
+    }
+  posix_spawn_file_actions_dump(&file_actions);
+
+  ret = posix_spawnattr_destroy(&attr);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawnattr_destroy failed: %d\n", ret);
+    }
+  posix_spawnattr_dump(&attr);
+
+  mm_update(&g_mmstep, "after file_action/attr destruction");
+
+  /*************************************************************************
+   * Case 2: Simple program with redirection of stdin
+   *************************************************************************/
+
+  /* Output a seperated so that we can clearly discriminate the output of
+   * this program from the others.
+   */
+
+  testheader(g_redirect);
+
+  /* Initialize the attributes file actions structure */
+
+  ret = posix_spawn_file_actions_init(&file_actions);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawn_file_actions_init failed: %d\n", ret);
+    }
+  posix_spawn_file_actions_dump(&file_actions);
+
+  ret = posix_spawnattr_init(&attr);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawnattr_init failed: %d\n", ret);
+    }
+  posix_spawnattr_dump(&attr);
 
   mm_update(&g_mmstep, "after file_action/attr init");
 
@@ -313,13 +395,15 @@ int spawn_main(int argc, char *argv[])
     {
       err("ERROR: posix_spawn_file_actions_addclose failed: %d\n", ret);
     }
+  posix_spawn_file_actions_dump(&file_actions);
 
-  snprintf(fullpath, 128, "%s/%s", MOUNTPT, data);
+  snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_data);
   ret = posix_spawn_file_actions_addopen(&file_actions, 0, fullpath, O_RDONLY, 0644);
   if (ret != 0)
     {
       err("ERROR: posix_spawn_file_actions_addopen failed: %d\n", ret);
     }
+  posix_spawn_file_actions_dump(&file_actions);
   
   mm_update(&g_mmstep, "after adding file_actions");
 
@@ -330,9 +414,9 @@ int spawn_main(int argc, char *argv[])
    */
 
 #ifdef CONFIG_BINFMT_EXEPATH
-  filepath = program;
+  filepath = g_redirect;
 #else
-  snprintf(fullpath, 128, "%s/%s", MOUNTPT, program);
+  snprintf(fullpath, 128, "%s/%s", MOUNTPT, g_redirect);
   filepath = fullpath;
 #endif
 
@@ -346,13 +430,29 @@ int spawn_main(int argc, char *argv[])
       err("ERROR: posix_spawn failed: %d\n", ret);
     }
 
-  sleep(1);
+  sleep(2);
   mm_update(&g_mmstep, "after posix_spawn");
 
+  /* Free attibutes and file actions */
+
+  ret = posix_spawn_file_actions_destroy(&file_actions);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawn_file_actions_destroy failed: %d\n", ret);
+    }
+  posix_spawn_file_actions_dump(&file_actions);
+
+  ret = posix_spawnattr_destroy(&attr);
+  if (ret != 0)
+    {
+      err("ERROR: posix_spawnattr_destroy failed: %d\n", ret);
+    }
+  posix_spawnattr_dump(&attr);
+
+  mm_update(&g_mmstep, "after file_action/attr destruction");
+
   /* Clean-up */
 
-  (void)posix_spawn_file_actions_destroy(&file_actions);
-  (void)posix_spawnattr_destroy(&attr);
   elf_uninitialize();
 
   mm_update(&g_mmstep, "End-of-Test");