Changeset 457 for trunk/kernel/libk/remote_sem.c

Timestamp:

Aug 2, 2018, 11:47:13 AM (6 years ago)

Author:

alain

Message:

This version modifies the exec syscall and fixes a large number of small bugs.
The version number has been updated (0.1)

File:

• trunk/kernel/libk/remote_sem.c (modified) (11 diffs)

trunk/kernel/libk/remote_sem.c

@@ -22 +22 @@
  */
 
-#include <hal_types.h>
+#include <hal_kernel_types.h>
 #include <hal_remote.h>
 #include <thread.h>
@@ -75 +75 @@
 
 ///////////////////////////////////////////
-error_t remote_sem_create( intptr_t  vaddr,
-                           uint32_t  value )
-{
+error_t remote_sem_create( intptr_t   vaddr,
+                           uint32_t   value,
+                           xptr_t     sem_xp_xp )
+{
+    remote_sem_t * sem_ptr;
     xptr_t         sem_xp;
-    remote_sem_t * sem_ptr;
 
     // get pointer on local process descriptor
@@ -103 +104 @@
     {
         rpc_kcm_alloc_client( ref_cxy , KMEM_SEM , &sem_xp );
-        sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
-    }
-
-    if( sem_xp == XPTR_NULL ) return ENOMEM;
+        sem_ptr = GET_PTR( sem_xp );
+    }
+
+    if( sem_xp == XPTR_NULL ) return -1;
 
     // initialise semaphore 
     hal_remote_sw ( XPTR( ref_cxy , &sem_ptr->count ) , value );
         hal_remote_spt( XPTR( ref_cxy , &sem_ptr->ident ) , (void *)vaddr );
-
     remote_spinlock_init( XPTR( ref_cxy , &sem_ptr->lock ) );
         xlist_root_init( XPTR( ref_cxy , &sem_ptr->root ) );
@@ -119 +119 @@
     xptr_t root_xp = XPTR( ref_cxy , &ref_ptr->sem_root );
     xptr_t xp_list = XPTR( ref_cxy , &sem_ptr->list );
-
     remote_spinlock_lock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
     xlist_add_first( root_xp , xp_list );
     remote_spinlock_unlock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
 
+    // write extended pointer on semaphore in calling thread buffer
+    hal_remote_swd( sem_xp_xp , sem_xp );
+
     return 0;
 
-}  // en remote_sem_init()
+}  // en remote_sem_create()
  
 ////////////////////////////////////////
@@ -139 +141 @@
     // 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 );
 
     // get semaphore cluster and local pointer
@@ -148 +150 @@
     remote_spinlock_lock( XPTR( sem_cxy , &sem_ptr->lock ) );
   
-    // get remote pointer on waiting queue 
-    xptr_t root_xp = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->root ) );
+    // get remote pointer on waiting queue root
+    xptr_t root_xp = XPTR( sem_cxy , &sem_ptr->root );
   
     if( !xlist_is_empty( root_xp ) )   // user error
@@ -184 +186 @@
 }  // end remote_sem_destroy()
 
-//////////////////////////////////
+/////////////////////////////////////
 void remote_sem_wait( xptr_t sem_xp )
 { 
     // get semaphore cluster and local pointer
     cxy_t          sem_cxy = GET_CXY( sem_xp );
-    remote_sem_t * sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
+    remote_sem_t * sem_ptr = GET_PTR( sem_xp );
 
     // get lock protecting semaphore     
@@ -210 +212 @@
 
         // register thread in waiting queue
-        xptr_t root_xp   = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->root ) );
-        xptr_t thread_xp = XPTR( local_cxy , this );
-                xlist_add_last( root_xp , thread_xp );
+        xptr_t root_xp = XPTR( sem_cxy   , &sem_ptr->root );
+        xptr_t list_xp = XPTR( local_cxy , &this->wait_list );
+                xlist_add_last( root_xp , list_xp );
 
         // release lock
@@ -228 +230 @@
     // get semaphore cluster and local pointer
     cxy_t          sem_cxy = GET_CXY( sem_xp );
-    remote_sem_t * sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
+    remote_sem_t * sem_ptr = GET_PTR( sem_xp );
 
     // get lock protecting semaphore
         remote_spinlock_lock( XPTR( sem_cxy , &sem_ptr->lock ) );
   
+    // get semaphore current value
+    uint32_t count = hal_remote_lw( XPTR( sem_cxy , &sem_ptr->count ) );
+
     // get remote pointer on waiting queue root
-    xptr_t root_xp = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->root ) );
+    xptr_t root_xp = XPTR( sem_cxy , &sem_ptr->root );
   
         if( xlist_is_empty( root_xp ) )   // no waiting thread
     {
-        // get semaphore current value
-        uint32_t count = hal_remote_lw( XPTR( sem_cxy , &sem_ptr->count ) );
-
         // increment semaphore value
         hal_remote_sw( XPTR( sem_cxy , &sem_ptr->count ) , count + 1 );
@@ -251 +253 @@
         // get thread cluster and local poiner
         cxy_t      thread_cxy = GET_CXY( thread_xp );
-        thread_t * thread_ptr = (thread_t *)GET_PTR( thread_xp );
-
-        // remove the thread from the waiting queue, and unblock
+        thread_t * thread_ptr = GET_PTR( thread_xp );
+
+        // remove this thread from the waiting queue, and unblock it
         xlist_unlink( XPTR( thread_cxy , &thread_ptr->wait_list ) );
                 thread_unblock( thread_xp , THREAD_BLOCKED_SEM );
@@ -270 +272 @@
     // get semaphore cluster and local pointer
     cxy_t          sem_cxy = GET_CXY( sem_xp );
-    remote_sem_t * sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
+    remote_sem_t * sem_ptr = GET_PTR( sem_xp );
 
     *data = hal_remote_lw( XPTR( sem_cxy , &sem_ptr->count ) );