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

Timestamp:

Dec 27, 2018, 7:38:58 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in VFS to support the following
ksh commandis : cp, mv, rm, mkdir, cd, pwd

File:

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

trunk/kernel/libk/queuelock.c

@@ -45 +45 @@
     busylock_init( &lock->lock , type );
 
-#if DEBUG_QUEUELOCK
+#if DEBUG_QUEUELOCK_TYPE
 thread_t * this = CURRENT_THREAD;
-if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
+if( DEBUG_QUEUELOCK_TYPE == type )
 printk("\n[%s] thread[%x,%x] initialise lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -70 +70 @@
     {
 
-#if DEBUG_QUEUELOCK
-if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_QUEUELOCK_TYPE
+uint32_t   lock_type = lock->lock.type;
+if( DEBUG_QUEUELOCK_TYPE == lock_type )
 printk("\n[%s ] thread[%x,%x] BLOCK on q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock->lock.type], local_cxy, lock );
+lock_type_str[lock_type], local_cxy, lock );
 #endif
         // get pointer on calling thread
@@ -95 +96 @@
     }
 
-#if DEBUG_QUEUELOCK
-if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_QUEUELOCK_TYPE
+if( DEBUG_QUEUELOCK_TYPE == lock_type )
 printk("\n[%s] thread[%x,%x] ACQUIRE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock->lock.type], local_cxy, lock );
+lock_type_str[lock_type], local_cxy, lock );
 #endif
 
@@ -119 +120 @@
     busylock_acquire( &lock->lock );
 
-#if DEBUG_QUEUELOCK
-thread_t * this = CURRENT_THREAD;
-if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_QUEUELOCK_TYPE
+uint32_t   lock_type = lock->lock.type;
+thread_t * this      = CURRENT_THREAD;
+if( DEBUG_QUEUELOCK_TYPE == lock_type )
 printk("\n[%s] thread[%x,%x] RELEASE q_lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock->lock.type], local_cxy, lock );
+lock_type_str[lock_type], local_cxy, lock );
 #endif
 
@@ -136 +138 @@
         thread_t * thread = LIST_FIRST( &lock->root , thread_t , wait_list );
 
-#if DEBUG_QUEUELOCK
-if( DEBUG_QUEUELOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_QUEUELOCK_TYPE
+if( DEBUG_QUEUELOCK_TYPE == lock_type )
 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->lock.type], local_cxy, lock );
+lock_type_str[lock_type], local_cxy, lock );
 #endif
         // remove this waiting thread from waiting list