Changeset 368ee04 in mainline for uspace/lib/pcut/src/os/helenos.c

Timestamp:

2017-04-05T18:10:39Z (8 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/lib/pcut/src/os/helenos.c (modified) (5 diffs)

uspace/lib/pcut/src/os/helenos.c

@@ -41 +41 @@
 #include <stdio.h>
 #include <task.h>
-#include <fcntl.h>
 #include <fibril_synch.h>
+#include <vfs/vfs.h>
 #include "../internal.h"
 
@@ -161 +161 @@
         char tempfile_name[PCUT_TEMP_FILENAME_BUFFER_SIZE];
         snprintf(tempfile_name, PCUT_TEMP_FILENAME_BUFFER_SIZE - 1, "pcut_%lld.tmp", (unsigned long long) task_get_id());
-        int tempfile = open(tempfile_name, O_CREAT | O_RDWR);
+        int tempfile = vfs_lookup_open(tempfile_name, WALK_REGULAR | WALK_MAY_CREATE, MODE_READ | MODE_WRITE);
         if (tempfile < 0) {
                 pcut_report_test_done(test, TEST_OUTCOME_ERROR, "Failed to create temporary file.", NULL, NULL);
@@ -169 +169 @@
         char test_number_argument[MAX_TEST_NUMBER_WIDTH];
         snprintf(test_number_argument, MAX_TEST_NUMBER_WIDTH, "-t%d", test->id);
-
-        int *files[4];
-        int fd_stdin = fileno(stdin);
-        files[0] = &fd_stdin;
-        files[1] = &tempfile;
-        files[2] = &tempfile;
-        files[3] = NULL;
 
         const char *const arguments[3] = {
@@ -186 +179 @@
 
         task_wait_t test_task_wait;
-        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments, files);
+        int rc = task_spawnvf(&test_task_id, &test_task_wait, self_path, arguments,
+            fileno(stdin), tempfile, tempfile);
         if (rc != EOK) {
                 status = TEST_OUTCOME_ERROR;
@@ -220 +214 @@
         fibril_mutex_unlock(&forced_termination_mutex);
 
-        read(tempfile, extra_output_buffer, OUTPUT_BUFFER_SIZE);
+        aoff64_t pos = 0;
+        vfs_read(tempfile, &pos, extra_output_buffer, OUTPUT_BUFFER_SIZE);
 
 leave_close_tempfile:
-        close(tempfile);
-        unlink(tempfile_name);
+        vfs_put(tempfile);
+        vfs_unlink_path(tempfile_name);
 
         pcut_report_test_done_unparsed(test, status, extra_output_buffer, OUTPUT_BUFFER_SIZE);