Changeset 633 for trunk/kernel/kern

Timestamp:

May 28, 2019, 6:10:15 PM (6 years ago)

Author:

alain

Message:

cosmetic

Location:

trunk/kernel/kern

Files:

• kernel_init.c (modified) (4 diffs)
• process.c (modified) (6 diffs)
• thread.c (modified) (2 diffs)

trunk/kernel/kern/kernel_init.c

@@ -277 +277 @@
     uint32_t        x;               // X cluster coordinate
     uint32_t        y;               // Y cluster coordinate
-    uint32_t        channels;        // number of channels
 
     // get number of peripherals and base of devices array from boot_info
@@ -289 +288 @@
         func        = FUNC_FROM_TYPE( dev_tbl[i].type );
         impl        = IMPL_FROM_TYPE( dev_tbl[i].type );
-        channels    = dev_tbl[i].channels;
 
         if (func == DEV_FUNC_TXT )
@@ -587 +585 @@
                     // initialize the replicated chdev_dir[x][y] structures
                     // defining the extended pointers on chdev descriptors
-                    xptr_t * entry;
+                    xptr_t * entry = NULL;
 
                     if(func==DEV_FUNC_IOB             ) entry  = &chdev_dir.iob;
@@ -603 +601 @@
                             cxy_t cxy = HAL_CXY_FROM_XY( x , y );
 
-                            if( cluster_is_active( cxy ) )
+                            if( cluster_is_active( cxy ) && ( entry != NULL ) )
                             {
                                 hal_remote_s64( XPTR( cxy , entry ),

trunk/kernel/kern/process.c

@@ -789 +789 @@
     thread_t          * this;           // pointer on calling thread 
     uint32_t            ltid;           // index in process th_tbl[]
-    cxy_t               owner_cxy;      // target process owner cluster
     uint32_t            count;          // requests counter
     volatile uint32_t   ack_count;      // acknowledges counter
@@ -807 +806 @@
 assert( (LPID_FROM_PID( process->pid ) != 0 ),
 "process %x is not an user process\n", process->pid );
-
-    // get target process owner cluster
-    owner_cxy = CXY_FROM_PID( process->pid );
 
     // get lock protecting process th_tbl[]
@@ -873 +869 @@
                              xptr_t      client_xp )
 {
-    thread_t          * this;          // pointer on calling thread 
     thread_t          * target;        // local pointer on target thread 
     xptr_t              target_xp;     // extended pointer on target thread
@@ -881 +876 @@
 
     // get calling thread pointer
-    this = CURRENT_THREAD;
 
     // get target process owner cluster
@@ -887 +881 @@
 
 #if DEBUG_PROCESS_SIGACTION
-uint32_t cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_SIGACTION < cycle )
 printk("\n[%s] thread[%x,%x] enter for process %x n cluster %x / cycle %d\n",
@@ -937 +932 @@
 {
     thread_t          * target;        // pointer on target thead 
-    thread_t          * this;          // pointer on calling thread 
     uint32_t            ltid;          // index in process th_tbl
     uint32_t            count;         // requests counter
 
-    // get calling thread pointer
-    this = CURRENT_THREAD;
-
 #if DEBUG_PROCESS_SIGACTION
-pid_t pid = process->pid;
-uint32_t cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+pid_t      pid   = process->pid;
+uint32_t   cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_SIGACTION < cycle )
 printk("\n[%s] thread[%x,%x] enter for process %x in cluster %x / cycle %d\n",

trunk/kernel/kern/thread.c

@@ -1082 +1082 @@
     ltid_t      target_ltid;            // target thread local index
     xptr_t      joining_xp;             // extended pointer on joining thread
-    thread_t  * joining_ptr;            // pointer on joining thread
-    cxy_t       joining_cxy;            // joining thread cluster
 
     // get target thread cluster and local pointer
@@ -1143 +1141 @@
             // get extended pointer on joining thread
             joining_xp  = (xptr_t)hal_remote_l64( target_join_xp_xp );
-            joining_ptr = GET_PTR( joining_xp );
-            joining_cxy = GET_CXY( joining_xp );
             
             // reset the join_done flag in target thread