OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/runner/out_of_process_native_runner.h" | 5 #include "mojo/runner/out_of_process_native_runner.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "mojo/runner/child_process.mojom.h" | 11 #include "mojo/runner/child_process.mojom.h" |
12 #include "mojo/runner/child_process_host.h" | 12 #include "mojo/runner/child_process_host.h" |
13 #include "mojo/runner/in_process_native_runner.h" | 13 #include "mojo/runner/in_process_native_runner.h" |
14 | 14 |
15 namespace mojo { | 15 namespace mojo { |
16 namespace shell { | 16 namespace runner { |
17 | 17 |
18 OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context) | 18 OutOfProcessNativeRunner::OutOfProcessNativeRunner(Context* context) |
19 : context_(context) { | 19 : context_(context) { |
20 } | 20 } |
21 | 21 |
22 OutOfProcessNativeRunner::~OutOfProcessNativeRunner() { | 22 OutOfProcessNativeRunner::~OutOfProcessNativeRunner() { |
23 if (child_process_host_) { | 23 if (child_process_host_) { |
24 // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been | 24 // TODO(vtl): Race condition: If |ChildProcessHost::DidStart()| hasn't been |
25 // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may | 25 // called yet, we shouldn't call |Join()| here. (Until |DidStart()|, we may |
26 // not have a child process to wait on.) Probably we should fix |Join()|. | 26 // not have a child process to wait on.) Probably we should fix |Join()|. |
27 child_process_host_->Join(); | 27 child_process_host_->Join(); |
28 } | 28 } |
29 } | 29 } |
30 | 30 |
31 void OutOfProcessNativeRunner::Start( | 31 void OutOfProcessNativeRunner::Start( |
32 const base::FilePath& app_path, | 32 const base::FilePath& app_path, |
33 NativeApplicationCleanup cleanup, | 33 shell::NativeApplicationCleanup cleanup, |
34 InterfaceRequest<Application> application_request, | 34 InterfaceRequest<Application> application_request, |
35 const base::Closure& app_completed_callback) { | 35 const base::Closure& app_completed_callback) { |
36 app_path_ = app_path; | 36 app_path_ = app_path; |
37 | 37 |
38 DCHECK(app_completed_callback_.is_null()); | 38 DCHECK(app_completed_callback_.is_null()); |
39 app_completed_callback_ = app_completed_callback; | 39 app_completed_callback_ = app_completed_callback; |
40 | 40 |
41 std::string name = app_path.BaseName().RemoveExtension().MaybeAsASCII(); | 41 std::string name = app_path.BaseName().RemoveExtension().MaybeAsASCII(); |
42 child_process_host_.reset(new ChildProcessHost(context_, name)); | 42 child_process_host_.reset(new ChildProcessHost(context_, name)); |
43 child_process_host_->Start(); | 43 child_process_host_->Start(); |
44 | 44 |
45 // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe. | 45 // TODO(vtl): |app_path.AsUTF8Unsafe()| is unsafe. |
46 child_process_host_->StartApp( | 46 child_process_host_->StartApp( |
47 app_path.AsUTF8Unsafe(), cleanup == NativeApplicationCleanup::DELETE, | 47 app_path.AsUTF8Unsafe(), |
| 48 cleanup == shell::NativeApplicationCleanup::DELETE, |
48 application_request.Pass(), | 49 application_request.Pass(), |
49 base::Bind(&OutOfProcessNativeRunner::AppCompleted, | 50 base::Bind(&OutOfProcessNativeRunner::AppCompleted, |
50 base::Unretained(this))); | 51 base::Unretained(this))); |
51 } | 52 } |
52 | 53 |
53 void OutOfProcessNativeRunner::AppCompleted(int32_t result) { | 54 void OutOfProcessNativeRunner::AppCompleted(int32_t result) { |
54 DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")"; | 55 DVLOG(2) << "OutOfProcessNativeRunner::AppCompleted(" << result << ")"; |
55 | 56 |
56 child_process_host_.reset(); | 57 child_process_host_.reset(); |
57 // This object may be deleted by this callback. | 58 // This object may be deleted by this callback. |
58 base::Closure app_completed_callback = app_completed_callback_; | 59 base::Closure app_completed_callback = app_completed_callback_; |
59 app_completed_callback_.Reset(); | 60 app_completed_callback_.Reset(); |
60 app_completed_callback.Run(); | 61 app_completed_callback.Run(); |
61 } | 62 } |
62 | 63 |
63 scoped_ptr<NativeRunner> OutOfProcessNativeRunnerFactory::Create( | 64 scoped_ptr<shell::NativeRunner> OutOfProcessNativeRunnerFactory::Create( |
64 const Options& options) { | 65 const Options& options) { |
65 if (options.force_in_process) | 66 if (options.force_in_process) |
66 return make_scoped_ptr(new InProcessNativeRunner(context_)); | 67 return make_scoped_ptr(new InProcessNativeRunner(context_)); |
67 | 68 |
68 return make_scoped_ptr(new OutOfProcessNativeRunner(context_)); | 69 return make_scoped_ptr(new OutOfProcessNativeRunner(context_)); |
69 } | 70 } |
70 | 71 |
71 } // namespace shell | 72 } // namespace runner |
72 } // namespace mojo | 73 } // namespace mojo |
OLD | NEW |