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

Side by Side Diff: base/test/multiprocess_test_android.cc

Issue 11417115: Fix ProcessUtilTest.FDRemapping on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Pawel's comments Created 8 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | build/android/gtest_filter/base_unittests_disabled » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/test/multiprocess_test.h" 5 #include "base/test/multiprocess_test.h"
6 6
7 #include <unistd.h> 7 #include <unistd.h>
8 8
9 #include "base/hash_tables.h"
9 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/posix/eintr_wrapper.h"
10 #include "base/process.h" 12 #include "base/process.h"
11 #include "testing/multiprocess_func_list.h" 13 #include "testing/multiprocess_func_list.h"
12 14
13 namespace base { 15 namespace base {
14 16
15 // A very basic implementation for android. On Android tests can run in an APK 17 // A very basic implementation for android. On Android tests can run in an APK
16 // and we don't have an executable to exec*. This implementation does the bare 18 // and we don't have an executable to exec*. This implementation does the bare
17 // minimum to execute the method specified by procname (in the child process). 19 // minimum to execute the method specified by procname (in the child process).
18 // - File descriptors are not closed and hence |fds_to_map| is ignored.
19 // - |debug_on_start| is ignored. 20 // - |debug_on_start| is ignored.
20 ProcessHandle MultiProcessTest::SpawnChildImpl( 21 ProcessHandle MultiProcessTest::SpawnChildImpl(
21 const std::string& procname, 22 const std::string& procname,
22 const FileHandleMappingVector& fds_to_map, 23 const FileHandleMappingVector& fds_to_remap,
23 bool debug_on_start) { 24 bool debug_on_start) {
24 pid_t pid = fork(); 25 pid_t pid = fork();
25 26
26 if (pid < 0) { 27 if (pid < 0) {
27 DPLOG(ERROR) << "fork"; 28 PLOG(ERROR) << "fork";
28 return kNullProcessHandle; 29 return kNullProcessHandle;
29 } else if (pid == 0) {
30 // Child process.
31 _exit(multi_process_function_list::InvokeChildProcessTest(procname));
32 } 30 }
33 31 if (pid > 0) {
34 // Parent process. 32 // Parent process.
35 return pid; 33 return pid;
34 }
35 // Child process.
36 std::hash_set<int> fds_to_keep_open;
37 for (FileHandleMappingVector::const_iterator it = fds_to_remap.begin();
38 it != fds_to_remap.end(); ++it) {
39 fds_to_keep_open.insert(it->first);
40 }
41 // Keep stdin, stdout and stderr open since this is not meant to spawn a
42 // daemon.
43 const int kFdForAndroidLogging = 3; // FD used by __android_log_write().
44 for (int fd = kFdForAndroidLogging + 1; fd < getdtablesize(); ++fd) {
45 if (fds_to_keep_open.find(fd) == fds_to_keep_open.end()) {
46 HANDLE_EINTR(close(fd));
47 }
48 }
49 for (FileHandleMappingVector::const_iterator it = fds_to_remap.begin();
50 it != fds_to_remap.end(); ++it) {
51 int old_fd = it->first;
52 int new_fd = it->second;
53 if (dup2(old_fd, new_fd) < 0) {
54 PLOG(FATAL) << "dup2";
55 }
56 HANDLE_EINTR(close(old_fd));
57 }
58 _exit(multi_process_function_list::InvokeChildProcessTest(procname));
59 return 0;
36 } 60 }
37 61
38 } // namespace base 62 } // namespace base
OLDNEW
« no previous file with comments | « no previous file | build/android/gtest_filter/base_unittests_disabled » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698