Changeset 440 for trunk/kernel/kern/cluster.c

Timestamp:

May 3, 2018, 5:51:22 PM (5 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

• trunk/kernel/kern/cluster.c (modified) (8 diffs)

trunk/kernel/kern/cluster.c

@@ -153 +153 @@
 #endif
 
-    // initialises RPC fifo
-        local_fifo_init( &cluster->rpc_fifo );
-    cluster->rpc_threads = 0;
+    // initialises RPC FIFOs
+        for( lid = 0 ; lid < cluster->cores_nr; lid++ )
+    {
+            local_fifo_init( &cluster->rpc_fifo[lid] );
+        cluster->rpc_threads[lid] = 0;
+    }
 
 #if( DEBUG_CLUSTER_INIT & 1 )
@@ -221 +224 @@
 lid_t cluster_select_local_core()
 {
-    uint32_t min = 100;
-    lid_t    sel = 0;
-    lid_t    lid;
+    uint32_t      min = 1000;
+    lid_t         sel = 0;
+    uint32_t      nthreads;
+    lid_t         lid;
+    scheduler_t * sched;
 
     cluster_t * cluster = LOCAL_CLUSTER;
@@ -229 +234 @@
     for( lid = 0 ; lid < cluster->cores_nr ; lid++ )
     {
-        if( cluster->core_tbl[lid].usage < min )
+        sched    = &cluster->core_tbl[lid].scheduler;
+        nthreads = sched->u_threads_nr + sched->k_threads_nr;
+
+        if( nthreads < min )
         {
-            min = cluster->core_tbl[lid].usage;
+            min = nthreads;
             sel = lid;
         }
@@ -323 +331 @@
     bool_t      found;
 
+#if DEBUG_CLUSTER_PID_ALLOC
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_CLUSTER_PID_ALLOC < cycle )
+printk("\n[DBG] %s : thread %x enters in cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
+#endif
+
     pmgr_t    * pm         = &LOCAL_CLUSTER->pmgr;
 
@@ -361 +376 @@
     }
 
+#if DEBUG_CLUSTER_PID_ALLOC
+cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_CLUSTER_PID_ALLOC < cycle )
+printk("\n[DBG] %s : thread %x exit in cluster %x / pid %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , *pid , cycle );
+#endif
+
 } // end cluster_pid_alloc()
 
@@ -366 +388 @@
 void cluster_pid_release( pid_t pid )
 {
+
+#if DEBUG_CLUSTER_PID_RELEASE
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_CLUSTER_PID_RELEASE < cycle )
+printk("\n[DBG] %s : thread %x enters in cluster %x / pid %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , pid , cycle );
+#endif
+
     cxy_t  owner_cxy  = CXY_FROM_PID( pid );
     lpid_t lpid       = LPID_FROM_PID( pid );
@@ -371 +401 @@
     pmgr_t  * pm = &LOCAL_CLUSTER->pmgr;
 
-    // check pid argument
-    assert( (lpid < CONFIG_MAX_PROCESS_PER_CLUSTER) && (owner_cxy == local_cxy) ,
-    __FUNCTION__ , "illegal PID" );
+    // check lpid 
+    assert( (lpid < CONFIG_MAX_PROCESS_PER_CLUSTER), __FUNCTION__ ,
+    "illegal LPID = %d" , lpid );
+
+    // check owner cluster
+    assert( (owner_cxy == local_cxy) , __FUNCTION__ ,
+    "local_cluster %x !=  owner_cluster %x" , local_cxy , owner_cxy );
 
     // get the process manager lock
@@ -384 +418 @@
     // release the processs_manager lock
     spinlock_unlock( &pm->pref_lock );
+
+#if DEBUG_CLUSTER_PID_RELEASE
+cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_CLUSTER_PID_RELEASE < cycle )
+printk("\n[DBG] %s : thread %x exit in cluster %x / cycle %d\n",
+__FUNCTION__ , CURRENT_THREAD , local_cxy , cycle );
+#endif
 
 } // end cluster_pid_release()