Changeset c1403ef1 in rtems for c/src/lib/libbsp/unix/posix/startup

Timestamp:

08/11/95 14:30:27 (28 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

4e58d80

Parents:

aa9f194

Message:

Added flush of output on exit. On some UNIX's using the native library
resulted in no output when the output was redirected until this was done.
Redirection is important because runtest redirects test output.

Added support for numerous environment variables which make it easier
to run a multi-node system using a single executable and to tailor
the size of the workspace and heap.

Location:

c/src/lib/libbsp/unix/posix/startup

Files:

• bspclean.c (modified) (2 diffs)
• bspstart.c (modified) (6 diffs)
• rtems-ctor.cc (modified) (6 diffs)
• setvec.c (modified) (2 diffs)

c/src/lib/libbsp/unix/posix/startup/bspclean.c

@@ -23 +23 @@
 #include <bsp.h>
 
+#include <stdio.h>
+
 /*
  * The app has "exited" (called rtems_shutdown_executive)
@@ -34 +36 @@
      */
 
+fflush(stdout);
+fflush(stderr);
+
     rtems_fatal_error_occurred(0);
 }

c/src/lib/libbsp/unix/posix/startup/bspstart.c

@@ -34 +34 @@
 #include <fcntl.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include <bsp.h>
@@ -59 +58 @@
 char                       **rtems_envp;
 
-
-#define WORKSPACE_SIZE (WORKSPACE_MB * (1024 * 1024))
-#define HEAPSPACE_SIZE (HEAPSPACE_MB * (1024 * 1024))
-
-rtems_unsigned8   MY_WORK_SPACE[ WORKSPACE_SIZE ] CPU_STRUCTURE_ALIGNMENT;
+/*
+ * May be overridden by RTEMS_WORKSPACE_SIZE and RTEMS_HEAPSPACE_SIZE
+ * environment variables; see below.
+ */
+
+#define DEFAULT_WORKSPACE_SIZE (WORKSPACE_MB * (1024 * 1024))
+#define DEFAULT_HEAPSPACE_SIZE (HEAPSPACE_MB * (1024 * 1024))
 
 /*
@@ -103 +104 @@
     void *heap_start;
 
-    Heap_size = HEAPSPACE_SIZE;
+    if (getenv("RTEMS_HEAPSPACE_SIZE"))
+        Heap_size = strtol(getenv("RTEMS_HEAPSPACE_SIZE"), 0, 0);
+    else
+        Heap_size = DEFAULT_HEAPSPACE_SIZE;
+ 
     heap_start = 0;
 
@@ -186 +191 @@
 bsp_start(void)
 {
-    struct stat  stat_buf;
-    char         buf[256];
-    char         node[6];
-    char        *home;
-    int          fd;
+    unsigned32 workspace_ptr;
 
     /*
@@ -199 +200 @@
  
     /*
-     * If the node number is -1 then the application better provide
-     * it through the file $HOME/rtems_node
-     */
-
-    BSP_Multiprocessing.node = -1;
+     *  If the node number is -1 then the application better provide
+     *  it through environment variables RTEMS_NODE.
+     *  Ditto for RTEMS_MAXIMUM_NODES
+     */
 
     if (BSP_Configuration.User_multiprocessing_table) {
-      if (BSP_Configuration.User_multiprocessing_table->node == -1) {
-        home = getenv("HOME");
-        sprintf(buf, "%s/%s", home, "rtems_node");
-        if ((stat(buf, &stat_buf)) == 0) {
-          fd = open(buf, O_RDONLY);
-          read(fd, node, 5);
-          close(fd);
-          unlink(buf);
-          BSP_Multiprocessing = *BSP_Configuration.User_multiprocessing_table;
-          BSP_Multiprocessing.node = atoi(node);
-          BSP_Configuration.User_multiprocessing_table = &BSP_Multiprocessing;
+        char *p;
+ 
+        /* make a copy for possible editing */
+        BSP_Multiprocessing = *BSP_Configuration.User_multiprocessing_table;
+        BSP_Configuration.User_multiprocessing_table = &BSP_Multiprocessing;
+ 
+        if (BSP_Multiprocessing.node == -1)
+        {
+            p = getenv("RTEMS_NODE");
+            BSP_Multiprocessing.node = p ? atoi(p) : 1;
         }
-        if (BSP_Configuration.User_multiprocessing_table->maximum_nodes == -1) {
-          home = getenv("HOME");
-          sprintf(buf, "%s/%s", home, "rtems_max_node");
-          if ((stat(buf, &stat_buf)) == 0) {
-            fd = open(buf, O_RDONLY);
-            read(fd, node, 5);
-            close(fd);
-            BSP_Multiprocessing.maximum_nodes = atoi(node);
-          }
+ 
+        /* If needed provide maximum_nodes also */
+        if (BSP_Multiprocessing.maximum_nodes == -1)
+        {
+            p = getenv("RTEMS_MAXIMUM_NODES");
+            BSP_Multiprocessing.maximum_nodes = p ? atoi(p) : 1;
         }
-      }
     }
 
@@ -240 +235 @@
         cpu_number = 0;
 
-    BSP_Configuration.work_space_start = (void *)MY_WORK_SPACE;
-    if (BSP_Configuration.work_space_size)
-        BSP_Configuration.work_space_size = WORKSPACE_SIZE;
-
+    if (getenv("RTEMS_WORKSPACE_SIZE"))
+        BSP_Configuration.work_space_size = 
+           strtol(getenv("RTEMS_WORKSPACE_SIZE"), 0, 0);
+    else
+        BSP_Configuration.work_space_size = DEFAULT_WORKSPACE_SIZE;
+ 
+    /*
+     * Allocate workspace memory, ensuring it is properly aligned
+     */
+ 
+    workspace_ptr = 
+      (unsigned32) sbrk(BSP_Configuration.work_space_size + CPU_ALIGNMENT);
+    workspace_ptr += CPU_ALIGNMENT - 1;
+    workspace_ptr &= ~(CPU_ALIGNMENT - 1);
+
+    BSP_Configuration.work_space_start = (void *) workspace_ptr;
+ 
     /*
      * Set up our hooks

c/src/lib/libbsp/unix/posix/startup/rtems-ctor.cc

@@ -1 +1 @@
 //      @(#)rtems-ctor.cc       1.6 - 95/04/25
-//      
+// 
 //
 
@@ -7 +7 @@
  *
  *  Description:
- *      This file exists solely to (try to) ensure RTEMS is initialized
+ *  This file exists solely to (try to) ensure RTEMS is initialized
  *      before any global constructors are run.
  *
@@ -50 +50 @@
 
 #include <bsp.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 /*
@@ -62 +64 @@
 class RTEMS {
     public:
-        RTEMS();
+         RTEMS();
         ~RTEMS();
 };
@@ -84 +86 @@
          char **environp)
     {
-        rtems_argc = argc;
-        rtems_argv = argv;
-        rtems_envp = environp;
+        rtems_argc = argc;
+        rtems_argv = argv;
+        rtems_envp = environp;
 
         if ((argc > 0) && argv && argv[0])
@@ -104 +106 @@
          */
 
+        fflush( stdout );
+        fflush( stderr );
         return 0;
     }

c/src/lib/libbsp/unix/posix/startup/setvec.c

@@ -38 +38 @@
  */
 
-unix_isr_entry
+rtems_isr_entry
 set_vector(                                     /* returns old vector */
     rtems_isr_entry     handler,                /* isr routine        */
@@ -50 +50 @@
     if ( type ) {
       rtems_interrupt_catch( handler, vector, &rtems_isr_ptr );
-      return (unix_isr_entry) rtems_isr_ptr;
+      return rtems_isr_ptr;
     } else {
       _CPU_ISR_install_vector( vector, (proc_ptr) handler, &raw_isr_ptr );
-      return (unix_isr_entry) raw_isr_ptr;
+      return raw_isr_ptr;
     }