Changeset 440 for trunk/kernel/syscalls/sys_mmap.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_mmap.c (modified) (12 diffs)

trunk/kernel/syscalls/sys_mmap.c

@@ -3 +3 @@
  * 
  * Authors       Ghassan Almaless (2008,2009,2010,2011,2012)
- *               Alain Greiner (2016,2017)
+ *               Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -44 +44 @@
     xptr_t        mapper_xp;
     error_t       error;
-    paddr_t       paddr;        // unused, but required for user space checking
     reg_t         save_sr;      // required to enable IRQs
 
@@ -60 +59 @@
 
     // check arguments in user space
-    error = vmm_v2p_translate( false , attr , &paddr );
+    error = vmm_get_vseg( process , (intptr_t)attr , &vseg );
 
     if ( error )
@@ -66 +65 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : arguments not in used space = %x\n", __FUNCTION__ , (intptr_t)attr );
+printk("\n[ERROR] in %s : user buffer unmapped %x / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)attr , this->trdid , process->pid );
+vmm_display( process , false );
 #endif
                 this->errno = EINVAL;
@@ -92 +93 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : MAP_FIXED not supported\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : MAP_FIXED not supported / thread %x / process %x\n",
+__FUNCTION__ , this->trdid , process->pid );
 #endif
         this->errno = EINVAL;
@@ -102 +104 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : MAP_SHARED xor MAP_PRIVATE\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : MAP_SHARED == MAP_PRIVATE / thread %x / process %x\n",
+__FUNCTION__ , this->trdid , process->pid );
 #endif
         this->errno = EINVAL;
@@ -124 +127 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s: bad file descriptor = %d\n", __FUNCTION__ , fdid );
+printk("\n[ERROR] in %s: bad file descriptor %d / thread %x / process %x\n",
+__FUNCTION__ , fdid , this->trdid , process->pid );
 #endif
             this->errno = EBADFD;
@@ -137 +141 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s: file %d not found\n", __FUNCTION__ , fdid );
+printk("\n[ERROR] in %s: file %d not found / thread %x / process %x\n",
+__FUNCTION__ , fdid , this->trdid , process->pid );
 #endif
             this->errno = EBADFD;
@@ -160 +165 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s: offset (%d) + len (%d) >= file's size (%d)\n", 
-__FUNCTION__, k_attr.offset, k_attr.length, size );
+printk("\n[ERROR] in %s: offset(%d) + len(%d) >= file's size(%d) / thread %x / process %x\n", 
+__FUNCTION__, k_attr.offset, k_attr.length, size, this->trdid, process->pid );
 #endif
             this->errno = ERANGE;
@@ -173 +178 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s: prot = %x / file_attr = %x)\n", 
-__FUNCTION__ , k_attr.prot , file_attr );
+printk("\n[ERROR] in %s: prot = %x / file_attr = %x / thread %x , process %x\n", 
+__FUNCTION__ , k_attr.prot , file_attr , this->trdid , process->pid );
 #endif
                         this->errno = EACCES;
@@ -206 +211 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : illegal cxy for MAP_REMOTE\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : illegal cxy for MAP_REMOTE / thread %x / process %x\n",
+__FUNCTION__, this->trdid , process->pid );
 #endif
                 this->errno = EINVAL;
@@ -255 +261 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot create vseg\n", __FUNCTION__ );
+printk("\n[ERROR] in %s : cannot create vseg / thread %x / process %x\n",
+__FUNCTION__, this->trdid , process->pid );
 #endif
         this->errno = ENOMEM;