Changeset 445 for trunk/user/init

Timestamp:

May 29, 2018, 9:27:23 AM (7 years ago)

Author:

alain

Message:

Restructure the mini_libc.

Location:

trunk/user/init

Files:

• Makefile (modified) (2 diffs)
• init.c (modified) (3 diffs)

trunk/user/init/Makefile

@@ -1 +1 @@
 #########################################################################
-# Makefile for the ALMOS-MKH "init" application
+# Makefile for the "init" application
 #########################################################################
 
@@ -11 +11 @@
 OBJS = build/init.o
 
-INCLUDES = -I.                   \
-           -I../..               \
-           -I$(LIBC_INCLUDE)/    \
-           -I$(LIBPTHREAD_INCLUDE) \
+INCLUDES = -I.                      \
+           -I../..                  \
+           -I$(LIBC_INCLUDE)        \
+           -I$(LIBPTHREAD_INCLUDE)  \
            -I$(LIBALMOSMKH_INCLUDE) \
            -I$(SHARED_INCLUDE)
 
 compile : dirs build/init.elf
+
 build/init.elf : $(OBJS) init.ld
-        $(LD) -o $@ -T init.ld $(OBJS) -nostdlib -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmos-mkh -lpthread -lc
+        $(LD) -o $@ -T init.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -lpthread -lc
         $(DU) -D $@ > $@.txt
 

trunk/user/init/init.c

@@ -17 +17 @@
 #include <stdio.h>
 #include <pthread.h>
-#include <almos-mkh.h>
-#include <assert.h>
+#include <almosmkh.h>
 #include <sys/wait.h>
 
 #define DEBUG_PROCESS_INIT    0
 
-// TODO make the cxy computation portable [AG]
+// TODO make the cxy computation portable
+// and avoid this TSAR specific define [AG]
+
 #define CXY_FROM_XY( x , y )  ((x<<4) + y)
+
+// TODO improve the get_config() syscall to return nb_txt_channels
+// and avoid the hard_config include [AG]
 
 //////////
@@ -37 +41 @@
 
     // check number of TXT channels
-    assert( NB_TXT_CHANNELS > 1 );
+    if( NB_TXT_CHANNELS < 2 )
+    {
+        printf("\n[ERROR] in init process : number of TXT channels must be larger than 1\n");
+        exit( EXIT_FAILURE );
+    }
 
     // create the KSH processes (one per user terminal)
@@ -73 +81 @@
              display_string( string );
         }
+
+        // INIT wait CHILD[i] process deletion before creating KSH[i+1]
+        // int n;
+        // for( n = 0 ; n < 100000 ; n++ ) asm volatile ( "nop" );
+        wait( &status );
     }