Changeset 563 for trunk/kernel/libk/remote_fifo.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_fifo.c (modified) (10 diffs)

trunk/kernel/libk/remote_fifo.c

@@ -34 +34 @@
 #include <remote_fifo.h>
 
-////////////////////////////////////////////
-void local_fifo_init( remote_fifo_t * fifo )
+/////////////////////////////////////////////
+void remote_fifo_init( remote_fifo_t * fifo )
 {
     uint32_t  slot;
@@ -59 +59 @@
 
     // get remote cluster identifier and pointer on FIFO
-    cxy_t           fifo_cxy = (cxy_t)GET_CXY( fifo_xp );
-    remote_fifo_t * fifo_ptr = (remote_fifo_t *)GET_PTR( fifo_xp );
+    cxy_t           fifo_cxy = GET_CXY( fifo_xp );
+    remote_fifo_t * fifo_ptr = GET_PTR( fifo_xp );
 
     // initialise watchdog for contention detection
@@ -77 +77 @@
 
         // read remote rd_id value
-        rd_id = hal_remote_lw( XPTR( fifo_cxy , &fifo_ptr->rd_id ) );
+        rd_id = hal_remote_l32( XPTR( fifo_cxy , &fifo_ptr->rd_id ) );
 
         // compute number of full slots
@@ -89 +89 @@
         // - deschedule without blocking if possible
         // - wait ~1000 cycles otherwise
-        if( thread_can_yield() ) sched_yield( "wait RPC fifo" );
-        else                     hal_fixed_delay( 1000 );
+        if( CURRENT_THREAD->busylocks == 0 ) sched_yield( "wait RPC fifo" );
+        else                                 hal_fixed_delay( 1000 );
 
         // increment watchdog
@@ -100 +100 @@
 
     // copy item to fifo
-        hal_remote_swd( XPTR( fifo_cxy , &fifo_ptr->data[ptw] ), item );
+        hal_remote_s64( XPTR( fifo_cxy , &fifo_ptr->data[ptw] ), item );
         hal_fence();
 
     // set the slot valid flag
-        hal_remote_sw( XPTR( fifo_cxy , &fifo_ptr->valid[ptw] ) , 1 );
+        hal_remote_s32( XPTR( fifo_cxy , &fifo_ptr->valid[ptw] ) , 1 );
         hal_fence();
 
@@ -111 +111 @@
 } // end remote_fifo_put_item()
 
-//////////////////////////////////////////////////
-error_t local_fifo_get_item( remote_fifo_t * fifo,
-                             uint64_t      * item )
+///////////////////////////////////////////////////
+error_t remote_fifo_get_item( remote_fifo_t * fifo,
+                              uint64_t      * item )
 {
     // get fifo state
@@ -138 +138 @@
 
         return 0;
-} // end local_fifo_get_item()
+
+} // end remote_fifo_get_item()
 
 /////////////////////////////////////////
@@ -146 +147 @@
 
     // get remote cluster identifier and pointer on FIFO
-    cxy_t           cxy = (cxy_t)GET_CXY( fifo );
-    remote_fifo_t * ptr = (remote_fifo_t *)GET_PTR( fifo );
+    cxy_t           cxy = GET_CXY( fifo );
+    remote_fifo_t * ptr = GET_PTR( fifo );
    
     // get read and write pointers
-        uint32_t wr_id = hal_remote_lw( XPTR( cxy , &ptr->wr_id ) );
-        uint32_t rd_id = hal_remote_lw( XPTR( cxy , &ptr->rd_id ) );
+        uint32_t wr_id = hal_remote_l32( XPTR( cxy , &ptr->wr_id ) );
+        uint32_t rd_id = hal_remote_l32( XPTR( cxy , &ptr->rd_id ) );
 
     // compute number of full slots
@@ -160 +161 @@
 }
 
-//////////////////////////////////////////////////
-bool_t local_fifo_is_empty( remote_fifo_t * fifo )
+///////////////////////////////////////////////////
+bool_t remote_fifo_is_empty( remote_fifo_t * fifo )
 {
     return ( fifo->wr_id == fifo->rd_id );
@@ -172 +173 @@
 
     // get remote cluster identifier and pointer on FIFO
-    cxy_t           cxy = (cxy_t)GET_CXY( fifo );
-    remote_fifo_t * ptr = (remote_fifo_t *)GET_PTR( fifo );
+    cxy_t           cxy = GET_CXY( fifo );
+    remote_fifo_t * ptr = GET_PTR( fifo );
    
     // get read and write pointers
-        uint32_t wr_id = hal_remote_lw( XPTR( cxy , &ptr->wr_id ) );
-        uint32_t rd_id = hal_remote_lw( XPTR( cxy , &ptr->rd_id ) );
+        uint32_t wr_id = hal_remote_l32( XPTR( cxy , &ptr->wr_id ) );
+        uint32_t rd_id = hal_remote_l32( XPTR( cxy , &ptr->rd_id ) );
 
     // compute number of full slots