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

Timestamp:

Oct 10, 2020, 5:11:27 PM (4 years ago)

Author:

alain

Message:

• Introduce the sys_socket.c file implementing all socket related syscalls.
• Improve the non-standard sys_get_config() function.

File:

• trunk/kernel/syscalls/sys_close.c (modified) (7 diffs)

trunk/kernel/syscalls/sys_close.c

@@ -2 +2 @@
  * sys_close.c  close an open file
  * 
- * Author    Alain Greiner (2016,2017)
+ * Author    Alain Greiner (2016,2017,2018,2019,2020)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -28 +28 @@
 #include <process.h>
 #include <thread.h>
+#include <ksocket.h>
 #include <printk.h>
 
 #include <syscalls.h>
 
-//////////////////////////////////
-int sys_close ( uint32_t file_id )
+///////////////////////////////
+int sys_close ( uint32_t fdid )
 {
     error_t            error;
@@ -51 +52 @@
 if( DEBUG_SYS_CLOSE < tm_start )
 printk("\n[%s] thread[%x,%x] enter / fdid %d / cycle %d\n",
-__FUNCTION__, process->pid, this->trdid, file_id, (uint32_t)tm_start );
+__FUNCTION__, process->pid, this->trdid, fdid, (uint32_t)tm_start );
 #endif
  
-    // check file_id argument
-        if( file_id >= CONFIG_PROCESS_FILE_MAX_NR )
+    // check fdid argument
+        if( fdid >= CONFIG_PROCESS_FILE_MAX_NR )
         {
 
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : illegal file descriptor index = %d\n",
-__FUNCTION__ , file_id );
+__FUNCTION__ , fdid );
 #endif
                 this->errno = EBADFD;
@@ -67 +68 @@
 
     // get extended pointer on remote file descriptor
-    file_xp = process_fd_get_xptr( process , file_id );
+    file_xp = process_fd_get_xptr_from_local( process , fdid );
 
     if( file_xp == XPTR_NULL )
@@ -74 +75 @@
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : undefined file descriptor %d\n",
-__FUNCTION__ , file_id );
+__FUNCTION__ , fdid );
 #endif
         this->errno = EBADFD;
@@ -90 +91 @@
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : file descriptor %d is a directory\n",
-__FUNCTION__ , file_id );
+__FUNCTION__ , fdid );
 #endif
                 this->errno = EBADFD;
                 return -1;
         }
-
-    // call the relevant VFS function
-        error = vfs_close( file_xp , file_id );
+    else if( file_type == INODE_TYPE_SOCK )
+    {
+        // call the relevant socket function
+        error = socket_close( file_xp , fdid );
+    }
+    else if( file_type == INODE_TYPE_FILE )
+    {
+        // call the relevant VFS function
+            error = vfs_close( file_xp , fdid );
+    }
+    else 
+    {
+           
+#if DEBUG_SYSCALLS_ERROR
+printk("\n[WARNING] in %s : type (%d) not supported  / fdid %d\n",
+__FUNCTION__ , file_type , fdid );
+#endif
+        error = 0;        
+    }
 
         if( error )
@@ -104 +121 @@
 #if DEBUG_SYSCALLS_ERROR
 printk("\n[ERROR] in %s : cannot close file descriptor %d\n",
-__FUNCTION__ , file_id );
+__FUNCTION__ , fdid );
 #endif
                 this->errno = error;