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

Timestamp:

Dec 20, 2017, 4:51:09 PM (5 years ago)

Author:

alain

Message:

Fix bugs in exec

File:

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

trunk/kernel/libk/remote_rwlock.c

@@ -40 +40 @@
     hal_remote_sw ( XPTR( lock_cxy , &lock_ptr->current ) , 0 );
     hal_remote_sw ( XPTR( lock_cxy , &lock_ptr->count )   , 0 );
+
+#if CONFIG_LOCKS_DEBUG
     hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner )   , XPTR_NULL );
+    xlist_entry_init( XPTR( lock_cxy , &lock_ptr->list ) );
+#endif
+
 }
 
@@ -53 +58 @@
     cxy_t             lock_cxy = GET_CXY( lock_xp );
 
-    // get cluster and local pointer on local thread
+    // get local pointer on local thread
     thread_t          * thread_ptr = CURRENT_THREAD;
 
@@ -81 +86 @@
     thread_ptr->remote_locks++;
 
+#if CONFIG_LOCKS_DEBUG
+    xlist_add_first( XPTR( local_cxy , &thread_ptr->xlocks_root ) ,
+                     XPTR( lock_cxy ,  &lock_ptr->list ) );
+#endif
+
     // sync
     hal_fence();
@@ -115 +125 @@
     // decrement thread.remote_locks
         thread_ptr->remote_locks--;
+
+#if CONFIG_LOCKS_DEBUG
+    xlist_unlink( XPTR( lock_cxy , &lock->ptr->list ) );
+#endif
 
     // enable interrupts
@@ -134 +148 @@
     cxy_t             lock_cxy = GET_CXY( lock_xp );
 
-    // get cluster and local pointer on local thread
-    cxy_t               thread_cxy = local_cxy;
+    // get local pointer on local thread
     thread_t          * thread_ptr = CURRENT_THREAD;
 
@@ -142 +155 @@
     xptr_t              count_xp   = XPTR( lock_cxy   , &lock_ptr->count );
     xptr_t              current_xp = XPTR( lock_cxy   , &lock_ptr->current );
-    xptr_t              owner_xp   = XPTR( lock_cxy   , &lock_ptr->owner );
-    xptr_t              thread_xp  = XPTR( thread_cxy , thread_ptr );
 
     // disable interrupts
@@ -165 +176 @@
     }
 
-    // register owner thread
-    hal_remote_swd( owner_xp , thread_xp );
+#if CONFIG_LOCKS_DEBUG
+    hal_remote_swd( XPTR( lock_cxy  , &lock_ptr->owner ) ,
+                    XPTR( local_cxy , thread_ptr ) );
+    xlist_add_first( XPTR( local_cxy , &thread_ptr->xlocks_root ) ,
+                     XPTR( lock_cxy  , &lock_ptr->list ) );
+#endif    
 
     // increment thread.remote_locks
@@ -188 +203 @@
     thread_t          * thread_ptr = CURRENT_THREAD;
 
-    // compute extended pointers on lock->ticket, lock->owner 
+    // compute extended pointer on lock->ticket 
     xptr_t              current_xp = XPTR( lock_cxy   , &lock_ptr->current );
-    xptr_t              owner_xp   = XPTR( lock_cxy   , &lock_ptr->owner );
 
     // disable interrupts
         hal_disable_irq( &mode );
   
-    // unregister owner thread, and release lock
-    hal_remote_swd( owner_xp , XPTR_NULL );
+#if CONFIG_LOCKS_OWNER
+    hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) , XPTR_NULL );
+    xlist_unlink( XPTR( lock_cxy , &lock_ptr->list ) );
+#endif
+
+    // release lock
     hal_remote_atomic_add( current_xp , 1 );
 
@@ -217 +235 @@
     uint32_t     current;               // ticket index of current owner 
     uint32_t     count;                 // current number of reader threads
-    xptr_t       owner;                 // extended pointer on writer thread
 
     // get cluster and local pointer on remote_rwlock
@@ -226 +243 @@
     current = hal_remote_lw ( XPTR( lock_cxy , &lock_ptr->current ) );
     count   = hal_remote_lw ( XPTR( lock_cxy , &lock_ptr->count ) );
-    owner   = hal_remote_lwd( XPTR( lock_cxy , &lock_ptr->owner ) );
-
-    printk("\n*** rwlock <%l> %s : ticket = %d / current = %d / count = %d / owner = %l\n",
-           lock_xp , comment , ticket , current , count , owner ); 
+
+    printk("\n*** rwlock <%l> %s : ticket = %d / current = %d / count = %d\n",
+           lock_xp , comment , ticket , current , count ); 
 
 }  // end remote_rwlock_print()