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

Timestamp:

Apr 4, 2018, 2:49:02 PM (7 years ago)

Author:

alain

Message:

Fix a bug in scheduler related to RPC blocking.

File:

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

trunk/kernel/kern/chdev.c

@@ -39 +39 @@
 extern chdev_directory_t    chdev_dir;   // allocated in kernel_init.c
 
-#if (CONFIG_DEBUG_SYS_READ & 1)
+#if (DEBUG_SYS_READ & 1)
 extern uint32_t enter_chdev_cmd_read;
 extern uint32_t exit_chdev_cmd_read;
@@ -46 +46 @@
 #endif
 
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
+#if (DEBUG_SYS_WRITE & 1)
 extern uint32_t enter_chdev_cmd_write;
 extern uint32_t exit_chdev_cmd_write;
@@ -130 +130 @@
     uint32_t   save_sr;       // for critical section
 
-#if (CONFIG_DEBUG_SYS_READ & 1)
+#if (DEBUG_SYS_READ & 1)
 enter_chdev_cmd_read = (uint32_t)hal_get_cycles();
 #endif
 
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
+#if (DEBUG_SYS_WRITE & 1)
 enter_chdev_cmd_write = (uint32_t)hal_get_cycles();
 #endif
@@ -144 +144 @@
     chdev_t * chdev_ptr = (chdev_t *)GET_PTR( chdev_xp );
 
-#if (CONFIG_DEBUG_CHDEV_CMD_RX || CONFIG_DEBUG_CHDEV_CMD_TX)
+#if (DEBUG_CHDEV_CMD_RX || 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
+#if DEBUG_CHDEV_CMD_RX
 uint32_t rx_cycle = (uint32_t)hal_get_cycles();
-if( (is_rx) && (CONFIG_DEBUG_CHDEV_CMD_RX < rx_cycle) )
+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 );
 #endif
 
-#if CONFIG_DEBUG_CHDEV_CMD_TX
+#if DEBUG_CHDEV_CMD_TX
 uint32_t tx_cycle = (uint32_t)hal_get_cycles();
-if( (is_rx == 0) && (CONFIG_DEBUG_CHDEV_CMD_TX < tx_cycle) )
+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 );
@@ -207 +207 @@
     hal_restore_irq( save_sr );
 
-#if CONFIG_DEBUG_CHDEV_CMD_RX
+#if DEBUG_CHDEV_CMD_RX
 rx_cycle = (uint32_t)hal_get_cycles();
-if( (is_rx) && (CONFIG_DEBUG_CHDEV_CMD_RX < rx_cycle) )
+if( (is_rx) && (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
+#if DEBUG_CHDEV_CMD_TX
 tx_cycle = (uint32_t)hal_get_cycles();
-if( (is_rx == 0) && (CONFIG_DEBUG_CHDEV_CMD_TX < tx_cycle) )
+if( (is_rx == 0) && (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
 
-#if (CONFIG_DEBUG_SYS_READ & 1)
+#if (DEBUG_SYS_READ & 1)
 exit_chdev_cmd_read = (uint32_t)hal_get_cycles();
 #endif
 
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
+#if (DEBUG_SYS_WRITE & 1)
 exit_chdev_cmd_write = (uint32_t)hal_get_cycles();
 #endif
@@ -275 +275 @@
             client_ptr = (thread_t *)GET_PTR( client_xp );
 
-#if CONFIG_DEBUG_CHDEV_SERVER_RX
+#if DEBUG_CHDEV_SERVER_RX
 uint32_t rx_cycle = (uint32_t)hal_get_cycles();
-if( (chdev->is_rx) && (CONFIG_DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+if( (chdev->is_rx) && (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
+#if 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) )
+if( (chdev->is_rx == 0) && (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)
+#if (DEBUG_SYS_READ & 1)
 enter_chdev_server_read = (uint32_t)hal_get_cycles();
 #endif
 
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
+#if (DEBUG_SYS_WRITE & 1)
 enter_chdev_server_write = (uint32_t)hal_get_cycles();
 #endif
@@ -308 +308 @@
             thread_unblock( client_xp , THREAD_BLOCKED_IO );
 
-#if CONFIG_DEBUG_CHDEV_SERVER_RX
+#if DEBUG_CHDEV_SERVER_RX
 rx_cycle = (uint32_t)hal_get_cycles();
-if( (chdev->is_rx) && (CONFIG_DEBUG_CHDEV_SERVER_RX < rx_cycle) )
+if( (chdev->is_rx) && (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
+#if DEBUG_CHDEV_SERVER_TX
 tx_cycle = (uint32_t)hal_get_cycles();
-if( (chdev->is_rx == 0) && (CONFIG_DEBUG_CHDEV_SERVER_TX < tx_cycle) )
+if( (chdev->is_rx == 0) && (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
 
-#if (CONFIG_DEBUG_SYS_READ & 1)
+#if (DEBUG_SYS_READ & 1)
 exit_chdev_server_read = (uint32_t)hal_get_cycles();
 #endif
 
-#if (CONFIG_DEBUG_SYS_WRITE & 1)
+#if (DEBUG_SYS_WRITE & 1)
 exit_chdev_server_write = (uint32_t)hal_get_cycles();
 #endif