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

Timestamp:

Oct 10, 2020, 4:50:41 PM (4 years ago)

Author:

alain

Message:

Introduce the ksocket.h & ksocket.c files in kernel/kern.

File:

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

trunk/kernel/kern/chdev.c

@@ -301 +301 @@
     server = CURRENT_THREAD;
 
+#if( DEBUG_CHDEV_SERVER_RX || DEBUG_CHDEV_SERVER_TX )
+uint32_t rx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+printk("\n[%s] RX server thread[%x,%x] enter / channel %d / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, rx_cycle );
+#endif
+
+#if DEBUG_CHDEV_SERVER_TX
+uint32_t tx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
+printk("\n[%s] TX server thread[%x,%x] enter / channel %d / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, tx_cycle );
+#endif
+
     // build extended pointer on root & lock of client threads queue
     root_xp = XPTR( local_cxy , &chdev->wait_root );
@@ -309 +323 @@
     while( 1 )
     {
-
-#if( DEBUG_CHDEV_SERVER_RX || DEBUG_CHDEV_SERVER_TX )
-uint32_t rx_cycle = (uint32_t)hal_get_cycles();
-if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
-printk("\n[%s] server thread[%x,%x] check TXT_RX channel %d / cycle %d\n",
-__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, rx_cycle );
-#endif
-
-#if DEBUG_CHDEV_SERVER_TX
-uint32_t tx_cycle = (uint32_t)hal_get_cycles();
-if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
-printk("\n[%s] thread[%x,%x] check TXT_TX channel %d / cycle %d\n",
-__FUNCTION__ , server->process->pid, server->trdid, chdev->channel, tx_cycle );
-#endif
-
         // check server thread can yield
         thread_assert_can_yield( server , __FUNCTION__ );
@@ -331 +330 @@
 
         // check waiting queue state
-        if( xlist_is_empty( root_xp ) ) // waiting queue empty 
+        if( xlist_is_empty( root_xp ) )                      // waiting queue empty 
         {
             // release lock protecting the waiting queue
@@ -339 +338 @@
 rx_cycle = (uint32_t)hal_get_cycles();
 if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
-printk("\n[%s] server thread[%x,%x] found RX queue empty => blocks / cycle %d\n",
+printk("\n[%s] RX server thread[%x,%x] blocks & deschedules / cycle %d\n",
 __FUNCTION__ , server->process->pid, server->trdid, rx_cycle );
 #endif
@@ -346 +345 @@
 tx_cycle = (uint32_t)hal_get_cycles();
 if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
-printk("\n[%s] server thread[%x,%x] found TX queue empty => blocks / cycle %d\n",
+printk("\n[%s] TX server thread[%x,%x] blocks & deschedules / cycle %d\n",
 __FUNCTION__ , server->process->pid, server->trdid, tx_cycle );
 #endif
-            // block 
+            // block and deschedule
             thread_block( XPTR( local_cxy , server ) , THREAD_BLOCKED_CLIENT ); 
-
-            // deschedule
-            sched_yield("I/O queue empty");
+            sched_yield("clients queue empty");
+
+#if DEBUG_CHDEV_SERVER_RX
+rx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx) && (DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+printk("\n[%s] RX server thread[%x,%x] resumes / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, rx_cycle );
+#endif
+
+#if DEBUG_CHDEV_SERVER_TX
+tx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
+printk("\n[%s] TX server thread[%x,%x] resumes / cycle %d\n",
+__FUNCTION__ , server->process->pid, server->trdid, tx_cycle );
+#endif
+
         } 
-        else                            // waiting queue not empty
+        else                                               // waiting queue not empty
         {
             // get pointers on first client thread
@@ -414 +426 @@
 if( (chdev->is_rx == 0) && (DEBUG_CHDEV_SERVER_TX < tx_cycle) )
 printk("\n[%s] thread[%x,%x] completes command for client thread[%x,%x] / cycle %d\n",
-__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, tX_cycle );
+__FUNCTION__, server->process->pid, server->trdid, client_pid, client_trdid, tx_cycle );
 #endif