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

Timestamp:

Feb 20, 2018, 5:32:17 PM (6 years ago)

Author:

alain

Message:

Fix a bad bug in scheduler...

File:

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

trunk/kernel/kern/chdev.c

@@ -39 +39 @@
 extern chdev_directory_t    chdev_dir;   // allocated in kernel_init.c
 
-#if CONFIG_READ_DEBUG
-extern uint32_t enter_chdev_cmd;
-extern uint32_t exit_chdev_cmd;
-extern uint32_t enter_chdev_server;
-extern uint32_t exit_chdev_server;
+#if (CONFIG_DEBUG_SYS_READ & 1)
+extern uint32_t enter_chdev_cmd_read;
+extern uint32_t exit_chdev_cmd_read;
+extern uint32_t enter_chdev_server_read;
+extern uint32_t exit_chdev_server_read;
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+extern uint32_t enter_chdev_cmd_write;
+extern uint32_t exit_chdev_cmd_write;
+extern uint32_t enter_chdev_server_write;
+extern uint32_t exit_chdev_server_write;
 #endif
 
@@ -123 +130 @@
     uint32_t   save_sr;       // for critical section
 
-#if CONFIG_READ_DEBUG
-enter_chdev_cmd = hal_time_stamp();
+#if (CONFIG_DEBUG_SYS_READ & 1)
+enter_chdev_cmd_read = (uint32_t)hal_get_cycles();
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+enter_chdev_cmd_write = (uint32_t)hal_get_cycles();
 #endif
 
@@ -178 +189 @@
     if( different ) dev_pic_send_ipi( chdev_cxy , lid ); 
     
+    // deschedule
+    assert( thread_can_yield( this ) , __FUNCTION__ , "illegal sched_yield\n" );
+    sched_yield("blocked on I/O");
+
+    // exit critical section
+    hal_restore_irq( save_sr );
+
 #if CONFIG_DEBUG_CHDEV_REGISTER_COMMAND
 cycle = (uint32_t)hal_get_cycles();
@@ -185 +203 @@
 #endif
 
-    // deschedule
-    assert( thread_can_yield( this ) , __FUNCTION__ , "illegal sched_yield\n" );
-    sched_yield("blocked on I/O");
-
-    // exit critical section
-    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) resumes / cycle %d\n",
-__FUNCTION__, this, thread_type_str(this->type) , cycle );
-#endif
-
-#if CONFIG_READ_DEBUG
-exit_chdev_cmd = hal_time_stamp();
+#if (CONFIG_DEBUG_SYS_READ & 1)
+exit_chdev_cmd_read = (uint32_t)hal_get_cycles();
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+exit_chdev_cmd_write = (uint32_t)hal_get_cycles();
 #endif
 
@@ -240 +248 @@
             remote_spinlock_unlock( lock_xp );
 
-chdev_dmsg("\n[DBG] %s : thread %x deschedule /cycle %d\n",
-__FUNCTION__ , server , hal_time_stamp() );
-
             // deschedule
             sched_yield("I/O queue empty");
-
-chdev_dmsg("\n[DBG] %s : thread %x resume /cycle %d\n",
-__FUNCTION__ , server , hal_time_stamp() );
-
         } 
         else                            // waiting queue not empty
         {
 
-#if CONFIG_READ_DEBUG
-enter_chdev_server = hal_time_stamp();
-#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
+
             // release lock 
             remote_spinlock_unlock( lock_xp );
@@ -284 +290 @@
 #endif
 
-#if CONFIG_READ_DEBUG
-exit_chdev_server = hal_time_stamp();
+#if (CONFIG_DEBUG_SYS_READ & 1)
+exit_chdev_server_read = (uint32_t)hal_get_cycles();
+#endif
+
+#if (CONFIG_DEBUG_SYS_WRITE & 1)
+exit_chdev_server_write = (uint32_t)hal_get_cycles();
 #endif