Changeset 368ee04 in mainline for uspace/app/tester

Timestamp:

2017-04-05T18:10:39Z (9 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.

Location:

uspace/app/tester

Files:

• hw/misc/virtchar1.c (modified) (4 diffs)
• mm/pager1.c (modified) (5 diffs)
• vfs/vfs1.c (modified) (4 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -45 +45 @@
 #include <vfs/vfs.h>
 #include <vfs/vfs_sess.h>
-#include <sys/stat.h>
-#include <fcntl.h>
 #include "../../tester.h"
 
@@ -56 +54 @@
 {
         TPRINTF("Opening `%s'...\n", path);
-        int fd = open(path, O_RDONLY);
+        int fd = vfs_lookup(path, WALK_REGULAR);
         if (fd < 0) {
                 TPRINTF("   ...error: %s\n", str_error(errno));
@@ -71 +69 @@
         async_sess_t *sess = vfs_fd_session(fd, INTERFACE_DDF);
         if (!sess) {
-                close(fd);
+                vfs_put(fd);
                 TPRINTF("   ...error: %s\n", str_error(errno));
                 return "Failed to get session to device";
@@ -92 +90 @@
         TPRINTF(" Closing session and file descriptor\n");
         async_hangup(sess);
-        close(fd);
+        vfs_put(fd);
         
         return NULL;

uspace/app/tester/mm/pager1.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
+#include <vfs/vfs.h>
 #include <stdlib.h>
 #include <malloc.h>
@@ -48 +47 @@
         TPRINTF("Creating temporary file...\n");
 
-        fd = open(TEST_FILE, O_CREAT);
+        fd = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE);
         if (fd < 0)
                 return NULL;
-        (void) unlink(TEST_FILE);
-        if (write(fd, text, sizeof(text)) != sizeof(text)) {
-                close(fd);
+        (void) vfs_unlink_path(TEST_FILE);
+
+        if (vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text)) < 0) {
+                vfs_put(fd);
                 return NULL;
         }
@@ -64 +65 @@
 
         if (!vfs_pager_sess) {
-                close(fd);
+                vfs_put(fd);
                 return NULL;
         }
@@ -73 +74 @@
             AS_AREA_READ | AS_AREA_CACHEABLE, vfs_pager_sess, fd, 0, 0);
         if (result == AS_MAP_FAILED) {
-                close(fd);
+                vfs_put(fd);
                 return NULL;
         }
@@ -101 +102 @@
 
         as_area_destroy(buffer);        
-        close(fd);
+        vfs_put(fd);
         
         return NULL;

uspace/app/tester/vfs/vfs1.c

@@ -33 +33 @@
 #include <vfs/vfs.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <dirent.h>
 #include <loc.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include "../tester.h"
 
@@ -70 +68 @@
 const char *test_vfs1(void)
 {
-        if (mkdir(TEST_DIRECTORY, 0) != 0) {
-                TPRINTF("rc=%d\n", errno);
-                return "mkdir() failed";
+        aoff64_t pos = 0;
+        int rc;
+
+        rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);
+        if (rc != EOK) {
+                TPRINTF("rc=%d\n", rc);
+                return "vfs_link_path() failed";
         }
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0 = open(TEST_FILE, O_CREAT);
+        int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE);
         if (fd0 < 0)
-                return "open() failed";
+                return "vfs_lookup_open() failed";
         TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);
         
         size_t size = sizeof(text);
-        ssize_t cnt = write(fd0, text, size);
+        ssize_t cnt = vfs_write(fd0, &pos, text, size);
         if (cnt < 0)
                 return "write() failed";
         TPRINTF("Written %zd bytes\n", cnt);
-        
-        if (lseek(fd0, 0, SEEK_SET) != 0)
-                return "lseek() failed";
-        TPRINTF("Sought to position 0\n");
+
+        pos = 0;
         
         char buf[BUF_SIZE];
         TPRINTF("read..\n");
-        while ((cnt = read(fd0, buf, BUF_SIZE))) {
+        while ((cnt = vfs_read(fd0, &pos, buf, BUF_SIZE))) {
                 TPRINTF("read returns %zd\n", cnt);
                 if (cnt < 0)
@@ -107 +108 @@
         }
         
-        close(fd0);
+        vfs_put(fd0);
         
         const char *rv = read_root();
@@ -113 +114 @@
                 return rv;
         
-        if (rename(TEST_FILE, TEST_FILE2) != 0)
-                return "rename() failed";
+        if (vfs_rename_path(TEST_FILE, TEST_FILE2) != EOK)
+                return "vfs_rename_path() failed";
         TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2);
         
-        if (unlink(TEST_FILE2) != 0)
-                return "unlink() failed";
+        if (vfs_unlink_path(TEST_FILE2) != EOK)
+                return "vfs_unlink_path() failed";
         TPRINTF("Unlinked %s\n", TEST_FILE2);
         
-        if (rmdir(TEST_DIRECTORY) != 0)
-                return "rmdir() failed";
+        if (vfs_unlink_path(TEST_DIRECTORY) != EOK)
+                return "vfs_unlink_path() failed";
         TPRINTF("Removed directory %s\n", TEST_DIRECTORY);