Changeset 440 for trunk/kernel/syscalls/sys_get_config.c

Timestamp:

May 3, 2018, 5:51:22 PM (6 years ago)

Author:

alain

Message:

1/ Fix a bug in the Multithreaded "sort" applicationr:
The pthread_create() arguments must be declared as global variables.
2/ The exit syscall can be called by any thread of a process..

File:

• trunk/kernel/syscalls/sys_get_config.c (modified) (4 diffs)

trunk/kernel/syscalls/sys_get_config.c

@@ -2 +2 @@
  * sys_get_config.c - get hardware platform parameters.
  * 
- * Author    Alain Greiner (2016,2017)
+ * Author    Alain Greiner (2016,2017,2018)
  *  
  * Copyright (c) UPMC Sorbonne Universites
@@ -37 +37 @@
                     uint32_t * ncores )
 {
-    paddr_t   paddr;
-    uint32_t  k_x_size;
-    uint32_t  k_y_size;
-    uint32_t  k_ncores;
-
-        error_t   error = 0;
+        error_t    error;
+    vseg_t   * vseg;
+    uint32_t   k_x_size;
+    uint32_t   k_y_size;
+    uint32_t   k_ncores;
 
     thread_t  * this    = CURRENT_THREAD;
@@ -56 +55 @@
 #endif
 
-    // check buffer in user space
-    error |= vmm_v2p_translate( false , x_size  , &paddr );
-    error |= vmm_v2p_translate( false , y_size  , &paddr );
-    error |= vmm_v2p_translate( false , ncores  , &paddr );
+    // check x_size buffer in user space
+    error = vmm_get_vseg( process , (intptr_t)x_size  , &vseg );
 
         if( error )
@@ -65 +62 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : user buffer unmapped for thread %x in process %x\n",
-__FUNCTION__ , this->trdid , process->pid );
+printk("\n[ERROR] in %s : x_size buffer unmapped / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)x_size , this->trdid , process->pid );
+vmm_display( process , false );
 #endif
-        this->errno = EFAULT;
+        this->errno = EINVAL;
+                return -1;
+        }
+
+    // check y_size buffer in user space
+    error = vmm_get_vseg( process , (intptr_t)y_size  , &vseg );
+
+        if( error )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : y_size buffer unmapped / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)y_size , this->trdid , process->pid );
+vmm_display( process , false );
+#endif
+        this->errno = EINVAL;
+                return -1;
+        }
+
+    // check ncores buffer in user space
+    error = vmm_get_vseg( process , (intptr_t)ncores  , &vseg );
+
+        if( error )
+        {
+
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[ERROR] in %s : ncores buffer unmapped / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)ncores , this->trdid , process->pid );
+vmm_display( process , false );
+#endif
+        this->errno = EINVAL;
                 return -1;
         }