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

Timestamp:

Nov 19, 2020, 11:45:52 PM (4 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_close.c (modified) (7 diffs)

trunk/kernel/syscalls/sys_close.c

@@ -1 +1 @@
 /*
- * sys_close.c  close an open file
+ * sys_close.c  kernel function implementing the <close> syscall
  * 
- * Author    Alain Greiner (2016,2017,2018,2019,2020)
+ * Author       Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -40 +40 @@
     cxy_t              file_cxy;
     vfs_file_t       * file_ptr;
-    vfs_inode_type_t   file_type;
+    vfs_file_type_t   file_type;
 
         thread_t  * this    = CURRENT_THREAD;
         process_t * process = this->process;
 
-#if (DEBUG_SYS_CLOSE || CONFIG_INSTRUMENTATION_SYSCALLS)
+#if DEBUG_SYS_CLOSE || DEBUG_SYSCALLS_ERROR || CONFIG_INSTRUMENTATION_SYSCALLS
 uint64_t     tm_start = hal_get_cycles();
 #endif
 
 #if DEBUG_SYS_CLOSE
-if( DEBUG_SYS_CLOSE < tm_start )
+if( DEBUG_SYS_CLOSE < (uint32_t)tm_start )
 printk("\n[%s] thread[%x,%x] enter / fdid %d / cycle %d\n",
 __FUNCTION__, process->pid, this->trdid, fdid, (uint32_t)tm_start );
@@ -60 +60 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
-__FUNCTION__ , fdid );
+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 , fdid );
 #endif
                 this->errno = EBADFD;
@@ -74 +75 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : undefined file descriptor %d\n",
-__FUNCTION__ , fdid );
+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 , fdid );
 #endif
         this->errno = EBADFD;
@@ -86 +88 @@
     file_type = hal_remote_l32( XPTR( file_cxy , &file_ptr->type ) );
 
-    if( file_type == INODE_TYPE_DIR ) 
+    if( file_type == FILE_TYPE_DIR ) 
         {
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : file descriptor %d is a directory\n",
-__FUNCTION__ , fdid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] / file descriptor %d is a directory\n",
+__FUNCTION__ , process->pid , this->trdid , fdid );
 #endif
                 this->errno = EBADFD;
                 return -1;
         }
-    else if( file_type == INODE_TYPE_SOCK )
+    else if( file_type == FILE_TYPE_SOCK )
     {
         // call the relevant socket function
         error = socket_close( file_xp , fdid );
     }
-    else if( file_type == INODE_TYPE_FILE )
+    else if( (file_type == FILE_TYPE_REG) ||
+             (file_type == FILE_TYPE_FIFO) )
     {
         // call the relevant VFS function
@@ -110 +114 @@
            
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[WARNING] in %s : type (%d) not supported  / fdid %d\n",
-__FUNCTION__ , file_type , fdid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[WARNING] in %s : thread[%x,%x] / file_type (%s) unsupported / fdid %d\n",
+__FUNCTION__ , process->pid , this->trdid , vfs_inode_type_str(file_type) , fdid );
 #endif
         error = 0;        
@@ -120 +125 @@
 
 #if DEBUG_SYSCALLS_ERROR
-printk("\n[ERROR] in %s : cannot close file descriptor %d\n",
-__FUNCTION__ , fdid );
+if( DEBUG_SYSCALLS_ERROR < (uint32_t)tm_start )
+printk("\n[ERROR] in %s : thread[%x,%x] cannot close file descriptor %d\n",
+__FUNCTION__ , process->pid , this->trdid , fdid );
 #endif
                 this->errno = error;