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

Side by Side Diff: components/nacl/loader/nacl_fork_delegate_linux.cc

Issue 16881004: Move chrome/nacl to components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add per-file to components/OWNER Created 7 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
Mark Seaborn 2013/06/27 15:45:53 This file was in chrome/app before. It doesn't be
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 "chrome/app/nacl_fork_delegate_linux.h" 5 #include "components/nacl/common/nacl_fork_delegate_linux.h"
6 6
7 #include <signal.h> 7 #include <signal.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <sys/resource.h> 9 #include <sys/resource.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
11 11
12 #include <set> 12 #include <set>
13 13
14 #include "base/basictypes.h" 14 #include "base/basictypes.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/posix/eintr_wrapper.h" 19 #include "base/posix/eintr_wrapper.h"
20 #include "base/posix/unix_domain_socket_linux.h" 20 #include "base/posix/unix_domain_socket_linux.h"
21 #include "base/process_util.h" 21 #include "base/process_util.h"
22 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 22 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
23 #include "chrome/common/chrome_paths.h" 23 #include "components/nacl/common/nacl_helper_linux.h"
24 #include "chrome/common/nacl_helper_linux.h" 24 #include "components/nacl/common/nacl_paths.h"
25 #include "chrome/common/nacl_paths.h"
26 #include "components/nacl/common/nacl_switches.h" 25 #include "components/nacl/common/nacl_switches.h"
27 26
28 NaClForkDelegate::NaClForkDelegate() 27 NaClForkDelegate::NaClForkDelegate()
29 : status_(kNaClHelperUnused), 28 : status_(kNaClHelperUnused),
30 fd_(-1) {} 29 fd_(-1) {}
31 30
32 // Note these need to match up with their counterparts in nacl_helper_linux.c 31 // Note these need to match up with their counterparts in nacl_helper_linux.c
33 // and nacl_helper_bootstrap_linux.c. 32 // and nacl_helper_bootstrap_linux.c.
34 const char kNaClHelperReservedAtZero[] = 33 const char kNaClHelperReservedAtZero[] =
35 "--reserved_at_zero=0xXXXXXXXXXXXXXXXX"; 34 "--reserved_at_zero=0xXXXXXXXXXXXXXXXX";
36 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX"; 35 const char kNaClHelperRDebug[] = "--r_debug=0xXXXXXXXXXXXXXXXX";
37 36
38 void NaClForkDelegate::Init(const int sandboxdesc) { 37 void NaClForkDelegate::Init(const int sandboxdesc) {
39 VLOG(1) << "NaClForkDelegate::Init()"; 38 VLOG(1) << "NaClForkDelegate::Init()";
40 int fds[2]; 39 int fds[2];
41 40
42 // Confirm a hard-wired assumption. 41 // Confirm a hard-wired assumption.
43 // The NaCl constant is from chrome/nacl/nacl_linux_helper.h 42 // The NaCl constant is from components/nacl/loader/nacl_linux_helper.h
44 DCHECK(kNaClSandboxDescriptor == sandboxdesc); 43 DCHECK(kNaClSandboxDescriptor == sandboxdesc);
45 44
46 CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0); 45 CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
47 base::FileHandleMappingVector fds_to_map; 46 base::FileHandleMappingVector fds_to_map;
48 fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor)); 47 fds_to_map.push_back(std::make_pair(fds[1], kNaClZygoteDescriptor));
49 fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor)); 48 fds_to_map.push_back(std::make_pair(sandboxdesc, kNaClSandboxDescriptor));
50 49
51 status_ = kNaClHelperUnused; 50 status_ = kNaClHelperUnused;
52 base::FilePath helper_exe; 51 base::FilePath helper_exe;
53 base::FilePath helper_bootstrap_exe; 52 base::FilePath helper_bootstrap_exe;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 155
157 bool NaClForkDelegate::AckChild(const int fd, 156 bool NaClForkDelegate::AckChild(const int fd,
158 const std::string& channel_switch) { 157 const std::string& channel_switch) {
159 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(), 158 int nwritten = HANDLE_EINTR(write(fd, channel_switch.c_str(),
160 channel_switch.length())); 159 channel_switch.length()));
161 if (nwritten != static_cast<int>(channel_switch.length())) { 160 if (nwritten != static_cast<int>(channel_switch.length())) {
162 return false; 161 return false;
163 } 162 }
164 return true; 163 return true;
165 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698