Changeset 574 for trunk/user/init

Timestamp:

Oct 5, 2018, 12:26:30 AM (6 years ago)

Author:

alain

Message:

Cosmetic.

Location:

trunk/user/init

Files:

• Makefile (modified) (1 diff)
• init.c (modified) (4 diffs)

trunk/user/init/Makefile

@@ -16 +16 @@
            -I$(LIBPTHREAD_INCLUDE)  \
            -I$(LIBALMOSMKH_INCLUDE) \
-           -I$(SHARED_INCLUDE)
+           -I$(SHARED_INCLUDE)      \
+           -I$(HAL_INCLUDE)
 
 compile : dirs build/init.elf
 
 build/init.elf : $(OBJS) init.ld
-        $(LD) -o $@ -T init.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -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

@@ -18 +18 @@
 #include <pthread.h>
 #include <almosmkh.h>
+#include <hal_macros.h>
 #include <sys/wait.h>
 
 #define DEBUG_PROCESS_INIT    0
 
-// 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]
 
-//////////
+// TODO introduce a communication channel between INIT and KSH
+// to allow KSH to signal INIT the exec completion.
+
+////////////////
 int main( void )
 {
@@ -39 +38 @@
     int           status;        // used by the wait syscall
     char          string[64];    // log messages on kernel TXT0
+
+#if DEBUG_PROCESS_INIT
+display_string("[INIT] process enters");
+#endif
 
     // check number of TXT channels
@@ -105 +108 @@
     for( x = 0 ; x < x_size ; x++ )
     {
-        for( y = 0 ; y < y_size - 1 ; y++ )
-        {
-            cxy = CXY_FROM_XY( x , y );
+        cxy = HAL_CXY_FROM_XY( x , y );
+        display_cluster_processes( cxy );
+        for( lid = 0 ; lid < ncores ; lid++ )
+        { 
             display_cluster_processes( cxy );
-            for( lid = 0 ; lid < ncores ; lid++ )
-            {
-                display_sched( cxy , lid );
-            }
         }
     }
@@ -180 +180 @@
             for( y = 0 ; y < y_size ; y++ )
             {
-                cxy = CXY_FROM_XY( x , y );
+                cxy = HAL_CXY_FROM_XY( x , y );
                 display_cluster_processes( cxy );
                 for( lid = 0 ; lid < ncores ; lid++ )