Changeset 354b642 in mainline for uspace/lib/c

Timestamp:

2017-03-07T10:53:31Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a274a5f

Parents:

c577a9a

git-author:

Jiri Zarevucky <zarevucky.jiri@…> (2017-03-07 10:53:31)

git-committer:

Jakub Jermar <jakub@…> (2017-03-07 10:53:31)

Message:

Merge from lp:~zarevucky-jiri/helenos/vfs-2.5/ revisions 1932-1936

Original commit messages:

1936: Jiri Zarevucky 2013-08-05 Modifications to vfs_rdwr.
1935: Jiri Zarevucky 2013-08-05 Fix a bug in read/write.
1934: Jiri Zarevucky 2013-08-05 Fix a hidden bug in handle passing.
1933: Jiri Zarevucky 2013-08-05 Add VFS_IN_CLONE.
1932: Jiri Zarevucky 2013-08-05 Add functions for passing handles around.

Modifications:

• New vcl_* interfaces renamed to vfs_*
• Server-side vfs_pass_handle() and vfs_clone() renamed to vfs_op_* to avoid name conflict with libc

Location:

uspace/lib/c

Files:

• generic/loader.c (modified) (1 diff)
• generic/vfs/vfs.c (modified) (4 diffs)
• include/ipc/vfs.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (2 diffs)

uspace/lib/c/generic/loader.c

@@ -271 +271 @@
         
         for (i = 0; files[i]; i++) {
-                rc = async_state_change_start(exch, VFS_PASS_HANDLE, *files[i],
-                    0, vfs_exch); 
+                rc = vfs_pass_handle(vfs_exch, *files[i], exch);
                 if (rc != EOK)
                         break;

uspace/lib/c/generic/vfs/vfs.c

@@ -419 +419 @@
         req = async_send_1(exch, VFS_IN_READ, fildes, &answer);
         rc = async_data_read_start(exch, (void *) buf, nbyte);
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-                
-                sysarg_t rc_orig;
-                async_wait_for(req, &rc_orig);
-                
-                if (rc_orig == EOK)
-                        return rc;
-                else
-                        return rc_orig;
-        }
-        
-        vfs_exchange_end(exch);
-        async_wait_for(req, &rc);
+
+        vfs_exchange_end(exch);
+        
+        if (rc == EOK) {
+                async_wait_for(req, &rc);
+        } else {
+                async_forget(req);
+        }
         
         if (rc != EOK)
@@ -467 +461 @@
         req = async_send_1(exch, VFS_IN_WRITE, fildes, &answer);
         rc = async_data_write_start(exch, (void *) buf, nbyte);
-        if (rc != EOK) {
-                vfs_exchange_end(exch);
-                
-                sysarg_t rc_orig;
-                async_wait_for(req, &rc_orig);
-                
-                if (rc_orig == EOK)
-                        return rc;
-                else
-                        return rc_orig;
-        }
-        
-        vfs_exchange_end(exch);
-        async_wait_for(req, &rc);
-        
+        
+        vfs_exchange_end(exch);
+        
+        if (rc == EOK) {
+                async_wait_for(req, &rc);
+        } else {
+                async_forget(req);
+        }
+
         if (rc != EOK)
                 return rc;
@@ -1055 +1043 @@
 }
 
-int vfs_fd_wait(void)
-{
-        async_exch_t *exch = vfs_exchange_begin();
-        
-        sysarg_t ret;
-        sysarg_t rc = async_req_0_1(exch, VFS_IN_WAIT_HANDLE, &ret);
-        
-        vfs_exchange_end(exch);
-        
-        if (rc == EOK)
-                return (int) ret;
-        
-        return (int) rc;
-}
-
 int vfs_get_mtab_list(list_t *mtab_list)
 {
@@ -1172 +1145 @@
 }
 
+int vfs_pass_handle(async_exch_t *vfs_exch, int file, async_exch_t *exch)
+{
+        return async_state_change_start(exch, VFS_PASS_HANDLE, (sysarg_t)file, 0, vfs_exch);
+}
+
+int vfs_receive_handle()
+{
+        ipc_callid_t callid;
+        if (!async_state_change_receive(&callid, NULL, NULL, NULL)) {
+                async_answer_0(callid, EINVAL);
+                return EINVAL;
+        }
+
+        async_exch_t *vfs_exch = vfs_exchange_begin();
+
+        async_state_change_finalize(callid, vfs_exch);
+
+        sysarg_t ret;
+        sysarg_t rc = async_req_0_1(vfs_exch, VFS_IN_WAIT_HANDLE, &ret);
+
+        async_exchange_end(vfs_exch);
+
+        if (rc != EOK) {
+                return rc;
+        }
+        return ret;
+}
+
+int vfs_clone(int file, bool high_descriptor)
+{
+        async_exch_t *vfs_exch = vfs_exchange_begin();
+        int rc = async_req_2_0(vfs_exch, VFS_IN_CLONE, (sysarg_t) file, (sysarg_t) high_descriptor);
+        vfs_exchange_end(vfs_exch);
+        return rc;
+}
+
 /** @}
  */

uspace/lib/c/include/ipc/vfs.h

@@ -83 +83 @@
         VFS_IN_OPEN2,
         VFS_IN_UNLINK2,
+        VFS_IN_CLONE,
 } vfs_in_request_t;
 

uspace/lib/c/include/vfs/vfs.h

@@ -58 +58 @@
 extern int vfs_fhandle(FILE *, int *);
 
-extern int vfs_fd_wait(void);
 extern int vfs_get_mtab_list(list_t *mtab_list);
 
@@ -67 +66 @@
 extern int _vfs_open(int file, int mode);
 
+extern int vfs_pass_handle(async_exch_t *vfs_exch, int file, async_exch_t *exch);
+extern int vfs_receive_handle(void);
+
+extern int vfs_clone(int file, bool high_descriptor);
+
+
 #endif