Changeset 437 for trunk/kernel/devices/dev_ioc.c

Timestamp:

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

Author:

alain

Message:

Fix various bugs

File:

• trunk/kernel/devices/dev_ioc.c (modified) (7 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -2 +2 @@
  * dev_ioc.c - IOC (Block Device Controler) generic device API implementation.
  *
- * Author  Alain Greiner    (2016)
+ * Author  Alain Greiner    (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -101 +101 @@
     thread_t * this = CURRENT_THREAD;              // pointer on client thread
 
-    ioc_dmsg("\n[DBG] %s : thread %x in process %x"
-             " for lba = %x / buffer = %x / at cycle %d\n",
-             __FUNCTION__ , this->trdid , this->process->pid ,
-             lba , (intptr_t)buffer , hal_get_cycles() );
-
     // software L2/L3 cache coherence for memory buffer
     if( chdev_dir.iob )
@@ -130 +125 @@
     chdev_register_command( dev_xp );
 
-    ioc_dmsg("\n[DBG] in %s : thread %x in process %x"
-             " completes / error = %d / at cycle %d\n",
-             __FUNCTION__ , this->trdid , this->process->pid ,
-             this->ioc_cmd.error , hal_get_cycles() );
-
     // return I/O operation status
     return this->ioc_cmd.error;
@@ -145 +135 @@
                       uint32_t       count )
 {
+
+#if CONFIG_DEBUG_DEV_IOC_RX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_RX < cycle )
+printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
+
     return dev_ioc_access( IOC_READ , buffer , lba , count );
+
+#if CONFIG_DEBUG_DEV_IOC_RX
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_RX < cycle )
+printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
+
 }
 
@@ -153 +159 @@
                        uint32_t      count )
 {
+
+#if CONFIG_DEBUG_DEV_IOC_TX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_TX < cycle )
+printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
+
     return dev_ioc_access( IOC_WRITE , buffer , lba , count );
+
+#if CONFIG_DEBUG_DEV_IOC_TX
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_TX < cycle )
+printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
+
 }
 
@@ -164 +186 @@
     thread_t * this = CURRENT_THREAD;
 
-    ioc_dmsg("\n[DBG] %s : core[%x,%d] enter for %d blocks / lba = %x / cycle %d\n",
-    __FUNCTION__ , local_cxy , this->core->lid , count , lba , hal_time_stamp() );
+#if CONFIG_DEBUG_DEV_IOC_RX
+uint32_t cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_RX < cycle )
+printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
 
     // software L2/L3 cache coherence for memory buffer
@@ -201 +227 @@
     dev_pic_enable_irq( lid , ioc_xp );
 
-    ioc_dmsg("\n[DBG] %s : core[%x,%d] exit / error = %d / cycle %d\n",
-    __FUNCTION__ , local_cxy , this->core->lid , this->ioc_cmd.error , hal_time_stamp() );
+#if CONFIG_DEBUG_DEV_IOC_RX
+cycle = (uint32_t)hal_get_cycles();
+if( CONFIG_DEBUG_DEV_IOC_RX < cycle )
+printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this, lba, buffer, cycle );
+#endif
 
     // return I/O operation status from calling thread descriptor