Changeset 600 for trunk/kernel/libk/remote_queuelock.c

Timestamp:

Nov 10, 2018, 5:38:51 PM (5 years ago)

Author:

alain

Message:

Cosmetic: improve debug.

File:

• trunk/kernel/libk/remote_queuelock.c (modified) (5 diffs)

trunk/kernel/libk/remote_queuelock.c

@@ -67 +67 @@
     remote_queuelock_t * lock_ptr = GET_PTR( lock_xp );
 
+#if DEBUG_QUEUELOCK
+uint32_t lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
+#endif
+
     // build extended pointer on busylock protecting queuelock
     xptr_t busylock_xp = XPTR( lock_cxy , &lock_ptr->lock );
@@ -79 +83 @@
 #if DEBUG_QUEUELOCK
 if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
-{
-    uint32_t   type = hal_remote_l32( XPTR( lock_cxy , &locr_ptr->lock.type ) );
-    printk("\n[DBG] %s : thread %x in process %x BLOCK on q_lock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid,
-    lock_type_str[type], lock_cxy, lock_ptr );
-}
+printk("\n[%s] thread[%x,%x] BLOCK on q_lock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock_type], lock_cxy, lock_ptr );
 #endif
         // get pointer on calling thread
@@ -108 +109 @@
 #if DEBUG_QUEUELOCK
 if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
-{
-    uint32_t   type = hal_remote_l32( XPTR( lock_cxy , &locr_ptr->lock.type ) );
-    printk("\n[DBG] %s : thread %x in process %x ACQUIRE q_lock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid,
-    lock_type_str[type], lock_cxy, lock_ptr );
-}
+printk("\n[%s] thread[%x,%x] ACQUIRE q_lock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock_type], lock_cxy, lock_ptr );
 #endif
 
@@ -141 +139 @@
 
 #if DEBUG_QUEUELOCK
+thread_t * this      = CURRENT_THREAD;
+uint32_t   lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
 if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    uint32_t   type = hal_remote_l32( XPTR( lock_cxy , &locr_ptr->lock.type ) );
-    printk("\n[DBG] %s : thread %x in process %x RELEASE q_lock %s (%x,%x)\n",
-    __FUNCTION__, this->trdid, this->process->pid,
-    lock_type_str[type], lock_cxy, lock_ptr );
-}
+printk("\n[%s] thread[%x,%x] RELEASE q_lock %s (%x,%x)\n",
+__FUNCTION__, this->process->pid, this->trdid,
+lock_type_str[lock_type], lock_cxy, lock_ptr );
 #endif
 
@@ -166 +162 @@
 if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
 {
-    thread_t  * this    = CURRENT_THREAD;
-    uint32_t    type    = hal_remote_l32( XPTR( lock_cxy , &locr_ptr->lock.type ) );
     trdid_t     trdid   = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );
     process_t * process = hal_remote_lpt( XPTR( thread_cxy , &thread_ptr->process ) );
     pid_t       pid     = hal_remote_l32( XPTR( thread_cxy , &process->pid ) );
-    printk("\n[DBG] %s : thread %x in process %x UNBLOCK thread %x in process %d"
-    " / q_lock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, trdid, pid, 
-    lock_type_str[type], lock_cxy, lock_ptr );
+    printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / q_lock %s [%x,%x]\n",
+    __FUNCTION__, this->process->pid, this->trdid, trdid, pid, 
+    lock_type_str[lock_type], lock_cxy, lock_ptr );
 }
 #endif