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

Timestamp:

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

Author:

alain

Message:

Fix bugs in exec

File:

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

trunk/kernel/libk/remote_spinlock.c

@@ -38 +38 @@
 
         hal_remote_sw ( XPTR( cxy , &ptr->taken ) , 0 );
+
+#if CONFIG_LOCKS_CONFIG
         hal_remote_swd( XPTR( cxy , &ptr->owner ) , XPTR_NULL );
         xlist_entry_init( XPTR( cxy , &ptr->list ) );
+#endif
+
 }
 
@@ -52 +56 @@
         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;
 
@@ -73 +76 @@
                 thread_ptr->remote_locks++;
 
+#if CONFIG_LOCKS_DEBUG
                 hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) ,
-                            (uint64_t)XPTR( thread_cxy , thread_ptr) );
-
-                xlist_add_first( XPTR( thread_cxy , &thread_ptr->xlocks_root ) ,
-                             XPTR( lock_cxy , &lock_ptr->list ) );
+                                XPTR( thread_cxy , thread_ptr) );
+                xlist_add_first( XPTR( local_cxy , &thread_ptr->xlocks_root ) ,
+                                 XPTR( lock_cxy , &lock_ptr->list ) );
+#endif
 
                 hal_restore_irq(mode);
@@ -96 +100 @@
         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;
 
@@ -118 +121 @@
         thread_ptr->remote_locks++;
 
-        hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) ,
-                        (uint64_t)XPTR( thread_cxy , thread_ptr) );
-
-        xlist_add_first( XPTR( thread_cxy , &thread_ptr->xlocks_root ) ,
-                         XPTR( lock_cxy , &lock_ptr->list ) );
+#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
 
         // irq_state must be restored when lock is released
@@ -140 +144 @@
         thread_t          * thread_ptr = CURRENT_THREAD;
 
+#if CONFIG_LOCKS_DEBUG
         hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) , XPTR_NULL );
+        xlist_unlink( XPTR( lock_cxy , &lock_ptr->list ) );
+#endif
+
         hal_remote_sw ( XPTR( lock_cxy , &lock_ptr->taken ) , 0 );
         thread_ptr->remote_locks--;
-        xlist_unlink( XPTR( lock_cxy , &lock_ptr->list ) );
 
     // deschedule if pending request
@@ -163 +170 @@
         cxy_t               lock_cxy = GET_CXY( lock_xp );
 
-    // get cluster and local pointer on calling thread
-    cxy_t               thread_cxy = local_cxy;
+    // get local pointer on calling thread
     thread_t          * thread_ptr = CURRENT_THREAD;
 
@@ -191 +197 @@
         thread_ptr->remote_locks++;
 
-        hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) ,
-                        (uint64_t)XPTR( thread_cxy , thread_ptr) );
-
-        xlist_add_first( XPTR( thread_cxy , &thread_ptr->xlocks_root ) ,
-                         XPTR( lock_cxy , &lock_ptr->list ) );
+#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
 
         // enable interrupts
@@ -211 +218 @@
         thread_t          * thread_ptr = CURRENT_THREAD;
 
+#if CONFIG_LOCKS_DEBUG
         hal_remote_swd( XPTR( lock_cxy , &lock_ptr->owner ) , XPTR_NULL );
+        xlist_unlink( XPTR( lock_cxy , &lock_ptr->list ) );
+#endif
+
         hal_remote_sw ( XPTR( lock_cxy , &lock_ptr->taken ) , 0 );
         thread_ptr->remote_locks--;
-        xlist_unlink( XPTR( lock_cxy , &lock_ptr->list ) );
 
     // deschedule if pending request
@@ -220 +230 @@
 }
 
-//////////////////////////////////////////////
-xptr_t remote_spinlock_owner( xptr_t lock_xp )
-{
-    // get cluster and local pointer on remote_spinlock
-    remote_spinlock_t * lock_ptr = (remote_spinlock_t *)GET_PTR( lock_xp );
-    cxy_t               lock_cxy = GET_CXY( lock_xp );
-
-    return hal_remote_lw( XPTR( lock_cxy , &lock_ptr->owner ) );
-}