Changeset 436 for trunk/kernel/syscalls/sys_thread_cancel.c

Timestamp:

Mar 7, 2018, 9:02:03 AM (6 years ago)

Author:

alain

Message:

1) improve the threads and process destruction mechanism.
2) introduce FIFOs in the soclib_tty driver.

File:

• trunk/kernel/syscalls/sys_thread_cancel.c (modified) (2 diffs)

trunk/kernel/syscalls/sys_thread_cancel.c

@@ -1 +1 @@
 /*
- * sys_thread_cancel.c - terminate execution of a target thread.
+ * sys_thread_cancel.c - terminate execution of an user thread.
  * 
- * Authors   Alain Greiner (2016,2017)
+ * Authors   Alain Greiner (2016,2017, 2018)
  *
- * Copyright (c) 2011,2012 UPMC Sorbonne Universites
+ * Copyright (c) UPMC Sorbonne Universites
  *
  * This file is part of ALMOS-MKH.
@@ -33 +33 @@
 {
     xptr_t       target_xp;     // target thread extended pointer
-        thread_t   * target_ptr;    // target thread local pointer
-    cxy_t        target_cxy;    // target thread cluster
-    ltid_t       target_ltid;   // target thread local index
 
-#if CONFIG_SYSCALL_DEBUG
-uint32_t     tm_start;
-uint32_t     tm_end;
-tm_start  = hal_get_cycles();
-#endif
-
+    // get killer thread pointers
         thread_t   * this    = CURRENT_THREAD;
     process_t  * process = this->process;
-
-    // check kernel stack overflow
-    assert( (this->signature == THREAD_SIGNATURE), __FUNCTION__, "kernel stack overflow\n" );
-
-    // get target thread ltid and cxy
-    target_ltid = LTID_FROM_TRDID( trdid );
-    target_cxy  = CXY_FROM_TRDID( trdid );
-
-    // check trdid argument
-        if( (target_ltid >= CONFIG_THREAD_MAX_PER_CLUSTER) || cluster_is_undefined( target_cxy ) )  
-        {
-        printk("\n[ERROR] in %s : illegal trdid argument\n", __FUNCTION__ );
-                this->errno = EINVAL;
-                return -1;
-        }
 
     // get extended pointer on target thread
         target_xp  = thread_get_xptr( process->pid , trdid );
 
+    // check target_xp
     if( target_xp == XPTR_NULL )
     {
-        printk("\n[ERROR] in %s : target thread not found\n", __FUNCTION__ );
+
+#if CONFIG_DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : target thread %x not found\n", __FUNCTION__, trdid );
+#endif
         this->errno = EINVAL;
         return -1;
     }
 
-    // get target thread local pointer
-    target_ptr = (thread_t *)GET_PTR( target_xp );
+#if CONFIG_DEBUG_SYS_THREAD_CANCEL
+uint64_t     tm_start;
+uint64_t     tm_end;
+tm_start = hal_get_cycles();
+if( CONFIG_DEBUG_SYS_THREAD_CANCEL < tm_start )
+printk("\n[DBG] %s : thread %x enter to kill thread %x / cycle %d\n",
+__FUCTION__, this, GET_PTR( target_xp ), (uint32_t)tm_start );
+#endif
 
     // cal the relevant kernel function
-    if( target_cxy == local_cxy )    // target thread is local
-    {
-        thread_kill( target_ptr );
-    }
-    else
-    {
-        rpc_thread_kill_client( target_cxy , target_ptr );
-    }
+    thread_kill( target_xp,
+                 0,           // is_exit
+                 0 );         // is forced
 
-#if CONFIG_SYSCALL_DEBUG
+#if CONFIG_DEBUG_SYS_THREAD_CANCEL
 tm_end = hal_get_cycles();
-syscall_dmsg("\n[DBG] %s : core[%x,%d] / thread %x in process %x / cycle %d\n"
-"thread %x killed / cost = %d\n",
-__FUNCTION__ , local_cxy , this->core->lid , this->trdid , this->process->pid , tm_start ,
-trdid , (uint32_t)(tm_end - tm_start) );
+if( CONFIG_DEBUG_SYS_THREAD_CANCEL < tm_end )
+printk("\n[DBG] %s : thread %x exit after kill thread %x / cycle %d\n",
+__FUCTION__, this, GET_PTR( target_xp ), (uint32_t)tm_end );
 #endif