Changeset 637 for trunk/kernel/syscalls/sys_mmap.c

Timestamp:

Jul 18, 2019, 2:06:55 PM (5 years ago)

Author:

alain

Message:

Introduce the non-standard pthread_parallel_create() system call
and re-write the <fft> and <sort> applications to improve the
intrinsic paralelism in applications.

File:

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

trunk/kernel/syscalls/sys_mmap.c

@@ -41 +41 @@
 {
     vseg_t      * vseg;
-    cxy_t         vseg_cxy;
-    vseg_type_t   vseg_type;
+    cxy_t         vseg_cxy;     // target cluster for the vseg
+    vseg_type_t   vseg_type;    // vseg type
     mmap_attr_t   k_attr;       // attributes copy in kernel space
     xptr_t        mapper_xp;
-    error_t       error;
     reg_t         save_sr;      // required to enable IRQs
 
@@ -62 +61 @@
 
     // check user buffer (containing attributes) is mapped 
-    error = vmm_get_vseg( process , (intptr_t)attr , &vseg );
-
-    if( error )
+    if( vmm_get_vseg( process , (intptr_t)attr , &vseg ) )
     {
 
@@ -76 +73 @@
 
     // copy attributes from user space to kernel space
-    hal_copy_from_uspace( local_cxy,
-                          &k_attr,
+    hal_copy_from_uspace( XPTR( local_cxy , &k_attr ),
                           attr,
                           sizeof(mmap_attr_t) );
@@ -119 +115 @@
 
     // test mmap type : can be FILE / ANON / REMOTE
+    // to define vseg_type & vseg_cxy
 
     /////////////////////////////////////////////////////////// MAP_FILE
@@ -126 +123 @@
 #if (DEBUG_SYS_MMAP & 1)
 if ( DEBUG_SYS_MMAP < tm_start )
-printk("\n[%s] thread[%x,%x] map file : fdid %d / offset %d / %d bytes\n",
+printk("\n[%s] thread[%x,%x] type file : fdid %d / offset %x / %x bytes\n",
 __FUNCTION__, process->pid, this->trdid, fdid, offset, length );
 #endif
 
-            // FIXME: handle concurent delete of file by another thread closing it 
+            // FIXME: handle concurent delete of file by another thread 
 
                 if( fdid >= CONFIG_PROCESS_FILE_MAX_NR ) 
@@ -228 +225 @@
 #if (DEBUG_SYS_MMAP & 1)
 if ( DEBUG_SYS_MMAP < tm_start )
-printk("\n[%s] thread[%x,%x] map anon / %d bytes / cluster %x\n",
+printk("\n[%s] thread[%x,%x] type anon / %x bytes / cluster %x\n",
 __FUNCTION__, process->pid, this->trdid, length, vseg_cxy );
 #endif
@@ -242 +239 @@
 #if (DEBUG_SYS_MMAP & 1)
 if ( DEBUG_SYS_MMAP < tm_start )
-printk("\n[%s] thread[%x,%x] map remote / %d bytes / cluster %x\n",
+printk("\n[%s] thread[%x,%x] type remote / %x bytes / target cluster %x\n",
 __FUNCTION__, process->pid, this->trdid, length, vseg_cxy );
 #endif
  
-        if( cluster_is_undefined( vseg_cxy ) )
+        if( cluster_is_active( vseg_cxy ) == false )
         {
 
@@ -266 +263 @@
     process_t * ref_ptr = GET_PTR( ref_xp );
 
-    // create the vseg in reference cluster
+    // register vseg in reference VSL
     if( local_cxy == ref_cxy )
     {
@@ -306 +303 @@
     }
 
-    // copy vseg base address to user space
-    hal_copy_to_uspace( local_cxy,
-                        &vseg->min,
-                        &attr->addr,
+    // copy vseg base address to user space mmap_attr_t
+    hal_copy_to_uspace( &attr->addr,
+                        XPTR( ref_cxy , &vseg->min ),
                         sizeof(intptr_t) );
     hal_fence();
@@ -324 +320 @@
 #if DEBUG_SYS_MMAP
 if ( DEBUG_SYS_MMAP < tm_end )
-printk("\n[%s] thread[%x,%x] exit / %s / cxy %x / base %x / size %d / cycle %d\n",
+printk("\n[%s] thread[%x,%x] exit / %s / cxy %x / base %x / size %x / cycle %d\n",
 __FUNCTION__, process->pid, this->trdid,
 vseg_type_str(vseg->type), vseg->cxy, vseg->min, length, (uint32_t)tm_end );