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

Timestamp:

Mar 28, 2018, 2:40:29 PM (5 years ago)

Author:

alain

Message:

Fix various bugs

File:

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

trunk/kernel/kern/chdev.c

@@ -140 +140 @@
     thread_t * this = CURRENT_THREAD;
 
-#if CONFIG_DEBUG_CHDEV_REGISTER_COMMAND
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_CHDEV_REGISTER_COMMAND < cycle )
-printk("\n[DBG] %s : client_thread %x (%s) enter / cycle %d\n",
-__FUNCTION__, this, thread_type_str(this->type) , cycle );
-#endif
-
     // get device descriptor cluster and local pointer
     cxy_t     chdev_cxy = GET_CXY( chdev_xp );
     chdev_t * chdev_ptr = (chdev_t *)GET_PTR( chdev_xp );
+
+#if (CONFIG_DEBUG_CHDEV_CMD_RX || CONFIG_DEBUG_CHDEV_CMD_TX)
+bool_t is_rx = hal_remote_lw( XPTR( chdev_cxy , &chdev_ptr->is_rx ) );
+#endif
+    
+#if CONFIG_DEBUG_CHDEV_CMD_RX
+uint32_t rx_cycle = (uint32_t)hal_get_cycles();
+if( (is_rx) && (CONFIG_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 );
+#endif
+
+#if CONFIG_DEBUG_CHDEV_CMD_TX
+uint32_t tx_cycle = (uint32_t)hal_get_cycles();
+if( (is_rx == 0) && (CONFIG_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 );
+#endif
 
     // build extended pointers on client thread xlist and device root
@@ -196 +207 @@
     hal_restore_irq( save_sr );
 
-#if CONFIG_DEBUG_CHDEV_REGISTER_COMMAND
-cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_CHDEV_REGISTER_COMMAND < cycle )
-printk("\n[DBG] %s : client_thread %x (%s) exit / cycle %d\n",
-__FUNCTION__, this, thread_type_str(this->type) , cycle );
+#if CONFIG_DEBUG_CHDEV_CMD_RX
+rx_cycle = (uint32_t)hal_get_cycles();
+if( (is_rx) && (CONFIG_DEBUG_CHDEV_CMD_RX < rx_cycle) )
+printk("\n[DBG] %s : client_thread %x (%s) exit for RX / cycle %d\n",
+__FUNCTION__, this, thread_type_str(this->type) , rx_cycle );
+#endif
+
+#if CONFIG_DEBUG_CHDEV_CMD_TX
+tx_cycle = (uint32_t)hal_get_cycles();
+if( (is_rx == 0) && (CONFIG_DEBUG_CHDEV_CMD_TX < tx_cycle) )
+printk("\n[DBG] %s : client_thread %x (%s) exit for TX / cycle %d\n",
+__FUNCTION__, this, thread_type_str(this->type) , tx_cycle );
 #endif
 
@@ -225 +243 @@
     server = CURRENT_THREAD;
 
-#if CONFIG_DEBUG_CHDEV_SEQUENCIAL_SERVER
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_CHDEV_SEQUENCIAL_SERVER < cycle )
-printk("\n[DBG] %s : server_thread %x enter / chdev = %x / cycle %d\n",
-__FUNCTION__ , server , chdev , cycle );
-#endif
-
+    // get root and lock on command queue
     root_xp = XPTR( local_cxy , &chdev->wait_root );
     lock_xp = XPTR( local_cxy , &chdev->wait_lock );
@@ -253 +265 @@
         else                            // waiting queue not empty
         {
-
-#if (CONFIG_DEBUG_SYS_READ & 1)
-enter_chdev_server_read = (uint32_t)hal_get_cycles();
-#endif
-
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
-enter_chdev_server_write = (uint32_t)hal_get_cycles();
-#endif
-
             // release lock 
             remote_spinlock_unlock( lock_xp );
@@ -271 +274 @@
             client_cxy = GET_CXY( client_xp );
             client_ptr = (thread_t *)GET_PTR( client_xp );
+
+#if CONFIG_DEBUG_CHDEV_SERVER_RX
+uint32_t rx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx) && (CONFIG_DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+printk("\n[DBG] %s : server_thread %x start RX / client %x / cycle %d\n",
+__FUNCTION__ , server , client_ptr , rx_cycle );
+#endif
+
+#if CONFIG_DEBUG_CHDEV_SERVER_TX
+uint32_t tx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx == 0) && (CONFIG_DEBUG_CHDEV_SERVER_TX < tx_cycle) )
+printk("\n[DBG] %s : server_thread %x start TX / client %x / cycle %d\n",
+__FUNCTION__ , server , client_ptr , tx_cycle );
+#endif
+
+#if (CONFIG_DEBUG_SYS_READ & 1)
+enter_chdev_server_read = (uint32_t)hal_get_cycles();
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+enter_chdev_server_write = (uint32_t)hal_get_cycles();
+#endif
 
             // call driver command function to execute I/O operation
@@ -283 +308 @@
             thread_unblock( client_xp , THREAD_BLOCKED_IO );
 
-#if CONFIG_DEBUG_CHDEV_SEQUENCIAL_SERVER
-cycle = (uint32_t)hal_get_cycles();
-if( CONFIG_DEBUG_CHDEV_SEQUENCIAL_SERVER < cycle )
-printk("\n[DBG] %s : server_thread %x complete operation for client %x / cycle %d\n",
-__FUNCTION__ , server , client_ptr , cycle );
+#if CONFIG_DEBUG_CHDEV_SERVER_RX
+rx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx) && (CONFIG_DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+printk("\n[DBG] %s : server_thread %x completes RX / client %x / cycle %d\n",
+__FUNCTION__ , server , client_ptr , rx_cycle );
+#endif
+
+#if CONFIG_DEBUG_CHDEV_SERVER_TX
+tx_cycle = (uint32_t)hal_get_cycles();
+if( (chdev->is_rx == 0) && (CONFIG_DEBUG_CHDEV_SERVER_TX < tx_cycle) )
+printk("\n[DBG] %s : server_thread %x completes TX / client %x / cycle %d\n",
+__FUNCTION__ , server , client_ptr , tx_cycle );
 #endif