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

Timestamp:

Dec 27, 2018, 7:38:58 PM (5 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/remote_rwlock.c (modified) (13 diffs)

trunk/kernel/libk/remote_rwlock.c

@@ -53 +53 @@
     remote_busylock_init( XPTR( lock_cxy , &lock_ptr->lock ) , type ); 
 
-#if DEBUG_RWLOCK
+#if DEBUG_RWLOCK_TYPE
 thread_t * this = CURRENT_THREAD;
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+if( type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] initialise lock %s [%x,%x]\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -75 +75 @@
     cxy_t             lock_cxy = GET_CXY( lock_xp );
 
-#if DEBUG_RWLOCK
+#if DEBUG_RWLOCK_TYPE
 uint32_t lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
 #endif
@@ -92 +92 @@
     {
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] READ BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -123 +123 @@
     hal_fence();
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] READ ACQUIRE rwlock %s [%x,%x] / taken = %d / count = %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -148 +148 @@
     cxy_t             lock_cxy = GET_CXY( lock_xp );
 
-#if DEBUG_RWLOCK
+#if DEBUG_RWLOCK_TYPE
 uint32_t lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
 #endif
@@ -165 +165 @@
     {
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] WRITE BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -195 +195 @@
     hal_remote_s32( taken_xp , 1 );
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] WRITE ACQUIRE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
@@ -231 +231 @@
     hal_remote_atomic_add( count_xp , -1 );
 
-#if DEBUG_RWLOCK
+#if DEBUG_RWLOCK_TYPE
 thread_t * this      = CURRENT_THREAD;
 uint32_t   lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
 xptr_t     taken_xp  = XPTR( lock_cxy , &lock_ptr->taken );
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] READ RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -257 +257 @@
         thread_unblock( thread_xp , THREAD_BLOCKED_LOCK );
 
-#if DEBUG_RWLOCK
-if( (uint32_t)hal_get_cycles() > DEBUG_RWLOCK )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 {
     trdid_t     trdid     = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );
@@ -288 +288 @@
             thread_unblock( thread_xp , THREAD_BLOCKED_LOCK );
 
-#if DEBUG_RWLOCK
-if( (uint32_t)hal_get_cycles() > DEBUG_RWLOCK )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 {
     trdid_t     trdid     = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );
@@ -330 +330 @@
     hal_remote_s32( taken_xp , 0 );
 
-#if DEBUG_RWLOCK
+#if DEBUG_RWLOCK_TYPE
 thread_t * this      = CURRENT_THREAD;
 uint32_t   lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
 xptr_t     count_xp  = XPTR( lock_cxy , &lock_ptr->count );
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+if( lock_type == DEBUG_RWLOCK_TYPE )
 printk("\n[%s] thread[%x,%x] WRITE RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
@@ -355 +355 @@
         thread_unblock( thread_xp , THREAD_BLOCKED_LOCK );
 
-#if DEBUG_RWLOCK
-if( (uint32_t)hal_get_cycles() > DEBUG_RWLOCK )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 {
     trdid_t     trdid     = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );
@@ -385 +385 @@
             thread_unblock( thread_xp , THREAD_BLOCKED_LOCK );
 
-#if DEBUG_RWLOCK
-if( (uint32_t)hal_get_cycles() > DEBUG_RWLOCK )
+#if DEBUG_RWLOCK_TYPE
+if( lock_type == DEBUG_RWLOCK_TYPE )
 {
     trdid_t     trdid     = hal_remote_l32( XPTR( thread_cxy , &thread_ptr->trdid ) );