Changeset 450 for trunk/kernel/kern/chdev.c

Timestamp:

Jun 29, 2018, 10:44:14 AM (6 years ago)

Author:

alain

Message:

Fix a bug in function sched_handle_signal():
When the deleted user thread is the last executed thread,
the sched->u_last field must be updated to point on another user thread.

File:

• trunk/kernel/kern/chdev.c (modified) (6 diffs)

trunk/kernel/kern/chdev.c

@@ -163 +163 @@
 uint32_t rx_cycle = (uint32_t)hal_get_cycles();
 if( (is_rx) && (DEBUG_CHDEV_CMD_RX < rx_cycle) )
-printk("\n[DBG] %s : client_thread %x (%s) enter for RX / cycle %d\n",
-__FUNCTION__, this, thread_type_str(this->type) , rx_cycle );
+printk("\n[DBG] %s : client_thread %x (%s) enter for RX / server = %x / cycle %d\n",
+__FUNCTION__, this, thread_type_str(this->type) , server_ptr, rx_cycle );
 #endif
 
@@ -170 +170 @@
 uint32_t tx_cycle = (uint32_t)hal_get_cycles();
 if( (is_rx == 0) && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
-printk("\n[DBG] %s : client_thread %x (%s) enter for TX / cycle %d\n",
-__FUNCTION__, this, thread_type_str(this->type) , tx_cycle );
+printk("\n[DBG] %s : client_thread %x (%s) enter for TX / server = %x / cycle %d\n",
+__FUNCTION__, this, thread_type_str(this->type) , server_ptr, tx_cycle );
 #endif
 
@@ -186 +186 @@
     lock_xp = XPTR( chdev_cxy , &chdev_ptr->wait_lock );
 
-    // critical section for the following sequence:
+    // critical section for the following sequence: 
     // (1) take the lock protecting waiting queue 
     // (2) block the client thread
@@ -205 +205 @@
     thread_block( XPTR( local_cxy , CURRENT_THREAD ) , THREAD_BLOCKED_IO );
 
+#if (DEBUG_CHDEV_CMD_TX & 1)
+if( (is_rx == 0) && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
+printk("\n[DBG] in %s : client thread %x blocked\n", __FUNCTION__, this );
+#endif
+
     // unblock server thread if required
     if( hal_remote_lw( blocked_xp ) & THREAD_BLOCKED_IDLE )
     thread_unblock( server_xp , THREAD_BLOCKED_IDLE );
 
+#if (DEBUG_CHDEV_CMD_TX & 1)
+if( (is_rx == 0) && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
+{
+printk("\n[DBG] in %s : server thread %x unblocked\n", __FUNCTION__, server_ptr );
+chdev_queue_display( chdev_xp );
+}
+#endif
+
     // register client thread in waiting queue 
     xlist_add_last( root_xp , list_xp );
 
+#if (DEBUG_CHDEV_CMD_TX & 1)
+if( (is_rx == 0)  && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
+{
+printk("\n[DBG] in %s : thread %x registered write request in chdev\n", __FUNCTION__, this );
+chdev_queue_display( chdev_xp );
+}
+#endif
+ 
     // send IPI to core running the server thread when server != client
     different = (lid != this->core->lid) || (local_cxy != chdev_cxy);
-    if( different ) dev_pic_send_ipi( chdev_cxy , lid ); 
+    if( different )
+    {
+        dev_pic_send_ipi( chdev_cxy , lid ); 
     
+#if (DEBUG_CHDEV_CMD_TX & 1)
+if( (is_rx == 0)  && (DEBUG_CHDEV_CMD_TX < tx_cycle) )
+printk("\n[DBG] in %s : client thread %x sent IPI to server thread %x\n",
+__FUNCTION__, this, server_ptr );
+#endif
+
+    }
+ 
     // release lock
     remote_spinlock_unlock( lock_xp );
@@ -492 +523 @@
 
     // get extended pointer on root of requests queue
-    root_xp = hal_remote_lwd( XPTR( chdev_cxy , &chdev_ptr->wait_root ) );
+    root_xp = XPTR( chdev_cxy , &chdev_ptr->wait_root );
 
     // get chdev name
@@ -516 +547 @@
                         pid        = hal_remote_lw ( XPTR( thread_cxy , &process->pid        ) );
 
-            printk("- trdid %X / pid %X\n", trdid, pid );
+            printk("- thread %X / cluster %X / trdid %X / pid %X\n",
+            thread_ptr, thread_cxy, trdid, pid );
         }
     }