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

Side by Side Diff: components/arc/arc_bridge_service.cc

Issue 1481523002: arc-bridge: Split ArcBridgeService to common part and IPC based impl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: discard using std::move. Update unittest Created 5 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
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/arc/arc_bridge_service.h" 5 #include "components/arc/arc_bridge_service.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/sequenced_task_runner.h"
9 #include "base/files/file_util.h"
10 #include "base/prefs/pref_registry_simple.h"
11 #include "base/prefs/pref_service.h"
12 #include "base/task_runner_util.h"
13 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
14 #include "chromeos/chromeos_switches.h" 10 #include "chromeos/chromeos_switches.h"
15 #include "chromeos/dbus/dbus_method_call_status.h" 11 #include "components/arc/arc_bridge_service_impl.h"
16 #include "chromeos/dbus/dbus_thread_manager.h"
17 #include "chromeos/dbus/session_manager_client.h"
18 #include "components/arc/common/arc_host_messages.h"
19 #include "components/arc/common/arc_instance_messages.h"
20 #include "ipc/ipc_channel.h"
21 12
22 namespace arc { 13 namespace arc {
23 14
24 namespace { 15 namespace {
25 16
26 const base::FilePath::CharType kArcBridgeSocketPath[] =
27 FILE_PATH_LITERAL("/home/chronos/ArcBridge/bridge.sock");
28
29 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos. 17 // Weak pointer. This class is owned by ChromeBrowserMainPartsChromeos.
30 ArcBridgeService* g_arc_bridge_service = nullptr; 18 ArcBridgeService* g_arc_bridge_service = nullptr;
31 19
32 } // namespace 20 } // namespace
33 21
34 ArcBridgeService::ArcBridgeService( 22 ArcBridgeService::ArcBridgeService()
35 const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner,
36 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner)
37 : origin_task_runner_(base::ThreadTaskRunnerHandle::Get()), 23 : origin_task_runner_(base::ThreadTaskRunnerHandle::Get()),
38 ipc_task_runner_(ipc_task_runner),
39 file_task_runner_(file_task_runner),
40 session_started_(false),
41 available_(false), 24 available_(false),
42 state_(State::STOPPED), 25 state_(State::STOPPED) {
43 weak_factory_(this) {
44 DCHECK(!g_arc_bridge_service); 26 DCHECK(!g_arc_bridge_service);
45 g_arc_bridge_service = this; 27 g_arc_bridge_service = this;
46 } 28 }
47 29
48 ArcBridgeService::~ArcBridgeService() { 30 ArcBridgeService::~ArcBridgeService() {
49 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 31 DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
50 DCHECK(state_ == State::STOPPING || state_ == State::STOPPED); 32 DCHECK(state() == State::STOPPING || state() == State::STOPPED);
51 DCHECK(g_arc_bridge_service); 33 DCHECK(g_arc_bridge_service == this);
52 g_arc_bridge_service = nullptr; 34 g_arc_bridge_service = nullptr;
53 } 35 }
54 36
55 // static 37 // static
56 ArcBridgeService* ArcBridgeService::Get() { 38 ArcBridgeService* ArcBridgeService::Get() {
57 DCHECK(g_arc_bridge_service); 39 DCHECK(g_arc_bridge_service);
58 DCHECK(g_arc_bridge_service->origin_task_runner_->RunsTasksOnCurrentThread()); 40 DCHECK(g_arc_bridge_service->origin_task_runner()->
41 RunsTasksOnCurrentThread());
59 return g_arc_bridge_service; 42 return g_arc_bridge_service;
60 } 43 }
61 44
62 // static 45 // static
63 bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) { 46 bool ArcBridgeService::GetEnabled(const base::CommandLine* command_line) {
64 return command_line->HasSwitch(chromeos::switches::kEnableArc); 47 return command_line->HasSwitch(chromeos::switches::kEnableArc);
65 } 48 }
66 49
67 void ArcBridgeService::DetectAvailability() {
68 chromeos::SessionManagerClient* session_manager_client =
69 chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
70 session_manager_client->CheckArcAvailability(base::Bind(
71 &ArcBridgeService::OnArcAvailable, weak_factory_.GetWeakPtr()));
72 }
73
74 void ArcBridgeService::HandleStartup() {
75 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
76 session_started_ = true;
77 PrerequisitesChanged();
78 }
79
80 void ArcBridgeService::Shutdown() {
81 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
82 session_started_ = false;
83 PrerequisitesChanged();
84 }
85
86 void ArcBridgeService::AddObserver(Observer* observer) { 50 void ArcBridgeService::AddObserver(Observer* observer) {
87 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 51 DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
88 observer_list_.AddObserver(observer); 52 observer_list_.AddObserver(observer);
89 } 53 }
90 54
91 void ArcBridgeService::RemoveObserver(Observer* observer) { 55 void ArcBridgeService::RemoveObserver(Observer* observer) {
92 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 56 DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
93 observer_list_.RemoveObserver(observer); 57 observer_list_.RemoveObserver(observer);
94 } 58 }
95 59
96 void ArcBridgeService::PrerequisitesChanged() {
97 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
98 if (state_ == State::STOPPED) {
99 if (!available_ || !session_started_)
100 return;
101 SocketConnect(base::FilePath(kArcBridgeSocketPath));
102 } else {
103 if (available_ && session_started_)
104 return;
105 StopInstance();
106 }
107 }
108
109 void ArcBridgeService::StopInstance() {
110 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
111 if (state_ == State::STOPPED || state_ == State::STOPPING) {
112 VLOG(1) << "StopInstance() called when ARC is not running";
113 return;
114 }
115 if (state_ == State::CONNECTED || state_ == State::CONNECTING) {
116 // This was stopped before the D-Bus command to start the instance. Just
117 // close the socket (if it was opened).
118 if (state_ == State::CONNECTED) {
119 ipc_channel_.reset();
120 }
121 SetState(State::STOPPED);
122 return;
123 }
124
125 SetState(State::STOPPING);
126 chromeos::SessionManagerClient* session_manager_client =
127 chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
128 session_manager_client->StopArcInstance(base::Bind(
129 &ArcBridgeService::OnInstanceStopped, weak_factory_.GetWeakPtr()));
130 }
131
132 bool ArcBridgeService::RegisterInputDevice(const std::string& name,
133 const std::string& device_type,
134 base::ScopedFD fd) {
135 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
136 if (state_ != State::READY) {
137 LOG(ERROR) << "Called RegisterInputDevice when the service is not ready";
138 return false;
139 }
140 return ipc_channel_->Send(new ArcInstanceMsg_RegisterInputDevice(
141 name, device_type, base::FileDescriptor(fd.Pass())));
142 }
143
144 void ArcBridgeService::SocketConnect(const base::FilePath& socket_path) {
145 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
146 if (state_ != State::STOPPED) {
147 VLOG(1) << "SocketConnect() called when instance is not stopped";
148 return;
149 }
150 SetState(State::CONNECTING);
151 base::PostTaskAndReplyWithResult(
152 file_task_runner_.get(), FROM_HERE,
153 base::Bind(&base::CreateDirectory, socket_path.DirName()),
154 base::Bind(&ArcBridgeService::SocketConnectAfterEnsureParentDirectory,
155 weak_factory_.GetWeakPtr(), socket_path));
156 }
157
158 void ArcBridgeService::SocketConnectAfterEnsureParentDirectory(
159 const base::FilePath& socket_path,
160 bool directory_present) {
161 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
162 if (state_ != State::CONNECTING) {
163 VLOG(1) << "StopInstance() called while connecting";
164 return;
165 }
166 if (!directory_present) {
167 LOG(ERROR) << "Error creating directory for " << socket_path.value();
168 StopInstance();
169 return;
170 }
171
172 if (!Connect(IPC::ChannelHandle(socket_path.value()),
173 IPC::Channel::MODE_OPEN_NAMED_SERVER)) {
174 LOG(ERROR) << "Error connecting to " << socket_path.value();
175 StopInstance();
176 return;
177 }
178
179 base::PostTaskAndReplyWithResult(
180 file_task_runner_.get(), FROM_HERE,
181 // TODO(lhchavez): Tighten the security around the socket by tying it to
182 // the user the instance will run as.
183 base::Bind(&base::SetPosixFilePermissions, socket_path, 0777),
184 base::Bind(&ArcBridgeService::SocketConnectAfterSetSocketPermissions,
185 weak_factory_.GetWeakPtr(), socket_path));
186 }
187
188 bool ArcBridgeService::Connect(const IPC::ChannelHandle& handle,
189 IPC::Channel::Mode mode) {
190 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
191 if (state_ != State::CONNECTING) {
192 VLOG(1) << "StopInstance() called while connecting";
193 return false;
194 }
195
196 ipc_channel_ =
197 IPC::ChannelProxy::Create(handle, mode, this, ipc_task_runner_.get());
198 if (!ipc_channel_)
199 return false;
200 SetState(State::CONNECTED);
201 return true;
202 }
203
204 void ArcBridgeService::SocketConnectAfterSetSocketPermissions(
205 const base::FilePath& socket_path,
206 bool socket_permissions_success) {
207 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
208 if (state_ != State::CONNECTED) {
209 VLOG(1) << "StopInstance() called while connecting";
210 return;
211 }
212
213 if (!socket_permissions_success) {
214 LOG(ERROR) << "Error setting socket permissions for "
215 << socket_path.value();
216 StopInstance();
217 return;
218 }
219
220 SetState(State::STARTING);
221 chromeos::SessionManagerClient* session_manager_client =
222 chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
223 session_manager_client->StartArcInstance(
224 socket_path.value(), base::Bind(&ArcBridgeService::OnInstanceStarted,
225 weak_factory_.GetWeakPtr()));
226 }
227
228 void ArcBridgeService::OnInstanceStarted(bool success) {
229 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
230 if (state_ != State::STARTING) {
231 VLOG(1) << "StopInstance() called while connecting";
232 return;
233 }
234 if (!success) {
235 LOG(ERROR) << "ARC instance unable to start. Shutting down the bridge";
236 StopInstance();
237 return;
238 }
239 }
240
241 void ArcBridgeService::OnInstanceBootPhase(InstanceBootPhase phase) {
242 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
243 // The state can be STARTING the first time this is called, and will then
244 // transition to READY after BRIDGE_READY has been passed.
245 if (state_ != State::STARTING && state_ != State::READY) {
246 VLOG(1) << "StopInstance() called while connecting";
247 return;
248 }
249 if (phase == InstanceBootPhase::BRIDGE_READY) {
250 SetState(State::READY);
251 }
252 FOR_EACH_OBSERVER(Observer, observer_list_, OnInstanceBootPhase(phase));
253 }
254
255 void ArcBridgeService::SetState(State state) { 60 void ArcBridgeService::SetState(State state) {
256 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 61 DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
257 // DCHECK on enum classes not supported. 62 // DCHECK on enum classes not supported.
258 DCHECK(state_ != state); 63 DCHECK(state_ != state);
259 state_ = state; 64 state_ = state;
260 FOR_EACH_OBSERVER(Observer, observer_list_, OnStateChanged(state_)); 65 FOR_EACH_OBSERVER(Observer, observer_list(), OnStateChanged(state_));
261 } 66 }
262 67
263 bool ArcBridgeService::OnMessageReceived(const IPC::Message& message) { 68 void ArcBridgeService::SetAvailable(bool available) {
264 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 69 DCHECK(origin_task_runner()->RunsTasksOnCurrentThread());
265 bool handled = true; 70 DCHECK(available_ != available);
266 71 available_ = available;
267 IPC_BEGIN_MESSAGE_MAP(ArcBridgeService, message) 72 FOR_EACH_OBSERVER(Observer, observer_list(), OnAvailableChanged(available_));
268 IPC_MESSAGE_HANDLER(ArcInstanceHostMsg_InstanceBootPhase,
269 OnInstanceBootPhase)
270 IPC_MESSAGE_UNHANDLED(handled = false)
271 IPC_END_MESSAGE_MAP()
272
273 if (!handled)
274 LOG(ERROR) << "Invalid message with type = " << message.type();
275 return handled;
276 } 73 }
277 74
278 void ArcBridgeService::OnArcAvailable(bool available) { 75 // static
279 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread()); 76 scoped_ptr<ArcBridgeService> ArcBridgeService::Create(
280 if (available_ == available) 77 const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner,
281 return; 78 const scoped_refptr<base::SequencedTaskRunner>& file_task_runner) {
282 available_ = available; 79 return make_scoped_ptr(new ArcBridgeServiceImpl(ipc_task_runner,
283 FOR_EACH_OBSERVER(Observer, observer_list_, OnAvailableChanged(available_)); 80 file_task_runner));
284 PrerequisitesChanged();
285 }
286
287 void ArcBridgeService::OnInstanceStopped(bool success) {
288 DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
289 // STOPPING is the only valid state for this function.
290 // DCHECK on enum classes not supported.
291 DCHECK(state_ == State::STOPPING);
292 ipc_channel_.reset();
293 SetState(State::STOPPED);
294 } 81 }
295 82
296 } // namespace arc 83 } // namespace arc
OLDNEW
« no previous file with comments | « components/arc/arc_bridge_service.h ('k') | components/arc/arc_bridge_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698