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

Timestamp:

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

Author:

alain

Message:

Cosmetic: improve debug.

File:

• trunk/kernel/libk/rwlock.c (modified) (10 diffs)

trunk/kernel/libk/rwlock.c

@@ -68 +68 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    printk("\n[DBG] %s : thread %x in process %x READ BLOCK on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
-#endif
-        // get pointer on calling thread
-        thread_t * this = CURRENT_THREAD;
-
+printk("\n[%s] thread[%x,%x] READ BLOCK on rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
+#endif
         // register reader thread in waiting queue
         list_add_last( &lock->rd_root , &this->wait_list );
@@ -95 +90 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    printk("\n[DBG] %s : thread %x in process READ ACQUIRE on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, 
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] READ ACQUIRE rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
 
@@ -127 +120 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    printk("\n[DBG] %s : thread %x in process WRITE BLOCK on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, 
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
-#endif
-        // get pointer on calling thread
-        thread_t * this = CURRENT_THREAD;
-
+printk("\n[%s] thread[%x,%x] WRITE BLOCK on rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
+#endif
         // register writer in waiting queue
         list_add_last( &lock->wr_root , &this->wait_list );
@@ -154 +142 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    printk("\n[DBG] %s : thread %x in process WRITE ACQUIRE on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, 
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] WRITE ACQUIRE rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
 
@@ -179 +165 @@
 
 #if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process READ RELEASE on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, 
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+thread_t * this = CURRENT_THREAD;
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] READ RELEASE rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
 
@@ -200 +184 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process %x UNBLOCK thread %x in process %d"
-    " / rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, thread->trdid, thread->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
 
@@ -226 +206 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process %x UNBLOCK thread %x in process %d"
-    " / rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, thread->trdid, thread->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
    
@@ -258 +234 @@
 
 #if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process WRITE RELEASE on rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+thread_t * this = CURRENT_THREAD;
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] WRITE RELEASE rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, 
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
 
@@ -278 +252 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process %x UNBLOCK thread %x in process %d"
-    " / rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, thread->trdid, thread->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
         // remove this waiting thread from waiting list
@@ -303 +273 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-{
-    thread_t * this = CURRENT_THREAD;
-    printk("\n[DBG] %s : thread %x in process %x UNBLOCK thread %x in process %d"
-    " / rwlock %s [%x,%x]\n",
-    __FUNCTION__, this->trdid, this->process->pid, thread->trdid, thread->process->pid,
-    lock_type_str[lock->lock.type], local_cxy, lock );
-}
+printk("\n[%s] thread[%x,%x] UNBLOCK thread[%x,%x] / rwlock %s [%x,%x]\n",
+__FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
+lock_type_str[lock->lock.type], local_cxy, lock );
 #endif
             // remove this waiting thread from waiting list