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

Timestamp:

Dec 3, 2018, 12:17:35 PM (5 years ago)

Author:

alain

Message:

Improve the FAT32 file system to support cat, rm, cp commands.

File:

• trunk/kernel/libk/remote_rwlock.c (modified) (7 diffs)

trunk/kernel/libk/remote_rwlock.c

@@ -52 +52 @@
 
     remote_busylock_init( XPTR( lock_cxy , &lock_ptr->lock ) , type ); 
+
+#if DEBUG_RWLOCK
+thread_t * this = CURRENT_THREAD;
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+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_ptr );
+#endif
+
 }
 
@@ -85 +94 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] READ BLOCK on rwlock %s [%x,%x]\n",
+printk("\n[%s] thread[%x,%x] READ BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
-lock_type_str[lock_type], lock_cxy, lock_ptr );
+lock_type_str[lock_type], lock_cxy, lock_ptr,
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
 #endif
         // get pointer on calling thread
@@ -108 +118 @@
     }
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] READ ACQUIRE rwlock %s [%x,%x]\n",
-__FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock_type], lock_cxy, lock_ptr );
-#endif
-
     // increment number of readers
     hal_remote_atomic_add( count_xp , 1 );
+
+    hal_fence();
+
+#if DEBUG_RWLOCK
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] READ ACQUIRE rwlock %s [%x,%x] / taken = %d / count = %d\n",
+__FUNCTION__, this->process->pid, this->trdid,
+lock_type_str[lock_type], lock_cxy, lock_ptr,
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
+#endif
 
     // release busylock
@@ -154 +167 @@
 #if DEBUG_RWLOCK
 if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] WRITE BLOCK on rwlock %s [%x,%x]\n",
+printk("\n[%s] thread[%x,%x] WRITE BLOCK on rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
-lock_type_str[lock_type], lock_cxy, lock_ptr );
-#endif
+lock_type_str[lock_type], lock_cxy, lock_ptr, 
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
+#endif
+
         // get local pointer on calling thread
         thread_t * this = CURRENT_THREAD;
@@ -177 +192 @@
     }
 
-#if DEBUG_RWLOCK
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] WRITE ACQUIRE rwlock %s [%x,%x]\n",
+    // take rwlock for write
+    hal_remote_s32( taken_xp , 1 );
+
+#if DEBUG_RWLOCK
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] WRITE ACQUIRE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid, 
-lock_type_str[lock_type], lock_cxy, lock_ptr );
-#endif
-
-    // take rwlock
-    hal_remote_s32( taken_xp , 1 );
+lock_type_str[lock_type], lock_cxy, lock_ptr,
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
+#endif
 
     // release busylock
@@ -212 +228 @@
     remote_busylock_acquire( busylock_xp );
 
+        // decrement number of readers
+    hal_remote_atomic_add( count_xp , -1 );
+
 #if DEBUG_RWLOCK
 thread_t * this      = CURRENT_THREAD;
 uint32_t   lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] READ RELEASE rwlock %s [%x,%x]\n",
+xptr_t     taken_xp  = XPTR( lock_cxy , &lock_ptr->taken );
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] READ RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock_type], lock_cxy, lock_ptr );
-#endif
-
-        // decrement number of readers
-    hal_remote_atomic_add( count_xp , -1 );
+lock_type_str[lock_type], lock_cxy, lock_ptr,
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
+#endif
 
     // release first writer in waiting queue if no current readers
@@ -309 +327 @@
     remote_busylock_acquire( busylock_xp );
 
+    // release rwlock
+    hal_remote_s32( taken_xp , 0 );
+
 #if DEBUG_RWLOCK
 thread_t * this      = CURRENT_THREAD;
 uint32_t   lock_type = hal_remote_l32( XPTR( lock_cxy , &lock_ptr->lock.type ) );
-if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
-printk("\n[%s] thread[%x,%x] WRITE RELEASE rwlock %s [%x,%x]\n",
+xptr_t     count_xp  = XPTR( lock_cxy , &lock_ptr->count );
+if( DEBUG_RWLOCK < (uint32_t)hal_get_cycles() )
+printk("\n[%s] thread[%x,%x] WRITE RELEASE rwlock %s [%x,%x] / taken %d / count %d\n",
 __FUNCTION__, this->process->pid, this->trdid,
-lock_type_str[lock_type], lock_cxy, lock_ptr );
-#endif
-
-    // release rwlock
-    hal_remote_s32( taken_xp , 0 );
+lock_type_str[lock_type], lock_cxy, lock_ptr,
+hal_remote_l32( taken_xp ), hal_remote_l32( count_xp ) );
+#endif
 
     // unblock first waiting writer thread if writers waiting queue non empty