Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(562)

Unified Diff: runtime/bin/process_fuchsia.cc

Issue 3007703002: [dart:io] Namespaces for file IO (Closed)
Patch Set: Remove namespace_unsupported.cc Created 3 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/bin/process_android.cc ('k') | runtime/bin/process_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/process_fuchsia.cc
diff --git a/runtime/bin/process_fuchsia.cc b/runtime/bin/process_fuchsia.cc
index 0f618b513a2d4c90c300b95ffc07cc77f3cea365..2c13e01a5e2f6130f6054fa296456aaf0430e233 100644
--- a/runtime/bin/process_fuchsia.cc
+++ b/runtime/bin/process_fuchsia.cc
@@ -17,6 +17,7 @@
#include <magenta/syscalls/object.h>
#include <magenta/types.h>
#include <mxio/io.h>
+#include <mxio/namespace.h>
#include <mxio/private.h>
#include <mxio/util.h>
#include <poll.h>
@@ -30,8 +31,10 @@
#include "bin/dartutils.h"
#include "bin/eventhandler.h"
#include "bin/fdutils.h"
+#include "bin/file.h"
#include "bin/lockers.h"
#include "bin/log.h"
+#include "bin/namespace.h"
#include "platform/signal_blocker.h"
#include "platform/utils.h"
@@ -509,7 +512,8 @@ bool Process::Kill(intptr_t id, int signal) {
class ProcessStarter {
public:
- ProcessStarter(const char* path,
+ ProcessStarter(Namespace* namespc,
+ const char* path,
char* arguments[],
intptr_t arguments_length,
const char* working_directory,
@@ -522,7 +526,8 @@ class ProcessStarter {
intptr_t* id,
intptr_t* exit_event,
char** os_error_message)
- : path_(path),
+ : namespc_(namespc),
+ path_(path),
working_directory_(working_directory),
mode_(mode),
in_(in),
@@ -657,13 +662,17 @@ class ProcessStarter {
launchpad_create(MX_HANDLE_INVALID, program_arguments_[0], &lp);
launchpad_set_args(lp, program_arguments_count_, program_arguments_);
launchpad_set_environ(lp, program_environment_);
- launchpad_clone(lp, LP_CLONE_MXIO_NAMESPACE);
- launchpad_clone(lp, LP_CLONE_MXIO_CWD);
+ launchpad_clone(lp, LP_CLONE_MXIO_NAMESPACE | LP_CLONE_MXIO_CWD);
launchpad_add_pipe(lp, &write_out_, 0);
launchpad_add_pipe(lp, &read_in_, 1);
launchpad_add_pipe(lp, &read_err_, 2);
launchpad_add_vdso_vmo(lp);
- launchpad_load_from_file(lp, path_);
+
+ NamespaceScope ns(namespc_, path_);
+ const int pathfd =
+ TEMP_FAILURE_RETRY(openat64(ns.fd(), ns.path(), O_RDONLY));
+ launchpad_load_from_fd(lp, pathfd);
+ VOID_TEMP_FAILURE_RETRY(close(pathfd));
// If there were any errors, grab launchpad's error message and put it in
// the os_error_message_ field.
@@ -689,6 +698,7 @@ class ProcessStarter {
intptr_t program_arguments_count_;
char** program_environment_;
+ Namespace* namespc_;
const char* path_;
const char* working_directory_;
ProcessStartMode mode_;
@@ -703,7 +713,8 @@ class ProcessStarter {
DISALLOW_IMPLICIT_CONSTRUCTORS(ProcessStarter);
};
-int Process::Start(const char* path,
+int Process::Start(Namespace* namespc,
+ const char* path,
char* arguments[],
intptr_t arguments_length,
const char* working_directory,
@@ -721,9 +732,9 @@ int Process::Start(const char* path,
"Only ProcessStartMode.NORMAL is supported on this platform");
return -1;
}
- ProcessStarter starter(path, arguments, arguments_length, working_directory,
- environment, environment_length, mode, in, out, err,
- id, exit_event, os_error_message);
+ ProcessStarter starter(namespc, path, arguments, arguments_length,
+ working_directory, environment, environment_length,
+ mode, in, out, err, id, exit_event, os_error_message);
return starter.Start();
}
« no previous file with comments | « runtime/bin/process_android.cc ('k') | runtime/bin/process_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698