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

Timestamp:

Dec 20, 2017, 4:51:09 PM (6 years ago)

Author:

alain

Message:

Fix bugs in exec

File:

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

trunk/kernel/syscalls/sys_kill.c

@@ -1 +1 @@
 /*
- * sys_kill.c: Send a signal to a given process.
+ * sys_kill.c - Send a signal to a given process.
  * 
  * Author    Alain Greiner (2016,2017)
@@ -24 +24 @@
 #include <kernel_config.h>
 #include <hal_types.h>
+#include <hal_irqmask.h>
 #include <errno.h>
 #include <thread.h>
@@ -36 +37 @@
               uint32_t sig_id )
 {
+    uint32_t    save_sr;       // required to enable IRQs
+
+#if CONFIG_SYSCALL_DEBUG
+uint64_t    tm_start;
+uint64_t    tm_end;
+tm_start = hal_get_cycles();
+#endif
+
     thread_t  * this    = CURRENT_THREAD;
     process_t * process = this->process;
-
-    // check signal index
-        if( (sig_id == 0) || (sig_id >= SIG_NR) )
-        {
-        printk("\n[ERROR] in %s : illegal signal = %d for thread %x in process %x\n",
-               __FUNCTION__ , sig_id , this->trdid , process->pid );
-                this->errno = EINVAL;
-        return -1;
-        }
-
-    // get local pointer on local cluster manager
-    cluster_t * cluster = LOCAL_CLUSTER;
 
     // get owner process cluster and lpid
@@ -55 +52 @@
     lpid_t  lpid       = LPID_FROM_PID( pid );
 
-    // check PID
+    // check pid
     if( (lpid >= CONFIG_MAX_PROCESS_PER_CLUSTER) || cluster_is_undefined( owner_cxy ) )
     {
         printk("\n[ERROR] in %s : illegal target PID = %d for thread %x in process %x\n",
-               __FUNCTION__ , pid , this->trdid , process->pid );
+        __FUNCTION__ , pid , this->trdid , pid );
                 this->errno = EINVAL;
         return -1;
     }
 
-    // get extended pointers on copies root and lock
-    xptr_t root_xp = XPTR( owner_cxy , &cluster->pmgr.copies_root[lpid] );
-    xptr_t lock_xp = XPTR( owner_cxy , &cluster->pmgr.copies_lock[lpid] );
-
-    // take the lock protecting the copies
-    remote_spinlock_lock( lock_xp );
-
-    // TODO the loop below sequencialize the RPCs
-    // they could be pipelined using a non-blocking RPC ...
- 
-    // loop on the process decriptor copies 
-    xptr_t  iter_xp;
-    XLIST_FOREACH( root_xp , iter_xp )
+    // check sig_id
+    if( (sig_id != SIGSTOP) && (sig_id != SIGCONT) && (sig_id != SIGKILL) ) 
     {
-        xptr_t      process_xp  = XLIST_ELEMENT( iter_xp , process_t , copies_list );
-        cxy_t       process_cxy = GET_CXY( process_xp );
-        process_t * process_ptr = (process_t *)GET_PTR( process_xp );
-
-        if( process_cxy == local_cxy )   // process copy is local
-        {
-            signal_rise( process_ptr , sig_id );
-        }
-        else                           // process copy is remote
-        {
-            rpc_signal_rise_client( process_cxy , process_ptr , sig_id );
-        }
+        printk("\n[ERROR] in %s : illegal signal type for thread %x in process %x\n",
+        __FUNCTION__ , sig_id , this->trdid , pid );
+                this->errno = EINVAL;
+        return -1;
     }
 
-    // release the lock
-    remote_spinlock_unlock( lock_xp );
+    // enable IRQs
+    hal_enable_irq( &save_sr );
+
+    // execute process_make_kill() function in owner cluster
+    if( local_cxy == owner_cxy )                                // owner is local 
+    {
+        process_make_kill( process , sig_id );
+    }
+    else                                                        // owner is remote
+    {
+        rpc_process_make_kill_client( owner_cxy , process , sig_id );
+    }
+
+    // restore IRQs
+    hal_restore_irq( save_sr );
 
     hal_fence();
 
+#if CONFIG_SYSCALL_DEBUG 
+tm_end = hal_get_cycles();
+syscall_dmsg("\n[DBG] %s exit : core[%x,%d] / thread %x in process %x / cycle %d\n"
+"process %x killed / cost = %d\n",
+__FUNCTION__ , local_cxy , this->core->lid , this->trdid , this->process->pid ,
+tm_start , pid , (uint32_t)(tm_end - tm_start) );
+#endif
+ 
         return 0;