Changeset e704503 in mainline

Timestamp:

2008-02-17T14:49:14Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f15cf1a6

Parents:

16105cba

Message:

Support for close().

Location:

uspace

Files:

• lib/libc/generic/vfs.c (modified) (1 diff)
• lib/libc/include/errno.h (modified) (1 diff)
• srv/vfs/vfs.c (modified) (1 diff)
• srv/vfs/vfs.h (modified) (1 diff)
• srv/vfs/vfs_ops.c (modified) (1 diff)

uspace/lib/libc/generic/vfs.c

@@ -136 +136 @@
 int close(int fildes)
 {
-        return 0;       /* TODO */
+        int res;
+        ipcarg_t rc;
+
+        futex_down(&vfs_phone_futex);
+        async_serialize_start();
+        if (vfs_phone < 0) {
+                res = vfs_connect();
+                if (res < 0) {
+                        async_serialize_end();
+                        futex_up(&vfs_phone_futex);
+                        return res;
+                }
+        }
+                
+        rc = async_req_1_0(vfs_phone, VFS_CLOSE, fildes);
+
+        async_serialize_end();
+        futex_up(&vfs_phone_futex);
+        
+        return (int)rc;
 }
 

uspace/lib/libc/include/errno.h

@@ -44 +44 @@
 #define EEXIST          (-260)
 #define ENOTEMPTY       (-261)
+#define EBADF           (-262)
 
 #endif

uspace/srv/vfs/vfs.c

@@ -94 +94 @@
                         vfs_open(callid, &call);
                         break;
+                case VFS_CLOSE:
+                        vfs_close(callid, &call);
+                        break;
                 case VFS_READ:
                         vfs_read(callid, &call);

uspace/srv/vfs/vfs.h

@@ -270 +270 @@
 extern void vfs_mount(ipc_callid_t, ipc_call_t *);
 extern void vfs_open(ipc_callid_t, ipc_call_t *);
+extern void vfs_close(ipc_callid_t, ipc_call_t *);
 extern void vfs_read(ipc_callid_t, ipc_call_t *);
 extern void vfs_write(ipc_callid_t, ipc_call_t *);

uspace/srv/vfs/vfs_ops.c

@@ -388 +388 @@
 }
 
+void vfs_close(ipc_callid_t rid, ipc_call_t *request)
+{
+        int fd = IPC_GET_ARG1(*request);
+        if (fd >= MAX_OPEN_FILES) {
+                ipc_answer_0(rid, EBADF);
+                return;
+        }
+        vfs_fd_free(fd);
+        ipc_answer_0(rid, EOK);
+}
+
 static void vfs_rdwr(ipc_callid_t rid, ipc_call_t *request, bool read)
 {