Changeset 428 for trunk/kernel/kern/thread.c

Timestamp:

Jan 29, 2018, 6:08:07 PM (6 years ago)

Author:

alain

Message:

blip

File:

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

trunk/kernel/kern/thread.c

@@ -141 +141 @@
 
     // register new thread in process descriptor, and get a TRDID
-    spinlock_lock( &process->th_lock );
     error = process_register_thread( process, thread , &trdid );
-    spinlock_unlock( &process->th_lock );
 
     if( error )
@@ -228 +226 @@
 
     assert( (attr != NULL) , __FUNCTION__, "pthread attributes must be defined" );
+
+thread_dmsg("\n[DBG] %s : core[%x,%d] enter for process %x\n",
+__FUNCTION__, local_cxy, CURRENT_THREAD->core->lid, process->pid );
 
     // get process descriptor local copy
@@ -290 +291 @@
                          vseg->min,
                          vseg->max - vseg->min );
-
     if( error )
     {
@@ -326 +326 @@
     dqdt_local_update_threads( 1 );
 
-thread_dmsg("\n[DBG] %s : core[%x,%d] exit / trdid = %x / process %x / core = %d\n",
-__FUNCTION__, local_cxy, CURRENT_THREAD->core->lid,
-thread->trdid , process->pid , core_lid );
+thread_dmsg("\n[DBG] %s : core[%x,%d] exit for process %x / trdid = %x / core = %d\n",
+__FUNCTION__, local_cxy, CURRENT_THREAD->core->lid, process->pid, thread->trdid, core_lid );
 
     *new_thread = thread;
@@ -371 +370 @@
 
     // get relevant fields from parent thread 
-    func  = (void *)  hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->entry_func   ) );
-    args  = (void *)  hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->entry_args   ) );
-    base  = (intptr_t)hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->u_stack_base ) );
-    size  = (uint32_t)hal_remote_lw ( XPTR( parent_cxy , &parent_ptr->u_stack_size ) );
-    flags =           hal_remote_lw ( XPTR( parent_cxy , &parent_ptr->flags        ) );
-    uzone = (reg_t *) hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->uzone        ) );
+    func  = (void *)  hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->entry_func    ));
+    args  = (void *)  hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->entry_args    ));
+    base  = (intptr_t)hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->u_stack_base  ));
+    size  = (uint32_t)hal_remote_lw ( XPTR( parent_cxy , &parent_ptr->u_stack_size  ));
+    flags =           hal_remote_lw ( XPTR( parent_cxy , &parent_ptr->flags         ));
+    uzone = (reg_t *) hal_remote_lpt( XPTR( parent_cxy , &parent_ptr->uzone_current ));
 
     vpn_base = base >> CONFIG_PPM_PAGE_SHIFT;
@@ -419 +418 @@
 
     // update uzone pointer in child thread descriptor
-    child_ptr->uzone = (char *)((intptr_t)uzone +
-                                (intptr_t)child_ptr - 
-                                (intptr_t)parent_ptr );
+    child_ptr->uzone_current = (char *)((intptr_t)uzone +
+                                        (intptr_t)child_ptr - 
+                                        (intptr_t)parent_ptr );
  
 
@@ -515 +514 @@
         thread_t     * thread;       // pointer on new thread descriptor
 
-thread_dmsg("\n[DBG] %s : core[%x,%d] enters / type % / cycle %d\n",
+thread_dmsg("\n[DBG] %s : core[%x,%d] enters / type %s / cycle %d\n",
 __FUNCTION__ , local_cxy , core_lid , thread_type_str( type ) , hal_time_stamp() );
 
@@ -615 +614 @@
         if ( thread->type == THREAD_USER ) hal_fpu_context_destroy( thread );
         
-    // release FPU if required
-    // TODO This should be done before calling thread_destroy()
+    // release FPU ownership if required
         hal_disable_irq( &save_sr );
         if( core->fpu_owner == thread )
@@ -626 +624 @@
 
     // remove thread from process th_tbl[]
-    // TODO This should be done before calling thread_destroy()
-    ltid_t ltid = LTID_FROM_TRDID( thread->trdid );
-
-        spinlock_lock( &process->th_lock );
-        process->th_tbl[ltid] = XPTR_NULL;
-        process->th_nr--;
-        spinlock_unlock( &process->th_lock );
+    process_remove_thread( thread );
         
     // update local DQDT
@@ -814 +806 @@
 
 thread_dmsg("\n[DBG] %s : killer thread %x enter for target thread %x\n",
-__FUNCTION__, local_cxy, killer->trdid , target trdid );
+__FUNCTION__, local_cxy, killer->trdid , target->trdid );
 
     // set the global blocked bit in target thread descriptor.
@@ -844 +836 @@
 
 thread_dmsg("\n[DBG] %s : killer thread %x exit for target thread %x\n",
-__FUNCTION__, local_cxy, killer->trdid , target trdid );
+__FUNCTION__, local_cxy, killer->trdid , target->trdid );
 
 }  // end thread_kill()