Changeset 368ee04 in mainline for uspace/app/trace/trace.c

Timestamp:

2017-04-05T18:10:39Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/app/trace/trace.c (modified) (3 diffs)

uspace/app/trace/trace.c

@@ -512 +512 @@
                 goto error;
 
-        /* Send program pathname */
-        rc = loader_set_pathname(ldr, path);
+        /* Send program. */
+        rc = loader_set_program_path(ldr, path);
         if (rc != EOK)
                 goto error;
@@ -523 +523 @@
 
         /* Send default files */
-        int *files[4];
+        int fd_root;
         int fd_stdin;
         int fd_stdout;
         int fd_stderr;
         
-        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK))
-                files[0] = &fd_stdin;
-        else
-                files[0] = NULL;
-        
-        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK))
-                files[1] = &fd_stdout;
-        else
-                files[1] = NULL;
-        
-        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK))
-                files[2] = &fd_stderr;
-        else
-                files[2] = NULL;
-        
-        files[3] = NULL;
-        
-        rc = loader_set_files(ldr, files);
-        if (rc != EOK)
-                goto error;
-
+        fd_root = vfs_root();
+        if (fd_root >= 0) {
+                rc = loader_add_inbox(ldr, "root", fd_root);
+                vfs_put(fd_root);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK)) {
+                rc = loader_add_inbox(ldr, "stdin", fd_stdin);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK)) {
+                rc = loader_add_inbox(ldr, "stdout", fd_stdout);
+                if (rc != EOK)
+                        goto error;
+        }
+        
+        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK)) {
+                rc = loader_add_inbox(ldr, "stderr", fd_stderr);
+                if (rc != EOK)
+                        goto error;
+        }
+        
         /* Load the program. */
         rc = loader_load_program(ldr);
@@ -696 +701 @@
 
         p = proto_new("vfs");
-        o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN, o);
-        o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
+        o = oper_new("read", 3, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);
-        o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def);
+        o = oper_new("write", 3, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_WRITE, o);
-        o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_SEEK, o);
-        o = oper_new("truncate", 5, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_TRUNCATE, o);
-        o = oper_new("fstat", 1, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_FSTAT, o);
-        o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_CLOSE, o);
-        o = oper_new("mount", 2, arg_def, V_ERRNO, 0, resp_def);
+        o = oper_new("vfs_resize", 5, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_RESIZE, o);
+        o = oper_new("vfs_stat", 1, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_STAT, o);
+        o = oper_new("vfs_put", 1, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_PUT, o);
+        o = oper_new("vfs_mount", 2, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_MOUNT, o);
 /*      o = oper_new("unmount", 0, arg_def);
         proto_add_oper(p, VFS_IN_UNMOUNT, o);*/
-        o = oper_new("sync", 1, arg_def, V_ERRNO, 0, resp_def);
+        o = oper_new("vfs_sync", 1, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_SYNC, o);
-        o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_MKDIR, o);
-        o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_UNLINK, o);
         o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_RENAME, o);
-        o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_STAT, o);
-        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
+        o = oper_new("vfs_statfs", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_STATFS, o);
+        o = oper_new("vfs_walk", 2, arg_def, V_INT_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_WALK, o);
+        o = oper_new("vfs_open", 2, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_OPEN, o);
+        o = oper_new("vfs_unlink", 3, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_UNLINK, o);
 
         proto_register(SERVICE_VFS, p);