Changeset 670 for trunk/kernel/syscalls/sys_write.c

Timestamp:

Nov 19, 2020, 11:45:52 PM (3 years ago)

Author:

alain

Message:

1) Introduce up to 4 command lines arguments in the KSH "load" command.
These arguments are transfered to the user process through the
argc/argv mechanism, using the user space "args" vseg.

2) Introduce the named and anonymous "pipes", for inter-process communication
through the pipe() and mkfifo() syscalls.

3) Introduce the "chat" application to validate the two above mechanisms.

4) Improve printk() and assert() fonctions in printk.c.

File:

• trunk/kernel/syscalls/sys_write.c (modified) (9 diffs)

trunk/kernel/syscalls/sys_write.c

@@ -2 +2 @@
  * sys_write.c - Kernel function implementing the "write" system call.
  * 
- * Author        Alain Greiner (2016,2017,2018,2019)
+ * Author        Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -33 +33 @@
 #include <thread.h>
 #include <printk.h>
+#include <pipe.h>
 #include <process.h>
 
@@ -71 +72 @@
         process_t   * process = this->process;
 
-#if (DEBUG_SYS_WRITE || CONFIG_INSTRUMENTATION_SYSCALLS)
+#if DEBUG_SYS_WRITE || DEBUG_SYSCALLS_ERROR || CONFIG_INSTRUMENTATION_SYSCALLS
 uint64_t     tm_start = hal_get_cycles();
 #endif
@@ -91 +92 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] illegal file descriptor index %d\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / illegal file descriptor index %d\n",
 __FUNCTION__, process->pid, this->trdid, file_id );
 #endif
@@ -105 +107 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] user buffer unmapped %x\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / user buffer unmapped %x\n",
 __FUNCTION__ , process->pid, this->trdid, (intptr_t)vaddr );
 #endif
@@ -119 +122 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] undefined file descriptor = %d\n",
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / undefined file descriptor = %d\n",
 __FUNCTION__, process->pid, this->trdid, file_id );
 #endif
@@ -139 +143 @@
     hal_enable_irq( &save_sr );
 
-    // action depend on file type:
-
-    if( file_type == INODE_TYPE_FILE )  // write to a file mapper 
-    {
-        // check file writable
-        if( (file_attr & FD_ATTR_WRITE_ENABLE) == 0 )
-            {
-
-#if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : thread[%x,%x] file %d not writable\n",
+    // check file writable
+    if( (file_attr & FD_ATTR_WRITE_ENABLE) == 0 )
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / file %d not writable\n",
 __FUNCTION__ , process->pid, this->trdid, file_id );
 #endif
@@ -154 +155 @@
                     this->errno = EBADFD;
                     return -1;
-            }
-
+    }
+
+    // action depend on file type:
+    if( file_type == FILE_TYPE_REG )                         // write to mapper 
+    {
         // move count bytes to mapper
-        nbytes = vfs_user_move( false,               // from buffer to mapper
+        nbytes = vfs_user_move( false,    // to mapper
                                 file_xp,
                                 vaddr, 
                                 count );
     }
-    else if( file_type == INODE_TYPE_DEV )  // write to TXT device
+    else if( file_type == FILE_TYPE_DEV )                     // write to TXT device
     {
         // move count bytes to device
-        nbytes = devfs_user_move( false,             // from buffer to device
+        nbytes = devfs_user_move( false,  // to device
                                   file_xp,
                                   vaddr,
                                   count );
     }
-    else  // not FILE and not DEV
-    {
-
-#if DEBUG_SYSCALLS_ERROR
+    else if( (file_type == FILE_TYPE_PIPE) ||
+             (file_type == FILE_TYPE_FIFO) )                  // write to pipe
+    {
+        // move count bytes to pipe
+        nbytes = pipe_user_move( false,   // to pipe 
+                                 file_xp,
+                                 vaddr,
+                                 count );
+    }
+    else                                                       // unsupported type
+    {
+
+#if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
 printk("\n[ERROR] in %s : thread[%x,%x] / illegal inode type %\n",
 __FUNCTION__, vfs_inode_type_str( file_type ) );
@@ -187 +201 @@
 
 #if DEBUG_SYSCALLS_ERROR
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
 printk("\n[ERROR] in %s : thread[%x,‰x] cannot write data to file %d\n",
 __FUNCTION__ , process->pid, this->trdid, file_id );