Changeset 441 for trunk/kernel/kern

Timestamp:

May 9, 2018, 3:13:56 PM (7 years ago)

Author:

alain

Message:

Fix a bug in rpc_vmm_get_pte_client() function (bad RPC index).

Location:

trunk/kernel/kern

Files:

• process.c (modified) (10 diffs)
• process.h (modified) (1 diff)
• rpc.c (modified) (4 diffs)

trunk/kernel/kern/process.c

@@ -1165 +1165 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_FORK < cycle )
-printk("\n[DBG] %s : thread %x created child thread %x / cycle %d\n", 
-__FUNCTION__ , CURRENT_THREAD, thread, cycle );
+printk("\n[DBG] %s : thread %x created child thread %x on core[%x,%d] / cycle %d\n", 
+__FUNCTION__ , CURRENT_THREAD, thread, local_cxy, thread->core->lid, cycle );
 #endif
 
@@ -1222 +1222 @@
 {
     char           * path;                    // pathname to .elf file
-    pid_t            pid;                     // old_process PID / given to new_process
+    pid_t            pid;                     // old_process PID, given to new_process
     pid_t            temp_pid;                // temporary PID / given to old_process 
     process_t      * old_process;             // local pointer on old process
@@ -1231 +1231 @@
     pthread_attr_t   attr;                    // new thread attributes
     lid_t            lid;                     // selected core local index
-        error_t          error;
-
+        error_t          error;                   // value returned by called functions
+    
     // get old_thread / old_process / PID / parent_xp
     old_thread  = CURRENT_THREAD;
@@ -1240 +1240 @@
     
         // get .elf pathname from exec_info
-        path     = exec_info->path;
+        path        = exec_info->path;
 
     // this function must be executed by a thread running in owner cluster
@@ -1261 +1261 @@
     if( new_process == NULL )
     {
-        printk("\n[ERROR] in %s : cannot allocate process descriptor in cluster %x\n",
-        __FUNCTION__ , local_cxy );
+        printk("\n[ERROR] in %s : cannot allocate process for %s\n", __FUNCTION__ , path );
         return -1;
     }
@@ -1297 +1296 @@
     // register code & data vsegs as well as entry-point in new process VMM,
     // and register extended pointer on .elf file in process descriptor
-        if( elf_load_process( path , new_process ) )
+        error = elf_load_process( path , new_process );
+
+    if( error )
         {
-                printk("\n[ERROR] in %s : failed to access .elf file for path %s\n",
-                __FUNCTION__ , path );
+                printk("\n[ERROR] in %s : failed to access <%s>\n", __FUNCTION__ , path );
+        process_txt_set_ownership( XPTR( local_cxy , old_process) );
+        process_txt_detach( XPTR( local_cxy , new_process) );
         process_destroy( new_process );
+        old_process->pid = pid;
         return -1;
         }
@@ -1328 +1331 @@
         if( error )
         {
-                printk("\n[ERROR] in %s : cannot create thread for process %x\n",
-            __FUNCTION__ , new_process );
+                printk("\n[ERROR] in %s : cannot create thread for %s\n", __FUNCTION__ , path );
+        process_txt_set_ownership( XPTR( local_cxy , old_process) );
+        process_txt_detach( XPTR( local_cxy , new_process) );
         process_destroy( new_process );
+        old_process->pid = pid;
         return -1;
         }
@@ -1375 +1380 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_MAKE_EXEC < cycle )
-printk("\n[DBG] %s : old_thread %x blocked / new_thread %x activated / cycle %d\n",
+printk("\n[DBG] %s : old thread %x blocked for delete / new thread %x activated / cycle %d\n",
 __FUNCTION__ , old_thread , new_thread , cycle );
 #endif
@@ -1735 +1740 @@
     remote_spinlock_unlock( lock_xp );
 
-#if( DEBUG_PROCESS_TXT_ATTACH & 1 )
+#if DEBUG_PROCESS_TXT_ATTACH
+cycle  = (uint32_t)hal_get_cycles();
+uint32_t txt_id = hal_remote_lw( XPTR( chdev_cxy , &chdev_ptr->channel ) );
 if( DEBUG_PROCESS_TXT_ATTACH < cycle )
-{
-    xptr_t root_xp = XPTR( chdev_cxy , &chdev_ptr->ext.txt.root );
-    xptr_t iter_xp;
-    XLIST_FOREACH( root_xp , iter_xp )
-    {
-        xptr_t      current_xp  = XLIST_ELEMENT( iter_xp , process_t , txt_list );
-        process_t * current_ptr = GET_PTR( current_xp );
-
-        printk("\n[DBG] %s : attached_process %x (pid = %x)\n",
-        __FUNCTION__, current_ptr, current_ptr->pid );
-    }
-}
-#endif
-
-#if DEBUG_PROCESS_TXT_ATTACH
-cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_PROCESS_TXT_ATTACH < cycle )
-printk("\n[DBG] %s : thread %x exit / process %x detached from TXT / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, process->pid, cycle );
+printk("\n[DBG] %s : thread %x exit / process %x detached from TXT %d / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, process_pid, txt_id, cycle );
 #endif
 
@@ -1842 +1832 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_PROCESS_TXT_ATTACH < cycle )
-printk("\n[DBG] %s : thread %x enter / process %x / pid %x / cycle %d\n",
-__FUNCTION__, CURRENT_THREAD, process_ptr, process_pid, cycle );
+printk("\n[DBG] %s : thread %x enter / process %x / cycle %d\n",
+__FUNCTION__, CURRENT_THREAD, process_pid, cycle );
 #endif
 

trunk/kernel/kern/process.h

@@ -510 +510 @@
  * It is called only by the process_reference_init() function when creating a KSH process.
  * It makes a kernel panic if no free TXT terminal is found.
- * As a KSH process is never deleted, the allocated TXT terminal is never released.
+ * The allocated TXT terminal is only released if the KSH process is deleted,
+ * which is a rare and abnormal event.
  *********************************************************************************************
  * @ return TXT terminal index if succes / kernel panic if no terminal found.

trunk/kernel/kern/rpc.c

@@ -1666 +1666 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
-// [21]          Marshaling functions attached to RPC_VMM_GET_VSEG  (blocking)
+// [21]          Marshaling functions attached to RPC_VMM_GET_PTE  (blocking)
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -1689 +1689 @@
     // initialise RPC descriptor header 
     rpc_desc_t  rpc;
-    rpc.index    = RPC_VMM_GET_VSEG;
+    rpc.index    = RPC_VMM_GET_PTE;
     rpc.blocking = true;
     rpc.responses = 1;
@@ -1769 +1769 @@
     // initialise RPC descriptor header 
     rpc_desc_t  rpc;
-    rpc.index    = RPC_THREAD_USER_CREATE;
+    rpc.index    = RPC_KCM_ALLOC;
     rpc.blocking = true;
     rpc.responses = 1;
@@ -1819 +1819 @@
     // initialise RPC descriptor header 
     rpc_desc_t  rpc;
-    rpc.index    = RPC_THREAD_USER_CREATE;
+    rpc.index    = RPC_KCM_FREE;
     rpc.blocking = true;
     rpc.responses = 1;