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

Timestamp:

May 3, 2018, 5:51:22 PM (6 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/scheduler.c (modified) (4 diffs)

trunk/kernel/kern/scheduler.c

@@ -125 +125 @@
             thread = LIST_ELEMENT( current , thread_t , sched_list );
 
-            // execute RPC thread if non blocked
-            if( (thread->blocked == 0)  && 
-                (thread->type == THREAD_RPC) )
-            {
-                spinlock_unlock( &sched->lock );
-                return thread;
-            }
-
-            // execute DEV thread if non blocked and waiting queue non empty
-            if( (thread->blocked == 0)  &&
-                (thread->type == THREAD_DEV) &&
-                (xlist_is_empty( XPTR( local_cxy , &thread->chdev->wait_root)) == 0) ) 
+            // select kernel thread if non blocked and non IDLE
+            if( (thread->blocked == 0)  && (thread->type != THREAD_IDLE) )
             {
                 spinlock_unlock( &sched->lock );
@@ -186 +176 @@
 
     list_entry_t * iter;
+    list_entry_t * root;
     thread_t     * thread;
     process_t    * process;
 
+    // get pointer on scheduler
     scheduler_t  * sched = &core->scheduler;
+
+    // get pointer on user threads root
+    root = &sched->u_root;
 
     // take lock protecting threads lists
     spinlock_lock( &sched->lock );
 
+    // We use a while to scan the user threads, to control the iterator increment,
+    // because some threads will be destroyed, and we cannot use a LIST_FOREACH()
+
+    // initialise list iterator
+    iter = root->next;
+
     // scan all user threads
-    LIST_FOREACH( &sched->u_root , iter )
-    {
+    while( iter != root )
+    {
+        // get pointer on thread
         thread = LIST_ELEMENT( iter , thread_t , sched_list );
+
+        // increment iterator
+        iter = iter->next;
 
         // handle REQ_ACK 
@@ -219 +224 @@
             process = thread->process;
 
+                // release FPU if required
+                if( thread->core->fpu_owner == thread )  thread->core->fpu_owner = NULL;
+
+            // remove thread from scheduler (scheduler lock already taken)
+            uint32_t threads_nr = sched->u_threads_nr;
+
+            assert( (threads_nr != 0) , __FUNCTION__ , "u_threads_nr cannot be 0\n" );
+
+            sched->u_threads_nr = threads_nr - 1;
+            list_unlink( &thread->sched_list );
+            if( threads_nr == 1 ) sched->u_last = NULL;
+
+            // delete thread
+            thread_destroy( thread );
+
 #if DEBUG_SCHED_HANDLE_SIGNALS
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
-printk("\n[DBG] %s : thread %x in proces %x must be deleted / cycle %d\n",
-__FUNCTION__ , thread , process->pid , cycle );
-#endif
-                // release FPU if required
-                if( thread->core->fpu_owner == thread )  thread->core->fpu_owner = NULL;
-
-            // detach thread from parent if attached
-            if( (thread->flags & THREAD_FLAG_DETACHED) == 0 ) 
-            thread_child_parent_unlink( thread->parent , XPTR( local_cxy , thread ) );
-
-            // remove thread from scheduler (scheduler lock already taken)
-            uint32_t threads_nr = sched->u_threads_nr;
-            assert( (threads_nr != 0) , __FUNCTION__ , "u_threads_nr cannot be 0\n" );
-            sched->u_threads_nr = threads_nr - 1;
-            list_unlink( &thread->sched_list );
-            if( threads_nr == 1 ) sched->u_last = NULL;
-
-            // delete thread
-            thread_destroy( thread );
-
-#if DEBUG_SCHED_HANDLE_SIGNALS
-cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_SCHED_HANDLE_SIGNALS < cycle )
-printk("\n[DBG] %s : thread %x in process %x has been deleted / cycle %d\n",
-__FUNCTION__ , thread , process->pid , cycle );
+printk("\n[DBG] %s : thread %x in proces %x (%x) deleted / cycle %d\n",
+__FUNCTION__ , thread , process->pid , process , cycle );
 #endif
             // destroy process descriptor if no more threads
@@ -314 +311 @@
     {
 
+if( (local_cxy == 0X1) && (core->lid == 1) && ((uint32_t)current == 0xcc000) )
+printk("\n@@@@@ cc000 exit at cycle %d\n", (uint32_t)hal_get_cycles() );
+
+if( (local_cxy == 0X1) && (core->lid == 1) && ((uint32_t)next == 0xcc000) )
+printk("\n@@@@@ cc000 enter at cycle %d\n", (uint32_t)hal_get_cycles() );
+
 #if DEBUG_SCHED_YIELD
 uint32_t cycle = (uint32_t)hal_get_cycles();