Changeset 666 for trunk/kernel/libk/queuelock.c

Timestamp:

Oct 10, 2020, 5:27:12 PM (4 years ago)

Author:

alain

Message:

Cosmetic.

File:

• trunk/kernel/libk/queuelock.c (modified) (6 diffs)

trunk/kernel/libk/queuelock.c

@@ -47 +47 @@
 #if DEBUG_QUEUELOCK_TYPE
 thread_t * this = CURRENT_THREAD;
-if( (type      == DEBUG_QUEUELOCK_TYPE) &&
-    (lock      == DEBUG_QUEUELOCK_PTR ) &&
-    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
-printk("\n[%s] thread[%x,%x] initialise lock %s [%x,%x]\n",
+bool_t     cond = (type == DEBUG_QUEUELOCK_TYPE) &&
+                  (((local_cxy == (cxy_t)DEBUG_QUEUELOCK_CXY) &&
+                    (lock == (queuelock_t*)DEBUG_QUEUELOCK_PTR)) ||
+                   ((DEBUG_QUEUELOCK_CXY == 0) &&
+                    (DEBUG_QUEUELOCK_PTR == 0)));
+if( cond ) printk("\n[%s] thread[%x,%x] initialise lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
 lock_type_str[type], local_cxy, lock );
@@ -70 +72 @@
 #if DEBUG_QUEUELOCK_TYPE
 uint32_t   lock_type = lock->lock.type;
+bool_t     cond = (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+                  (((local_cxy == (cxy_t)DEBUG_QUEUELOCK_CXY) &&
+                    (lock == (queuelock_t*)DEBUG_QUEUELOCK_PTR)) ||
+                   ((DEBUG_QUEUELOCK_CXY == 0) &&
+                    (DEBUG_QUEUELOCK_PTR == 0)));
 #endif
 
@@ -77 +84 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
-    (lock      == DEBUG_QUEUELOCK_PTR ) &&
-    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
-printk("\n[%s ] thread[%x,%x] BLOCK on q_lock %s [%x,%x]\n",
+if( cond ) 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], local_cxy, lock );
@@ -104 +108 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
-    (lock      == DEBUG_QUEUELOCK_PTR ) &&
-    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
-printk("\n[%s] thread[%x,%x] ACQUIRE q_lock %s [%x,%x]\n",
+if( cond ) printk("\n[%s] thread[%x,%x] ACQUIRE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
 lock_type_str[lock_type], local_cxy, lock );
@@ -132 +133 @@
 uint32_t   lock_type = lock->lock.type;
 thread_t * this      = CURRENT_THREAD;
-if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
-    (lock      == DEBUG_QUEUELOCK_PTR ) &&
-    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
-printk("\n[%s] thread[%x,%x] RELEASE q_lock %s [%x,%x]\n",
+bool_t     cond = (lock_type == DEBUG_QUEUELOCK_TYPE) &&
+                  (((local_cxy == (cxy_t)DEBUG_QUEUELOCK_CXY) &&
+                    (lock == (queuelock_t*)DEBUG_QUEUELOCK_PTR)) ||
+                   ((DEBUG_QUEUELOCK_CXY == 0) &&
+                    (DEBUG_QUEUELOCK_PTR == 0)));
+#endif
+
+#if DEBUG_QUEUELOCK_TYPE
+if( cond ) printk("\n[%s] thread[%x,%x] RELEASE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
 lock_type_str[lock_type], local_cxy, lock );
@@ -150 +156 @@
 
 #if DEBUG_QUEUELOCK_TYPE
-if( (lock_type == DEBUG_QUEUELOCK_TYPE) &&
-    (lock      == DEBUG_QUEUELOCK_PTR ) &&
-    (local_cxy == DEBUG_QUEUELOCK_CXY ) )
-printk("\n[%s] thread[%x,%x] UNBLOCK thread [%x,%x] / q_lock %s [%x,%x]\n",
+if( cond ) printk("\n[%s] thread[%x,%x] UNBLOCK thread [%x,%x] / q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid, thread->process->pid, thread->trdid,
 lock_type_str[lock_type], local_cxy, lock );