Changeset 619 for trunk/kernel/syscalls/sys_barrier.c

Timestamp:

Feb 12, 2019, 1:15:47 PM (6 years ago)

Author:

alain

Message:

1) Fix a bug in KSH : after the "load" command,

the [ksh] prompt is now printed after completion
of the loaded application.

2) Fix a bug in vmm_handle_cow() : the copy-on-write

use now a hal_remote_memcpy() to replicate the page content.

File:

• trunk/kernel/syscalls/sys_barrier.c (modified) (11 diffs)

trunk/kernel/syscalls/sys_barrier.c

@@ -24 +24 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
+#include <hal_uspace.h>
 #include <errno.h>
 #include <thread.h>
@@ -43 +44 @@
 
 //////////////////////////////////
-int sys_barrier( void     * vaddr,
+int sys_barrier( intptr_t   vaddr,
                  uint32_t   operation,
-                 uint32_t   count )
+                 uint32_t   count,
+                 intptr_t   attr )   
 {
-        error_t      error;
-    vseg_t     * vseg;
-  
-    thread_t   * this    = CURRENT_THREAD;
-    process_t  * process = this->process;
+        error_t                 error;
+    vseg_t                * vseg;
+    pthread_barrierattr_t   k_attr;
+
+    thread_t  * this    = CURRENT_THREAD;
+    process_t * process = this->process;
 
 #if DEBUG_SYS_BARRIER
@@ -58 +61 @@
 tm_start = hal_get_cycles();
 if( DEBUG_SYS_BARRIER < tm_start )
-printk("\n[DBG] %s : thread %x in process %x enter for %s / count %d / cycle %d\n",
-__FUNCTION__, this->trdid, process->pid, sys_barrier_op_str(operation), count,
+printk("\n[%s] thread[%x,%x] enters for %s / count %d / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, sys_barrier_op_str(operation), count,
 (uint32_t)tm_start );
 #endif
 
     // check vaddr in user vspace
-        error = vmm_get_vseg( process , (intptr_t)vaddr , &vseg );
-
+        error = vmm_get_vseg( process , vaddr , &vseg );
         if( error )
     {
@@ -71 +73 @@
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : unmapped barrier %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)vaddr , this->trdid , process->pid );
+__FUNCTION__ , vaddr , this->trdid , process->pid );
 vmm_display( process , false );
 #endif
@@ -84 +86 @@
             case BARRIER_INIT:
         {
-            error = remote_barrier_create( (intptr_t)vaddr , count );
-    
+            if( attr != 0 )   // QDT barrier required
+            {
+                error = vmm_get_vseg( process , attr , &vseg );
+                if( error )
+                {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : unmapped barrier attributes %x / thread %x / process %x\n",
+__FUNCTION__ , attr , this->trdid , process->pid );
+vmm_display( process , false );
+#endif
+                    this->errno = EINVAL;
+                    return -1;
+                }
+  
+                // copy barrier attributes into kernel space
+                hal_copy_from_uspace( &k_attr , (void*)attr , sizeof(pthread_barrierattr_t) );
+
+                if ( count != k_attr.x_size * k_attr.y_size *k_attr.nthreads )  
+                {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : wrong arguments / count %d / x_size %d / y_size %d / nthreads %x\n",
+__FUNCTION__, count, k_attr.x_size, k_attr.y_size, k_attr.nthreads );
+#endif
+                    this->errno = EINVAL;
+                    return -1;
+                }
+  
+
+                // call relevant system function
+                error = generic_barrier_create( vaddr , count , &k_attr );
+            }
+            else               // simple barrier required
+            {
+                error = generic_barrier_create( vaddr , count , NULL );
+            }
+
                     if( error )
             {
@@ -91 +129 @@
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : cannot create barrier %x / thread %x / process %x\n",
-__FUNCTION__ , (intptr_t)vaddr , this->trdid , process->pid );
+__FUNCTION__ , vaddr , this->trdid , process->pid );
 #endif
-                this->errno = error;
+                this->errno = ENOMEM;
                 return -1;
             }
@@ -101 +139 @@
             case BARRIER_WAIT:
         {
-            xptr_t barrier_xp = remote_barrier_from_ident( (intptr_t)vaddr );
+            xptr_t barrier_xp = generic_barrier_from_ident( vaddr );
 
             if( barrier_xp == XPTR_NULL )     // user error
@@ -115 +153 @@
             else                          // success
             {
-                remote_barrier_wait( barrier_xp ); 
+                generic_barrier_wait( barrier_xp ); 
             }
             break;
@@ -122 +160 @@
             case BARRIER_DESTROY:
         {
-            xptr_t barrier_xp = remote_barrier_from_ident( (intptr_t)vaddr );
+            xptr_t barrier_xp = generic_barrier_from_ident( vaddr );
 
             if( barrier_xp == XPTR_NULL )     // user error
@@ -136 +174 @@
             else                          // success
             {
-                remote_barrier_destroy( barrier_xp ); 
+                generic_barrier_destroy( barrier_xp ); 
             }
             break;
@@ -149 +187 @@
 tm_end = hal_get_cycles();
 if( DEBUG_SYS_BARRIER < 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_barrier_op_str(operation), 
+printk("\n[%s] thread[%x,%x] exit for %s / cost %d / cycle %d\n",
+__FUNCTION__, process->pid, this->trdid, sys_barrier_op_str(operation), 
 (uint32_t)(tm_end - tm_start), (uint32_t)tm_end );
 #endif