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

Side by Side Diff: components/nacl/common/nacl_debug_exception_handler_win.cc

Issue 860453002: Move OpenProcessHandleWithAccess to Process::OpenWithAccess. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ServiceProcessControlBrowserTest.Setup again Created 5 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "components/nacl/common/nacl_debug_exception_handler_win.h" 5 #include "components/nacl/common/nacl_debug_exception_handler_win.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "base/win/scoped_handle.h" 9 #include "base/win/scoped_handle.h"
10 #include "native_client/src/trusted/service_runtime/win/debug_exception_handler. h" 10 #include "native_client/src/trusted/service_runtime/win/debug_exception_handler. h"
11 11
12 namespace { 12 namespace {
13 13
14 class DebugExceptionHandler : public base::PlatformThread::Delegate { 14 class DebugExceptionHandler : public base::PlatformThread::Delegate {
15 public: 15 public:
16 DebugExceptionHandler( 16 DebugExceptionHandler(
17 base::ProcessHandle nacl_process, 17 base::Process nacl_process,
18 const std::string& startup_info, 18 const std::string& startup_info,
19 const scoped_refptr<base::MessageLoopProxy>& message_loop, 19 const scoped_refptr<base::MessageLoopProxy>& message_loop,
20 const base::Callback<void(bool)>& on_connected) 20 const base::Callback<void(bool)>& on_connected)
21 : nacl_process_(nacl_process), 21 : nacl_process_(nacl_process.Pass()),
22 startup_info_(startup_info), 22 startup_info_(startup_info),
23 message_loop_(message_loop), 23 message_loop_(message_loop),
24 on_connected_(on_connected) {} 24 on_connected_(on_connected) {}
25 25
26 virtual void ThreadMain() override { 26 virtual void ThreadMain() override {
27 // In the Windows API, the set of processes being debugged is 27 // In the Windows API, the set of processes being debugged is
28 // thread-local, so we have to attach to the process (using 28 // thread-local, so we have to attach to the process (using
29 // DebugActiveProcess()) on the same thread on which 29 // DebugActiveProcess()) on the same thread on which
30 // NaClDebugExceptionHandlerRun() receives debug events for the 30 // NaClDebugExceptionHandlerRun() receives debug events for the
31 // process. 31 // process.
32 bool attached = false; 32 bool attached = false;
33 int pid = GetProcessId(nacl_process_.Get()); 33 int pid = nacl_process_.pid();
34 if (pid == 0) { 34 if (nacl_process_.IsValid()) {
35 LOG(ERROR) << "Invalid process handle"; 35 DCHECK(pid);
36 } else {
37 if (!DebugActiveProcess(pid)) { 36 if (!DebugActiveProcess(pid)) {
38 LOG(ERROR) << "Failed to connect to the process"; 37 LOG(ERROR) << "Failed to connect to the process";
39 } else { 38 } else {
40 attached = true; 39 attached = true;
41 } 40 }
41 } else {
42 LOG(ERROR) << "Invalid process handle";
42 } 43 }
43 message_loop_->PostTask(FROM_HERE, base::Bind(on_connected_, attached)); 44 message_loop_->PostTask(FROM_HERE, base::Bind(on_connected_, attached));
44 45
45 if (attached) { 46 if (attached) {
46 NaClDebugExceptionHandlerRun( 47 NaClDebugExceptionHandlerRun(
47 nacl_process_.Get(), 48 nacl_process_.Handle(),
48 reinterpret_cast<const void*>(startup_info_.data()), 49 reinterpret_cast<const void*>(startup_info_.data()),
49 startup_info_.size()); 50 startup_info_.size());
50 } 51 }
51 delete this; 52 delete this;
52 } 53 }
53 54
54 private: 55 private:
55 base::win::ScopedHandle nacl_process_; 56 base::Process nacl_process_;
56 std::string startup_info_; 57 std::string startup_info_;
57 const scoped_refptr<base::MessageLoopProxy> message_loop_; 58 const scoped_refptr<base::MessageLoopProxy> message_loop_;
58 base::Callback<void(bool)> on_connected_; 59 base::Callback<void(bool)> on_connected_;
59 60
60 DISALLOW_COPY_AND_ASSIGN(DebugExceptionHandler); 61 DISALLOW_COPY_AND_ASSIGN(DebugExceptionHandler);
61 }; 62 };
62 63
63 } // namespace 64 } // namespace
64 65
65 void NaClStartDebugExceptionHandlerThread( 66 void NaClStartDebugExceptionHandlerThread(
66 base::ProcessHandle nacl_process, 67 base::Process nacl_process,
67 const std::string& startup_info, 68 const std::string& startup_info,
68 const scoped_refptr<base::MessageLoopProxy>& message_loop, 69 const scoped_refptr<base::MessageLoopProxy>& message_loop,
69 const base::Callback<void(bool)>& on_connected) { 70 const base::Callback<void(bool)>& on_connected) {
70 // The new PlatformThread will take ownership of the 71 // The new PlatformThread will take ownership of the
71 // DebugExceptionHandler object, which will delete itself on exit. 72 // DebugExceptionHandler object, which will delete itself on exit.
72 DebugExceptionHandler* handler = new DebugExceptionHandler( 73 DebugExceptionHandler* handler = new DebugExceptionHandler(
73 nacl_process, startup_info, message_loop, on_connected); 74 nacl_process.Pass(), startup_info, message_loop, on_connected);
74 if (!base::PlatformThread::CreateNonJoinable(0, handler)) { 75 if (!base::PlatformThread::CreateNonJoinable(0, handler)) {
75 on_connected.Run(false); 76 on_connected.Run(false);
76 delete handler; 77 delete handler;
77 } 78 }
78 } 79 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698