Changeset 421 for trunk/kernel/syscalls/sys_kill.c

Timestamp:

Jan 29, 2018, 5:40:34 PM (7 years ago)

Author:

alain

Message:

Introduce sys_fg() , sys_display() , sys_wait() syscalls.

File:

• trunk/kernel/syscalls/sys_kill.c (modified) (3 diffs)

trunk/kernel/syscalls/sys_kill.c

@@ -38 +38 @@
 {
     uint32_t    save_sr;       // required to enable IRQs
+    xptr_t      process_xp;    // extended pointer on target reference process
+    cxy_t       process_cxy;   // target process cluster
+    process_t * process_ptr;   // local pointer on target process
+    xptr_t      parent_xp;     // extended pointer on parent process
+    cxy_t       parent_cxy;    // parent process cluster
+    process_t * parent_ptr;    // local pointer on parent process
+    pid_t       ppid;          // parent process PID
 
     thread_t  * this    = CURRENT_THREAD;
@@ -49 +56 @@
 #endif
 
-    // get owner process cluster and lpid
-    cxy_t   owner_cxy  = CXY_FROM_PID( pid );
-    lpid_t  lpid       = LPID_FROM_PID( pid );
+    // get cluster and pointers on reference process
+    process_xp  = cluster_get_reference_process_from_pid( pid );
+    process_cxy = GET_CXY( process_xp );
+    process_ptr = (process_t *)GET_PTR( process_xp );
 
-    // check pid
-    if( (lpid >= CONFIG_MAX_PROCESS_PER_CLUSTER) || cluster_is_undefined( owner_cxy ) )
+    // check process existence
+    if( process_xp == XPTR_NULL )
     {
-        printk("\n[ERROR] in %s : illegal target PID = %d for thread %x in process %x\n",
-        __FUNCTION__ , pid , this->trdid , pid );
+        syscall_dmsg("\n[ERROR] in %s : process %x not found\n",
+        __FUNCTION__ , pid );
+        this->errno = EINVAL;
+        return -1;
+    }
+    
+    // get parent process PID
+    parent_xp  = hal_remote_lwd( XPTR( process_cxy , &process_ptr->parent_xp ) );
+    parent_cxy = GET_CXY( parent_xp );
+    parent_ptr = GET_PTR( parent_xp );
+    ppid       = hal_remote_lw( XPTR( parent_cxy , &parent_ptr->pid ) );
+
+    // processes INIT and processes KSH cannot be stoped or killed
+    if( ppid < 2 )
+    {
+        syscall_dmsg("\n[ERROR] in %s : process %x cannot be killed\n",
+        __FUNCTION__ , pid );
                 this->errno = EINVAL;
         return -1;
     }
 
+    // does nothing if sig_id == 0
+    if( sig_id == 0 )  return 0;
+    
     // check sig_id
     if( (sig_id != SIGSTOP) && (sig_id != SIGCONT) && (sig_id != SIGKILL) ) 
     {
-        printk("\n[ERROR] in %s : illegal signal type for thread %x in process %x\n",
-        __FUNCTION__ , sig_id , this->trdid , pid );
+        syscall_dmsg("\n[ERROR] in %s : illegal signal type for process %x\n",
+        __FUNCTION__ , sig_id , pid );
                 this->errno = EINVAL;
         return -1;
@@ -75 +101 @@
 
     // execute process_make_kill() function in owner cluster
-    if( local_cxy == owner_cxy )                                // owner is local 
+    if( local_cxy == process_cxy )                            // owner cluster is local 
     {
         process_make_kill( pid , sig_id );
     }
-    else                                                        // owner is remote
+    else                                                      // owner cluster is remote
     {
-        rpc_process_make_kill_client( owner_cxy , pid , sig_id );
+        rpc_process_make_kill_client( process_cxy , pid , sig_id );
     }