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

Timestamp:

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

Author:

alain

Message:

Cosmetic.

File:

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

trunk/kernel/libk/remote_busylock.c

@@ -2 +2 @@
  * remote_busylock.c - remote kernel busy-waiting lock implementation.
  *
- * Authors     Alain Greiner (2016,2017,2018,2019)
+ * Authors     Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -50 +50 @@
     hal_remote_s32( XPTR( lock_cxy , &lock_ptr->type    ) , type );
 
-#if DEBUG_BUSYLOCK
+#if DEBUG_BUSYLOCK_TYPE
     xlist_entry_init( XPTR( lock_cxy , &lock_ptr->xlist ) ); 
 #endif
@@ -85 +85 @@
     hal_fence();
     
-#if DEBUG_BUSYLOCK
+#if DEBUG_BUSYLOCK_TYPE
 uint32_t type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->type ) );
 if( type != LOCK_CHDEV_TXT0 )
@@ -93 +93 @@
     xlist_add_last( root_xp , XPTR( lock_cxy  , &lock_ptr->xlist ) );
 }
-#endif
-
-#if( DEBUG_BUSYLOCK & 1 )
-if( (type != LOCK_CHDEV_TXT0) && 
+if( (type               == DEBUG_BUSYLOCK_TYPE) && 
     (this->process->pid == DEBUG_BUSYLOCK_PID) &&
-    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
+    (this->trdid        == DEBUG_BUSYLOCK_TRDID) )
 {
     printk("\n[%s] thread[%x,%x] ACQUIRE lock %s\n",
@@ -128 +125 @@
     hal_fence();
 
-#if DEBUG_BUSYLOCK
+#if DEBUG_BUSYLOCK_TYPE
 uint32_t type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->type ) );
 if( type != LOCK_CHDEV_TXT0 ) 
@@ -135 +132 @@
     xlist_unlink( XPTR( lock_cxy  , &lock_ptr->xlist ) );
 }
-#endif
-
-#if( DEBUG_BUSYLOCK & 1 )
-if( (type != LOCK_CHDEV_TXT0) && 
+if( (type               == DEBUG_BUSYLOCK_TYPE) && 
     (this->process->pid == DEBUG_BUSYLOCK_PID) &&
-    (this->trdid == DEBUG_BUSYLOCK_TRDID) )
+    (this->trdid        == DEBUG_BUSYLOCK_TRDID) )
 {
     printk("\n[%s] thread[%x,%x] RELEASE lock %s\n",