Changeset 563 for trunk/kernel/libk/remote_barrier.c

Timestamp:

Oct 4, 2018, 11:16:13 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel spinlocks.

File:

• trunk/kernel/libk/remote_barrier.c (modified) (12 diffs)

trunk/kernel/libk/remote_barrier.c

@@ -1 +1 @@
 /*
- * remote_barrier.c - Access a POSIX barrier.
- *
- * Author   Alain Greiner (2016,2017)
+ * remote_barrier.c -  POSIX barrier implementation.
+ *
+ * Author   Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -25 +25 @@
 #include <hal_remote.h>
 #include <hal_irqmask.h>
-#include <remote_spinlock.h>
+#include <remote_busylock.h>
 #include <thread.h>
 #include <kmem.h>
@@ -33 +33 @@
 #include <remote_barrier.h>
 
-/////////////////////////////////////////////////
-inline void remote_barrier( xptr_t    barrier_xp,
-                            uint32_t  count )
-{
-    uint32_t  expected;
-
-    remote_barrier_t * ptr = (remote_barrier_t *)GET_PTR( barrier_xp );
-    cxy_t              cxy = GET_CXY( barrier_xp );
-
-    // get barrier sense value
-    uint32_t sense = hal_remote_lw( XPTR( cxy , &ptr->sense ) );
-
-    // compute expected value
-    if ( sense == 0 ) expected = 1;
-    else              expected = 0;
-
-    // atomically increment current
-    uint32_t current = hal_remote_atomic_add( XPTR( cxy , &ptr->current ) , 1 );
-
-    // last task reset current and toggle sense
-    if( current == (count-1) )
-    {
-        hal_remote_sw( XPTR( cxy , &ptr->current) , 0 );
-        hal_remote_sw( XPTR( cxy , &ptr->sense  ) , expected );
-    }
-    else   // other tasks poll the sense
-    {
-        while( hal_remote_lw( XPTR( cxy , &ptr->sense ) ) != expected ) asm volatile ("nop");
-    }
-}
 
 ///////////////////////////////////////////////////
@@ -120 +90 @@
     // get reference process cluster and local pointer
     cxy_t       ref_cxy = GET_CXY( ref_xp );
-    process_t * ref_ptr = (process_t *)GET_PTR( ref_xp );
+    process_t * ref_ptr = GET_PTR( ref_xp );
 
     // allocate memory for barrier descriptor
@@ -140 +110 @@
 
     // initialise barrier
-    hal_remote_sw ( XPTR( ref_cxy , &barrier_ptr->nb_threads ) , count );
-    hal_remote_sw ( XPTR( ref_cxy , &barrier_ptr->current    ) , 0 );
-    hal_remote_sw ( XPTR( ref_cxy , &barrier_ptr->sense      ) , 0 );
+    hal_remote_s32 ( XPTR( ref_cxy , &barrier_ptr->nb_threads ) , count );
+    hal_remote_s32 ( XPTR( ref_cxy , &barrier_ptr->current    ) , 0 );
+    hal_remote_s32 ( XPTR( ref_cxy , &barrier_ptr->sense      ) , 0 );
     hal_remote_spt( XPTR( ref_cxy , &barrier_ptr->ident      ) , (void*)ident );
 
@@ -151 +121 @@
     xptr_t entry_xp = XPTR( ref_cxy , &barrier_ptr->list );
 
-    remote_spinlock_lock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+    remote_busylock_acquire( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
     xlist_add_first( root_xp , entry_xp );
-    remote_spinlock_unlock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+    remote_busylock_release( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
 
     return 0;
@@ -176 +146 @@
 
     // remove barrier from reference process xlist
-    remote_spinlock_lock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+    remote_busylock_acquire( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
     xlist_unlink( XPTR( barrier_cxy , &barrier_ptr->list ) );
-    remote_spinlock_unlock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+    remote_busylock_release( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
 
     // release memory allocated for barrier descriptor
@@ -208 +178 @@
     thread_t         * thread_ptr = CURRENT_THREAD;
 
+// check calling thread can yield
+assert( (thread_ptr->busylocks == 0),
+"cannot yield : busylocks = %d\n", thread_ptr->busylocks );
+
     // get cluster and local pointer on remote barrier
     remote_barrier_t * barrier_ptr = (remote_barrier_t *)GET_PTR( barrier_xp );
@@ -213 +187 @@
 
     // get count and root fields from barrier descriptor
-    count   = hal_remote_lw ( XPTR( barrier_cxy , &barrier_ptr->nb_threads ) );
-    root_xp = hal_remote_lwd( XPTR( barrier_cxy , &barrier_ptr->root ) );
+    count   = hal_remote_l32 ( XPTR( barrier_cxy , &barrier_ptr->nb_threads ) );
+    root_xp = hal_remote_l64( XPTR( barrier_cxy , &barrier_ptr->root ) );
 
     // get barrier sense value
-    sense = hal_remote_lw( XPTR( barrier_cxy , &barrier_ptr->sense ) );
+    sense = hal_remote_l32( XPTR( barrier_cxy , &barrier_ptr->sense ) );
 
     // compute expected value
@@ -231 +205 @@
     if( current == (count-1) )                       // last thread
     {
-        hal_remote_sw( XPTR( barrier_cxy , &barrier_ptr->current) , 0 );
-        hal_remote_sw( XPTR( barrier_cxy , &barrier_ptr->sense  ) , expected );
+        hal_remote_s32( XPTR( barrier_cxy , &barrier_ptr->current) , 0 );
+        hal_remote_s32( XPTR( barrier_cxy , &barrier_ptr->sense  ) , expected );
 
         // activate waiting threads if required
@@ -248 +222 @@
 
                 // remove waiting thread from queue
-                remote_spinlock_lock( XPTR( barrier_cxy , &barrier_ptr->lock ) );
+                remote_busylock_acquire( XPTR( barrier_cxy , &barrier_ptr->lock ) );
                 xlist_unlink( XPTR( barrier_cxy , &barrier_ptr->list ) );
-                remote_spinlock_unlock( XPTR( barrier_cxy , &barrier_ptr->lock ) );
+                remote_busylock_release( XPTR( barrier_cxy , &barrier_ptr->lock ) );
 
                 // unblock waiting thread
@@ -268 +242 @@
         xptr_t entry_xp = XPTR( thread_cxy , &thread_ptr->wait_list );
 
-        remote_spinlock_lock( XPTR( barrier_cxy , &barrier_ptr->lock ) );
+        remote_busylock_acquire( XPTR( barrier_cxy , &barrier_ptr->lock ) );
         xlist_add_last( root_xp , entry_xp );
-        remote_spinlock_unlock( XPTR( barrier_cxy , &barrier_ptr->lock ) );
+        remote_busylock_release( XPTR( barrier_cxy , &barrier_ptr->lock ) );
 
         // block & deschedule the calling thread