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

Timestamp:

Jun 18, 2017, 10:06:41 PM (7 years ago)

Author:

alain

Message:

Introduce syscalls.

File:

• trunk/kernel/libk/remote_sem.c (moved) (moved from trunk/kernel/kern/remote_sem.c) (12 diffs)

trunk/kernel/libk/remote_sem.c

@@ -23 +23 @@
 
 #include <hal_types.h>
+#include <hal_remote.h>
 #include <thread.h>
 #include <kmem.h>
@@ -35 +36 @@
 {
     // get pointer on local process_descriptor
-    process_t * process = CURRENT_PROCESS;
+    process_t * process = CURRENT_THREAD->process;
 
     // get extended pointer on reference process
@@ -57 +58 @@
     XLIST_FOREACH( root_xp , iter_xp )
     {
-        sem_xp  = XLIST_ELEMENT( iter_xp , remote_sem_t , sem_list );
+        sem_xp  = XLIST_ELEMENT( iter_xp , remote_sem_t , list );
         sem_cxy = GET_CXY( sem_xp );
         sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
-        ident   = hal_remote_lw( XPTR( sem_cxy , &sem_ptr->ident ) );   
+        ident   = (intptr_t)hal_remote_lpt( XPTR( sem_cxy , &sem_ptr->ident ) );   
         if( ident == vaddr )
         {
@@ -73 +74 @@
 }  // end remote_sem_from_vaddr()
 
-/////////////////////////////////////////
-error_t remote_sem_init( intptr_t  vaddr,
-                         uint32_t  value )
+///////////////////////////////////////////
+error_t remote_sem_create( intptr_t  vaddr,
+                           uint32_t  value )
 {
     xptr_t         sem_xp;
@@ -81 +82 @@
 
     // get pointer on local process descriptor
-    process_t * process = CURRENT_PROCESS;
+    process_t * process = CURRENT_THREAD->process;
 
     // get extended pointer on reference process
     xptr_t      ref_xp = process->ref_xp;
 
+    // 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 );
@@ -100 +102 @@
     else                         // reference is remote
     {
-        rpc_semaphore_alloc_client( ref_cxy , &sem_xp );
+        rpc_kcm_alloc_client( ref_cxy , KMEM_SEM , &sem_xp );
         sem_ptr = (remote_sem_t *)GET_PTR( sem_xp );
     }
@@ -106 +108 @@
     if( sem_xp == XPTR_NULL ) return ENOMEM;
 
-    // initialise semaphore lock
+    // 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 ) );
-
-    // initialise semaphore count
-    hal_remote_sw( XPTR( ref_cxy , &sem_ptr->count ) , value );
-
-    // initialise vaddr
-        hal_remote_spt( XPTR( ref_cxy , &sem_ptr->ident ) , (void *)vaddr );
-
-    // initialise waiting threads queue
-        xlist_root_init( XPTR( ref_cxy , &sem_ptr->wait_queue ) );
-
-    // register new semaphore in reference process xlist
+        xlist_root_init( XPTR( ref_cxy , &sem_ptr->root ) );
+        xlist_entry_init( XPTR( ref_cxy , &sem_ptr->list ) );
+
+    // register semaphore in reference process xlist
     xptr_t root_xp = XPTR( ref_cxy , &ref_ptr->sem_root );
-    xptr_t xp_list = XPTR( ref_cxy , &sem_ptr->sem_list );
+    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 ) );
 
     return 0;
@@ -127 +128 @@
 }  // en remote_sem_init()
  
+////////////////////////////////////////
+void remote_sem_destroy( xptr_t sem_xp )
+{
+    // get pointer on local process descriptor
+    process_t * process = CURRENT_THREAD->process;
+
+    // get extended pointer on reference process
+    xptr_t      ref_xp = process->ref_xp;
+
+    // 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 );
+
+    // 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 );
+
+    // get lock protecting semaphore
+    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 ) );
+  
+    if( !xlist_is_empty( root_xp ) )   // user error
+    {
+        printk("WARNING in %s for thread %x in process %x : "
+               "destroy semaphore, but  waiting threads queue not empty\n", 
+               __FUNCTION__ , CURRENT_THREAD->trdid , CURRENT_THREAD->process->pid );
+    }
+
+    // reset semaphore count
+    hal_remote_sw( XPTR( sem_cxy , &sem_ptr->count ) , 0 );
+
+    // remove semaphore from reference process xlist
+    remote_spinlock_lock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+    xlist_unlink( XPTR( sem_cxy , &sem_ptr->list ) );
+    remote_spinlock_unlock( XPTR( ref_cxy , &ref_ptr->sync_lock ) );
+
+    // release lock
+    remote_spinlock_unlock( XPTR( sem_cxy , &sem_ptr->lock ) );
+
+    // release memory allocated for semaphore descriptor
+    if( sem_cxy == local_cxy )                            // reference is local
+    {
+        kmem_req_t  req;
+        req.type = KMEM_SEM;
+        req.ptr  = sem_ptr;
+        kmem_free( &req );
+    }
+    else                                                  // reference is remote
+    {
+        rpc_kcm_free_client( sem_cxy , sem_ptr , KMEM_SEM );
+    }
+
+}  // end remote_sem_destroy()
+
 //////////////////////////////////
 void remote_sem_wait( xptr_t sem_xp )
@@ -153 +210 @@
 
         // register thread in waiting queue
-        xptr_t root_xp   = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->wait_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 );
@@ -177 +234 @@
   
     // get remote pointer on waiting queue root
-    xptr_t queue_xp = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->wait_queue ) );
-  
-        if( xlist_is_empty( queue_xp ) )   // no waiting thread
+    xptr_t root_xp = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->root ) );
+  
+        if( xlist_is_empty( root_xp ) )   // no waiting thread
     {
         // get semaphore current value
@@ -190 +247 @@
     {
         // get first waiting thread from queue
-        xptr_t thread_xp = XLIST_FIRST_ELEMENT( queue_xp , thread_t , wait_list );
+        xptr_t thread_xp = XLIST_FIRST_ELEMENT( root_xp , thread_t , wait_list );
 
         // get thread cluster and local poiner
@@ -206 +263 @@
 }  // end remote_sem_post()
 
-////////////////////////////////////////
-void remote_sem_destroy( 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 );
-
-    // get lock protecting semaphore
-    remote_spinlock_lock( XPTR( sem_cxy , &sem_ptr->lock ) );
-  
-    // get remote pointer on waiting queue 
-    xptr_t queue_xp = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->wait_queue ) );
-  
-    if( !xlist_is_empty( queue_xp ) )   // user error
-    {
-        printk("WARNING in %s for thread %x in process %x : "
-               "destroy semaphore, but  waiting threads queue not empty\n", 
-               __FUNCTION__ , CURRENT_THREAD->trdid , CURRENT_PROCESS->pid );
-    }
-
-    // reset semaphore count
-    hal_remote_sw( XPTR( sem_cxy , &sem_ptr->count ) , 0 );
-
-    // remove semaphore from process
-    xptr_t xp_list = (xptr_t)hal_remote_lwd( XPTR( sem_cxy , &sem_ptr->sem_list ) );
-    xlist_unlink( xp_list );
-
-    // release lock
-    remote_spinlock_unlock( XPTR( sem_cxy , &sem_ptr->lock ) );
-
-    // release memory allocated
-    if( sem_cxy == local_cxy )         // reference is local
-    {
-        kmem_req_t  req;
-        req.type = KMEM_SEM;
-        req.ptr  = sem_ptr;
-        kmem_free( &req );
-    }
-    else                                // reference is remote
-    {
-        rpc_semaphore_free_client( sem_cxy , sem_ptr );
-    }
-
-}  // end remote_sem_destroy()
 
 //////////////////////////////////////////////