Changeset 574 for trunk/user/init


Ignore:
Timestamp:
Oct 5, 2018, 12:26:30 AM (4 years ago)
Author:
alain
Message:

Cosmetic.

Location:
trunk/user/init
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/user/init/Makefile

    r445 r574  
    1616           -I$(LIBPTHREAD_INCLUDE)  \
    1717           -I$(LIBALMOSMKH_INCLUDE) \
    18            -I$(SHARED_INCLUDE)
     18           -I$(SHARED_INCLUDE)      \
     19           -I$(HAL_INCLUDE)
    1920
    2021compile : dirs build/init.elf
    2122
    2223build/init.elf : $(OBJS) init.ld
    23         $(LD) -o $@ -T init.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) -lc -lpthread -lalmosmkh -lpthread -lc
     24        $(LD) -o $@ -T init.ld $(OBJS) -L$(LIBC) -L$(LIBPTHREAD) -L$(LIBALMOSMKH) \
     25        -lc -lpthread -lalmosmkh -lpthread -lc
    2426        $(DU) -D $@ > $@.txt
    2527
  • trunk/user/init/init.c

    r528 r574  
    1818#include <pthread.h>
    1919#include <almosmkh.h>
     20#include <hal_macros.h>
    2021#include <sys/wait.h>
    2122
    2223#define DEBUG_PROCESS_INIT    0
    2324
    24 // TODO make the cxy computation portable
    25 // and avoid this TSAR specific define [AG]
    26 
    27 #define CXY_FROM_XY( x , y )  ((x<<4) + y)
    28 
    2925// TODO improve the get_config() syscall to return nb_txt_channels
    3026// and avoid the hard_config include [AG]
    3127
    32 //////////
     28// TODO introduce a communication channel between INIT and KSH
     29// to allow KSH to signal INIT the exec completion.
     30
     31////////////////
    3332int main( void )
    3433{
     
    3938    int           status;        // used by the wait syscall
    4039    char          string[64];    // log messages on kernel TXT0
     40
     41#if DEBUG_PROCESS_INIT
     42display_string("[INIT] process enters");
     43#endif
    4144
    4245    // check number of TXT channels
     
    105108    for( x = 0 ; x < x_size ; x++ )
    106109    {
    107         for( y = 0 ; y < y_size - 1 ; y++ )
    108         {
    109             cxy = CXY_FROM_XY( x , y );
     110        cxy = HAL_CXY_FROM_XY( x , y );
     111        display_cluster_processes( cxy );
     112        for( lid = 0 ; lid < ncores ; lid++ )
     113        {
    110114            display_cluster_processes( cxy );
    111             for( lid = 0 ; lid < ncores ; lid++ )
    112             {
    113                 display_sched( cxy , lid );
    114             }
    115115        }
    116116    }
     
    180180            for( y = 0 ; y < y_size ; y++ )
    181181            {
    182                 cxy = CXY_FROM_XY( x , y );
     182                cxy = HAL_CXY_FROM_XY( x , y );
    183183                display_cluster_processes( cxy );
    184184                for( lid = 0 ; lid < ncores ; lid++ )
Note: See TracChangeset for help on using the changeset viewer.