Changeset 683 for trunk/kernel/syscalls/sys_thread_wakeup.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (3 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/syscalls/sys_thread_wakeup.c (modified) (7 diffs)

trunk/kernel/syscalls/sys_thread_wakeup.c

@@ -1 +1 @@
 /*
- * sys_thread_wakeup.c - wakeup indicated thread
+ * sys_thread_wakeup.c - unblock indicated thread from the SLEEP condition
  * 
- * Author    Alain Greiner (2016,2017,2018,2019)
+ * Author    Alain Greiner     (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -27 +27 @@
 #include <process.h>
 #include <errno.h>
-
 #include <syscalls.h>
 
@@ -36 +35 @@
     process_t * process = this->process;
 
-#if (DEBUG_SYS_THREAD_WAKEUP || CONFIG_INSTRUMENTATION_SYSCALLS)
-uint64_t     tm_start = hal_get_cycles();
+#if DEBUG_SYS_THREAD_WAKEUP || DEBUG_SYSCALLS_ERROR || CONFIG_INTRUMENTATION_SYSCALLS
+cycle_t      tm_start = hal_get_cycles();
 #endif
 
 #if DEBUG_SYS_THREAD_WAKEUP
-if( DEBUG_SYS_THREAD_WAKEUP < tm_start )
-printk("\n[%s] thread %x in process enter to activate thread %x / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid, trdid, (uint32_t)tm_start );
+if( DEBUG_SYS_THREAD_WAKEUP < (uint32_t)tm_start )
+printk("\n[%s] thread[%x,%x] enter to activate thread %x / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, trdid, (uint32_t)tm_start );
 #endif
 
@@ -56 +55 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread %x in process %x / illegal trdid argument %x\n",
-__FUNCTION__, this->trdid, process->pid, trdid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / illegal trdid argument %x\n",
+__FUNCTION__, process->pid, this->trdid, trdid );
 #endif
                 this->errno = EINVAL;
@@ -70 +70 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread %x in process %x cannot find thread %x/n",
-__FUNCTION__ , this->trdid, process->pid, trdid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / cannot find thread[%x,%x]\n",
+__FUNCTION__, process->pid, this->trdid, process->pid, trdid );
 #endif
         CURRENT_THREAD->errno = EINVAL;
@@ -77 +78 @@
     }
 
+    // get target thread cluster and local pointer
+    thread_t * tgt_ptr = GET_PTR( thread_xp );
+    cxy_t      tgt_cxy = GET_CXY( thread_xp );
+
+    // get state of the target thread alarm
+    bool_t linked = hal_remote_l32( XPTR( tgt_cxy , &tgt_ptr->alarm.linked ) );
+
+    // delete the alarm if active
+    if( linked ) alarm_stop( thread_xp );
+
     // unblock target thread
-    thread_unblock( thread_xp , THREAD_BLOCKED_GLOBAL );
+    thread_unblock( thread_xp , THREAD_BLOCKED_SLEEP );
 
 #if (DEBUG_SYS_THREAD_WAKEUP || CONFIG_INSTRUMENTATION_SYSCALLS)
@@ -87 +98 @@
 #if DEBUG_SYS_THREAD_WAKEUP
 if( DEBUG_SYS_THREAD_WAKEUP < tm_end )
-printk("\n[%s] thread %x in process %x exit / thread %x activated / cycle %d\n",
-__FUNCTION__ , this->trdid, process->pid, trdid, (uint32_t)tm_end );
+printk("\n[%s] thread[%x,%x] exit / thread[%x,%x] activated / cycle %d\n",
+__FUNCTION__ , process->pid, this->trdid, process->pid, trdid, (uint32_t)tm_end );
 #endif