Changeset 469 for trunk/kernel/kern

Timestamp:

Aug 20, 2018, 1:04:16 PM (6 years ago)

Author:

alain

Message:

1) Introduce the libsemaphore library.
2) Introduce a small libmath library, required by the "fft" application..
3) Introduce the multithreaded "fft" application.
4) Fix a bad synchronisation bug in the Copy-On-Write mechanism.

Location:

trunk/kernel/kern

Files:

• printk.c (modified) (1 diff)
• process.c (modified) (6 diffs)
• scheduler.c (modified) (1 diff)
• thread.c (modified) (7 diffs)

trunk/kernel/kern/printk.c

@@ -407 +407 @@
 
         // call nolock_printk to print core, function_name, and cycle
-        nolock_printk("\n[PANIC] on core[%x,%d] in %s at cycle %d : " ,
-        local_cxy, CURRENT_THREAD->core->lid, function_name, (uint32_t)hal_get_cycles() );
+        nolock_printk("\n[PANIC] in %s => core[%x,%d] blocked at cycle %d : " ,
+        function_name, local_cxy, CURRENT_THREAD->core->lid, (uint32_t)hal_get_cycles() );
 
         // call kernel_printf on TXT0, in busy waiting to print format

trunk/kernel/kern/process.c

@@ -1163 +1163 @@
     }
 
-#if DEBUG_PROCESS_MAKE_FORK
+#if( DEBUG_PROCESS_MAKE_FORK & 1 )
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_FORK < cycle )
@@ -1240 +1240 @@
     "main thread must have LTID == 0\n" );
 
-#if( DEBUG_PROCESS_MAKE_FORK & 1 )
+//#if( DEBUG_PROCESS_MAKE_FORK & 1 )
+#if DEBUG_PROCESS_MAKE_FORK 
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_FORK < cycle )
-printk("\n[DBG] %s : thread %x in process %x created main thread %x on core[%x,%d] / cycle %d\n", 
-__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid,
-thread, local_cxy, thread->core->lid, cycle );
+printk("\n[DBG] %s : thread %x in process %x created main thread %x / cycle %d\n", 
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, thread, cycle );
 #endif
 
@@ -1342 +1342 @@
 
 #if (DEBUG_PROCESS_MAKE_EXEC & 1)
+cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_EXEC < cycle )
-printk("\n[DBG] %s : open file <%s>\n", __FUNCTION__, path );
+printk("\n[DBG] %s : thread %x in process %x opened file <%s> / cycle %d\n",
+__FUNCTION__, thread->trdid, pid, path, cycle );
 #endif
 
@@ -1349 +1351 @@
     process_sigaction( pid , DELETE_ALL_THREADS );
 
+#if (DEBUG_PROCESS_MAKE_EXEC & 1)
+cycle = (uint32_t)hal_get_cycles();
+if( DEBUG_PROCESS_MAKE_EXEC < cycle )
+printk("\n[DBG] %s : thread %x in process %x deleted all threads / cycle %d\n",
+__FUNCTION__, thread->trdid, pid, cycle );
+#endif
+
     // reset local process VMM
     vmm_destroy( process );
@@ -1355 +1364 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_EXEC < cycle )
-printk("\n[DBG] %s : thread %x in process %x / reset VMM / cycle %d\n",
+printk("\n[DBG] %s : thread %x in process %x reset VMM / cycle %d\n",
 __FUNCTION__, thread->trdid, pid, cycle );
 #endif
@@ -1400 +1409 @@
     if( error )
     {
-        printk("\n[ERROR] in %s : cannot reset main thread for %s\n", __FUNCTION__ , path );
+        printk("\n[ERROR] in %s : cannot update main thread for %s\n", __FUNCTION__ , path );
         vfs_close( file_xp , file_id );
         // FIXME restore old process VMM 

trunk/kernel/kern/scheduler.c

@@ -63 +63 @@
     list_root_init( &sched->k_root );
 
+    // init spinlock
+    spinlock_init( &sched->lock );
+
     sched->req_ack_pending = false;             // no pending request
     sched->trace           = false;             // context switches trace desactivated

trunk/kernel/kern/thread.c

@@ -86 +86 @@
     // return pointer on new thread descriptor
     xptr_t base_xp = ppm_page2base( XPTR(local_cxy , page ) );
-    return (thread_t *)GET_PTR( base_xp );
+    return GET_PTR( base_xp );
 
 }  // end thread_alloc()
@@ -419 +419 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_USER_FORK < cycle )
-printk("\n[DBG] %s : thread %x enter / child_process %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, child_process->pid, cycle );
+printk("\n[DBG] %s : thread %x in process %x enter / child_process %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, child_process->pid, cycle );
 #endif
 
@@ -428 +428 @@
     // get cluster and local pointer on parent thread descriptor
     parent_cxy = GET_CXY( parent_thread_xp );
-    parent_ptr = (thread_t *)GET_PTR( parent_thread_xp );
+    parent_ptr = GET_PTR( parent_thread_xp );
 
     // get relevant fields from parent thread 
@@ -538 +538 @@
         if( mapped )
         {
+            // get pointers on the page descriptor
             xptr_t   page_xp  = ppm_ppn2page( ppn );
             cxy_t    page_cxy = GET_CXY( page_xp );
-            page_t * page_ptr = (page_t *)GET_PTR( page_xp );
+            page_t * page_ptr = GET_PTR( page_xp );
+
+            // get extended pointers on forks and lock fields
+            xptr_t forks_xp = XPTR( page_cxy , &page_ptr->forks );
+            xptr_t lock_xp  = XPTR( page_cxy , &page_ptr->lock );
+
+            // increment the forks counter
+            remote_spinlock_lock( lock_xp );  
             hal_remote_atomic_add( XPTR( page_cxy , &page_ptr->forks ) , 1 );
+            remote_spinlock_unlock( lock_xp );  
 
 #if (DEBUG_THREAD_USER_FORK & 1)
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_USER_FORK < cycle )
-printk("\n[DBG] %s : thread %x copied stack PTE to child GPT : vpn %x\n",
-__FUNCTION__, CURRENT_THREAD, vpn );
+printk("\n[DBG] %s : thread %x in process %x copied one PTE to child GPT : vpn %x / forks %d\n",
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, vpn,
+hal_remote_lw( XPTR( page_cxy , &page_ptr->forks) ) );
 #endif
 
@@ -561 +571 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_THREAD_USER_FORK < cycle )
-printk("\n[DBG] %s : thread %x exit / child_process %x / child_thread %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, child_process->pid, child_ptr, cycle );
+printk("\n[DBG] %s : thread %x in process %x exit / child_thread %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD->trdid, CURRENT_THREAD->process->pid, child_ptr, cycle );
 #endif
 
@@ -631 +641 @@
     }
 
-    // update user stack in stack descriptor
+    // update user stack in thread descriptor
     thread->u_stack_base = vseg->min;
     thread->u_stack_size = vseg->max - vseg->min;
@@ -1172 +1182 @@
     {
         target_process_xp  = XLIST_ELEMENT( iter , process_t , local_list );
-        target_process_ptr = (process_t *)GET_PTR( target_process_xp );
+        target_process_ptr = GET_PTR( target_process_xp );
         target_process_pid = hal_remote_lw( XPTR( target_cxy , &target_process_ptr->pid ) );
         if( target_process_pid == pid )