Changeset 435 for trunk/kernel/kern/rpc.c

Timestamp:

Feb 20, 2018, 5:32:17 PM (6 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

• trunk/kernel/kern/rpc.c (modified) (8 diffs)

trunk/kernel/kern/rpc.c

@@ -39 +39 @@
 #include <vfs.h>
 #include <fatfs.h>
-#include <signal.h>
 #include <rpc.h>
 
@@ -80 +79 @@
     &rpc_process_make_fork_server,      // 3
     &rpc_undefined,                     // 4    unused slot
-    &rpc_process_make_kill_server,      // 5
+    &rpc_undefined,                     // 5    unused slot
     &rpc_thread_user_create_server,     // 6
     &rpc_thread_kernel_create_server,   // 7
@@ -610 +609 @@
 
 /////////////////////////////////////////////////////////////////////////////////////////
-// [5]      Marshaling functions attached to RPC_PROCESS_MAKE_KILL (blocking)
-/////////////////////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////
-void rpc_process_make_kill_client( cxy_t       cxy,
-                                   process_t * process,
-                                   bool_t      is_exit,
-                                   uint32_t    status ) 
-{
-rpc_dmsg("\n[DBG] %s : enter / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD->trdid , local_cxy, 
-CURRENT_THREAD->core->lid , hal_time_stamp() );
-
-    // initialise RPC descriptor header 
-    rpc_desc_t  rpc;
-    rpc.index    = RPC_PROCESS_MAKE_KILL;
-    rpc.response = 1;
-    rpc.blocking = true;
-
-    // set input arguments in RPC descriptor  
-    rpc.args[0] = (uint64_t)(intptr_t)process;
-    rpc.args[1] = (uint64_t)is_exit;
-    rpc.args[2] = (uint64_t)status;
-
-    // register RPC request in remote RPC fifo (blocking function)
-    rpc_send( cxy , &rpc );
-
-rpc_dmsg("\n[DBG] %s : exit / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD->trdid , local_cxy, 
-CURRENT_THREAD->core->lid , hal_time_stamp() );
-}  
-
-//////////////////////////////////////////////
-void rpc_process_make_kill_server( xptr_t xp )
-{
-rpc_dmsg("\n[DBG] %s : enter / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD->trdid , local_cxy, 
-CURRENT_THREAD->core->lid , hal_time_stamp() );
-
-    process_t * process;
-    bool_t      is_exit;
-    uint32_t    status;
-
-    // get client cluster identifier and pointer on RPC descriptor
-    cxy_t        client_cxy  = (cxy_t)GET_CXY( xp );
-    rpc_desc_t * desc        = (rpc_desc_t *)GET_PTR( xp );
-
-    // get arguments from RPC descriptor
-    process = (process_t *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &desc->args[0] ) );
-    is_exit = (bool_t)               hal_remote_lwd( XPTR( client_cxy , &desc->args[1] ) );
-    status  = (uint32_t)             hal_remote_lwd( XPTR( client_cxy , &desc->args[2] ) );
-
-    // call local kernel function
-    process_make_kill( process , is_exit , status ); 
-
-rpc_dmsg("\n[DBG] %s : exit / thread %x on core[%x,%d] / cycle %d\n",
-__FUNCTION__ , CURRENT_THREAD->trdid , local_cxy, 
-CURRENT_THREAD->core->lid , hal_time_stamp() );
-} 
+// [5]      undefined slot
+/////////////////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -906 +848 @@
                                    rpc_desc_t * rpc_ptr )
 {
-sigaction_dmsg("\n[DBG] %s : enter to %s process %x in cluster %x / cycle %d\n",
+rpc_dmsg("\n[DBG] %s : enter to %s process %x in cluster %x / cycle %d\n",
 __FUNCTION__ , process_action_str( (uint32_t)rpc_ptr->args[0] ) ,
 ((process_t *)(intptr_t)rpc_ptr->args[1])->pid , cxy , (uint32_t)hal_get_cycles() );
@@ -913 +855 @@
     rpc_send( cxy , rpc_ptr );
 
-sigaction_dmsg("\n[DBG] %s : exit after %s process %x in cluster %x / cycle %d\n",
+rpc_dmsg("\n[DBG] %s : exit after %s process %x in cluster %x / cycle %d\n",
 __FUNCTION__ , process_action_str( (uint32_t)rpc_ptr->args[0] ) ,
 ((process_t *)(intptr_t)rpc_ptr->args[1])->pid , cxy , (uint32_t)hal_get_cycles() );
@@ -921 +863 @@
 void rpc_process_sigaction_server( xptr_t xp )
 {
+    pid_t        pid;              // target process identifier
     process_t  * process;          // pointer on local process descriptor
     uint32_t     action;           // sigaction index
@@ -934 +877 @@
 
     // get arguments from RPC descriptor
-    action      = (uint32_t)             hal_remote_lwd( XPTR( client_cxy , &rpc->args[0] ) );
-    process     = (process_t *)(intptr_t)hal_remote_lwd( XPTR( client_cxy , &rpc->args[1] ) );
+    action      = (uint32_t)  hal_remote_lwd( XPTR( client_cxy , &rpc->args[0] ) );
+    pid         = (pid_t)     hal_remote_lwd( XPTR( client_cxy , &rpc->args[1] ) );
     client_ptr  = (thread_t *)hal_remote_lpt( XPTR( client_cxy , &rpc->thread ) );
+
+rpc_dmsg("\n[DBG] %s : enter to %s process %x / cycle %d\n",
+__FUNCTION__ , process_action_str( action ) , pid , (uint32_t)hal_get_cycles() );
+
+    // get local process descriptor
+    process = process_get_local_copy( pid );
 
     // build extended pointer on client thread
     client_xp = XPTR( client_cxy , client_ptr );
-
-sigaction_dmsg("\n[DBG] %s : enter to %s process %x / cycle %d\n",
-__FUNCTION__ , process_action_str( action ) , process->pid , (uint32_t)hal_get_cycles() );
 
     // call relevant kernel function
@@ -958 +904 @@
     }
 
-sigaction_dmsg("\n[DBG] %s : exit after %s process %x / cycle %d\n",
-__FUNCTION__ , process_action_str( action ) , process->pid , (uint32_t)hal_get_cycles() );
+rpc_dmsg("\n[DBG] %s : exit after %s process %x / cycle %d\n",
+__FUNCTION__ , process_action_str( action ) , pid , (uint32_t)hal_get_cycles() );
 }