Changeset 625 for trunk/kernel/kern/scheduler.c

Timestamp:

Apr 10, 2019, 10:09:39 AM (5 years ago)

Author:

alain

Message:

Fix a bug in the vmm_remove_vseg() function: the physical pages
associated to an user DATA vseg were released to the kernel when
the target process descriptor was in the reference cluster.
This physical pages release should be done only when the page
forks counter value is zero.
All other modifications are cosmetic.

File:

• trunk/kernel/kern/scheduler.c (modified) (11 diffs)

trunk/kernel/kern/scheduler.c

@@ -180 +180 @@
     sched = &core->scheduler;
 
-    /////////////// scan user threads to handle both ACK and DELETE requests
+    ////////////////// scan user threads to handle both ACK and DELETE requests
     root = &sched->u_root;
     iter = root->next;
@@ -240 +240 @@
             busylock_release( &sched->lock );
 
-// check th_nr value
-assert( (process->th_nr > 0) , "process th_nr cannot be 0\n" );
-
-            // remove thread from process th_tbl[]
-            process->th_tbl[ltid] = NULL;
-            count = hal_atomic_add( &process->th_nr , - 1 );
- 
-            // release memory allocated for thread descriptor
-            thread_destroy( thread );
+            // release memory allocated for thread 
+            count = thread_destroy( thread );
 
             hal_fence();
@@ -255 +248 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
-printk("\n[%s] thread[%x,%x] on core[%x,%d] deleted / cycle %d\n",
-__FUNCTION__ , process->pid , thread->trdid , local_cxy , thread->core->lid , cycle );
+printk("\n[%s] thread[%x,%x] on core[%x,%d] deleted / %d threads / cycle %d\n",
+__FUNCTION__, process->pid, thread->trdid, local_cxy, thread->core->lid, count, cycle );
 #endif
             // destroy process descriptor if last thread
@@ -274 +267 @@
     }  // end user threads
 
-    ////// scan kernel threads for DELETE only
+    ///////////// scan kernel threads for DELETE only
     root = &sched->k_root;
     iter = root->next;
@@ -290 +283 @@
 
 // check process descriptor is local kernel process
-assert( ( thread->process == &process_zero ) , "illegal process descriptor\n");
+assert( ( thread->process == &process_zero ) , "illegal process descriptor");
 
             // get thread ltid
@@ -325 +318 @@
 
 // check th_nr value
-assert( (process_zero.th_nr > 0) , "kernel process th_nr cannot be 0\n" );
+assert( (process_zero.th_nr > 0) , "kernel process th_nr cannot be 0" );
 
             // remove thread from process th_tbl[]
@@ -477 +470 @@
 }  // end sched_register_thread()
 
-//////////////////////////////////////
-void sched_yield( const char * cause )
+//////////////////////////////////////////////////////////////////
+void sched_yield( const char * cause __attribute__((__unused__)) )
 {
     thread_t      * next;
@@ -512 +505 @@
 // check next thread kernel_stack overflow
 assert( (next->signature == THREAD_SIGNATURE),
-"kernel stack overflow for thread %x on core[%x,%d] \n", next, local_cxy, lid );
+"kernel stack overflow for thread %x on core[%x,%d]", next, local_cxy, lid );
 
 // check next thread attached to same core as the calling thread
 assert( (next->core == current->core),
-"next core %x != current core %x\n", next->core, current->core );
+"next core %x != current core %x", next->core, current->core );
 
 // check next thread not blocked when type != IDLE
 assert( ((next->blocked == 0) || (next->type == THREAD_IDLE)) ,
-"next thread %x (%s) is blocked on core[%x,%d]\n", 
+"next thread %x (%s) is blocked on core[%x,%d]", 
 next->trdid , thread_type_str(next->type) , local_cxy , lid );
 
@@ -561 +554 @@
 #if (DEBUG_SCHED_YIELD & 1)
 // if( sched->trace )
-if(uint32_t)hal_get_cycles() > DEBUG_SCHED_YIELD )
+if( (uint32_t)hal_get_cycles() > DEBUG_SCHED_YIELD )
 printk("\n[%s] core[%x,%d] / cause = %s\n"
 "      thread %x (%s) (%x,%x) continue / cycle %d\n",
@@ -584 +577 @@
     list_entry_t * iter;
     thread_t     * thread;
-
-// check lid
-assert( (lid < LOCAL_CLUSTER->cores_nr), 
-"illegal core index %d\n", lid);
 
     core_t       * core    = &LOCAL_CLUSTER->core_tbl[lid];
@@ -644 +633 @@
 {
     thread_t     * thread;
-
-// check cxy
-assert( (cluster_is_undefined( cxy ) == false),
-"illegal cluster %x\n", cxy );
-
-assert( (lid < hal_remote_l32( XPTR( cxy , &LOCAL_CLUSTER->cores_nr ) ) ),
-"illegal core index %d\n", lid );
 
     // get local pointer on target scheduler