Changeset 566 for trunk/kernel/syscalls/sys_sem.c

Timestamp:

Oct 4, 2018, 11:50:21 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

• trunk/kernel/syscalls/sys_sem.c (modified) (10 diffs)

trunk/kernel/syscalls/sys_sem.c

@@ -51 +51 @@
              uint32_t     * current_value )   // pointer on current value buffer
 {
-        vseg_t         * vseg;
+        vseg_t         * vseg;        // for vaddr check
     error_t          error;
-    uint32_t         current;     // semaphore current value
-    xptr_t           sem_xp;      // extended pointer on semaphore 
 
     thread_t       * this    = CURRENT_THREAD;
@@ -90 +88 @@
             // call relevant kernel function to initialize semaphore
             error = remote_sem_create( (intptr_t)vaddr , 
-                                       init_value,
-                                       XPTR( local_cxy , &sem_xp ) );
-
+                                       init_value );
             if ( error )
             {
@@ -103 +99 @@
                 return -1;
             }
-
-            break;
-        }
+        }
+        break;
         //////////////////
         case SEM_GETVALUE:
@@ -115 +110 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s GETVALUE: unmapped target buffer %x / thread %x in process %x / cycle %d\n",
+printk("\n[ERROR] in %s GETVALUE: unmapped buffer %x / thread %x in process %x / cycle %d\n",
 __FUNCTION__ , (intptr_t)current_value, this->trdid, process->pid, (uint32_t)hal_get_cycles() );
 vmm_display( process , false );
@@ -124 +119 @@
 
             // get extended pointer on remote semaphore
-            sem_xp = remote_sem_from_vaddr( (intptr_t)vaddr );
+            xptr_t sem_xp = remote_sem_from_ident( (intptr_t)vaddr );
 
             // check semaphore registered
@@ -139 +134 @@
 
             // call relevant kernel function to get semaphore current value
+            uint32_t current;
                     remote_sem_get_value( sem_xp , &current );
  
             // return value to user
             hal_copy_to_uspace( current_value , &current , sizeof(uint32_t) );
-
-            break;
-        }
+        }
+        break;
         //////////////
             case SEM_WAIT:
         {  
             // get extended pointer on remote semaphore
-            sem_xp = remote_sem_from_vaddr( (intptr_t)vaddr );
+            xptr_t sem_xp = remote_sem_from_ident( (intptr_t)vaddr );
 
             // check semaphore registered
@@ -167 +162 @@
             // call relevant kernel function to wait semaphore available
             remote_sem_wait( sem_xp );
-            
-            break;
-        }
+        }
+        break;
         //////////////
             case SEM_POST:
         {
             // get extended pointer on remote semaphore
-            sem_xp = remote_sem_from_vaddr( (intptr_t)vaddr );
+            xptr_t sem_xp = remote_sem_from_ident( (intptr_t)vaddr );
 
             // check semaphore registered
@@ -190 +184 @@
             // call relevant kernel function to release semaphore 
             remote_sem_post( sem_xp );
-
-                        break;
-        }
+        }
+                break;
         /////////////////
             case SEM_DESTROY:
         {
             // get extended pointer on remote semaphore
-            sem_xp = remote_sem_from_vaddr( (intptr_t)vaddr );
+            xptr_t sem_xp = remote_sem_from_ident( (intptr_t)vaddr );
 
             // check semaphore registered
@@ -213 +206 @@
             // destroy semaphore
             remote_sem_destroy( sem_xp );
-
-            break;
             }   
+        break;
         ///////
             default:  // undefined operation                       
@@ -234 +226 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_SEM < tm_end )
-{
-    cxy_t          sem_cxy = GET_CXY( sem_xp );
-    remote_sem_t * sem_ptr = GET_PTR( sem_xp );
-    uint32_t       value   = hal_remote_lw( XPTR( sem_cxy , &sem_ptr->count ) ); 
-    printk("\n[DBG] %s : thread %x in process %x exit for %s / value %d / cost = %d / cycle %d\n",
-    __FUNCTION__, this->trdid, process->pid, sys_sem_op_str( operation ), value, 
-    (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
-}
+printk("\n[DBG] %s : thread %x in process %x exit for %s / cost = %d / cycle %d\n",
+__FUNCTION__, this->trdid, process->pid, sys_sem_op_str( operation ),
+(uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif