Changeset 440 for trunk/kernel/syscalls/sys_write.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_write.c (modified) (5 diffs)

trunk/kernel/syscalls/sys_write.c

@@ -2 +2 @@
  * sys_write.c - write bytes to a file
  * 
- * Author        Alain Greiner (2016,2017)
+ * Author        Alain Greiner (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -35 +35 @@
 /* TODO: concurrent user page(s) unmap need to be handled [AG] */
 
+extern uint32_t enter_sys_write;
+extern uint32_t enter_devfs_write;
+extern uint32_t enter_txt_write;
+extern uint32_t enter_chdev_cmd_write;
+extern uint32_t enter_chdev_server_write;
+extern uint32_t enter_tty_cmd_write;
+extern uint32_t enter_tty_isr_write;
+extern uint32_t exit_tty_isr_write;
+extern uint32_t exit_tty_cmd_write;
+extern uint32_t exit_chdev_server_write;
+extern uint32_t exit_chdev_cmd_write;
+extern uint32_t exit_txt_write;
+extern uint32_t exit_devfs_write;
+extern uint32_t exit_sys_write;
+
 //////////////////////////////////
 int sys_write( uint32_t   file_id,
@@ -41 +56 @@
 {
     error_t      error;
-    paddr_t      paddr;           // required for user space checking
+    vseg_t     * vseg;            // required for user space checking
         xptr_t       file_xp;         // remote file extended pointer
     uint32_t     nbytes;          // number of bytes actually written
     reg_t        save_sr;         // required to enable IRQs during syscall
 
-#if (DEBUG_SYS_WRITE_DEBUG & 1)
-enter_sys_read = (uint32_t)tm_start;
+#if (DEBUG_SYS_WRITE & 1)
+enter_sys_write = (uint32_t)tm_start;
 #endif
 
@@ -74 +89 @@
 
     // check user buffer in user space
-    error = vmm_v2p_translate( false , vaddr , &paddr );
+    error = vmm_get_vseg( process , (intptr_t)vaddr , &vseg );
 
     if ( error )
@@ -80 +95 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : user buffer unmapped = %x\n", __FUNCTION__ , (intptr_t)vaddr );
+printk("\n[ERROR] in %s : user buffer unmapped %x / thread %x / process %x\n",
+__FUNCTION__ , (intptr_t)vaddr, this->trdid, process->pid );
+vmm_display( process , false );
 #endif
                 this->errno = EINVAL;