[PATCH 11/11] ozone: evdev: Add dedicated events thread

ui/events/ozone/evdev/event_thread_evdev.cc

Index: ui/events/ozone/evdev/event_thread_evdev.cc
diff --git a/ui/events/ozone/evdev/event_thread_evdev.cc b/ui/events/ozone/evdev/event_thread_evdev.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b90e34ca9364aaee955c2eb69bb47a5eeca2cff6
--- /dev/null
+++ b/ui/events/ozone/evdev/event_thread_evdev.cc
@@ -0,0 +1,82 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ui/events/ozone/evdev/event_thread_evdev.h"
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/debug/trace_event.h"
+#include "base/logging.h"
+#include "base/thread_task_runner_handle.h"
+#include "base/threading/thread.h"
+#include "ui/events/ozone/evdev/device_event_dispatcher_evdev.h"
+#include "ui/events/ozone/evdev/input_device_factory_evdev.h"
+#include "ui/events/ozone/evdev/input_device_factory_proxy_evdev.h"
+
+namespace ui {
+
+namespace {
+
+// Internal base::Thread subclass for events thread.
+class EvdevThread : public base::Thread {
+ public:
+  EvdevThread(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
+              CursorDelegateEvdev* cursor,
+              const EventThreadStartCallback& callback)
+      : base::Thread("evdev"),
+        dispatcher_(dispatcher.Pass()),
+        cursor_(cursor),
+        init_callback_(callback),
+        init_runner_(base::ThreadTaskRunnerHandle::Get()),
+        input_device_factory_(nullptr) {}
+  ~EvdevThread() override {}

[piman, 2015/01/28 00:07:26]

You need to call Stop() here to avoid subtle races.

~Thread will call Stop(), joining the thread, but that will only happen after
fields in this class are destructed. So there is a potential for the thread to
still execute tasks during the destruction of this class. (see warning in
base::Thread).

[spang, 2015/01/28 00:20:14]

Done.

Oops, missed the warning in all caps :(

+
+  void Init() override {
+    TRACE_EVENT0("ozone", "EvdevThread::Init");
+    input_device_factory_ =
+        new InputDeviceFactoryEvdev(dispatcher_.Pass(), cursor_);
+
+    scoped_ptr<InputDeviceFactoryProxyEvdev> proxy(
+        new InputDeviceFactoryProxyEvdev(base::ThreadTaskRunnerHandle::Get(),
+                                         input_device_factory_->GetWeakPtr()));
+
+    init_runner_->PostTask(FROM_HERE,
+                           base::Bind(init_callback_, base::Passed(&proxy)));
+  }
+
+  void CleanUp() override {
+    TRACE_EVENT0("ozone", "EvdevThread::CleanUp");
+    delete input_device_factory_;
+  }
+
+ private:
+  // Initialization bits passed from main thread.
+  scoped_ptr<DeviceEventDispatcherEvdev> dispatcher_;
+  CursorDelegateEvdev* cursor_;
+  EventThreadStartCallback init_callback_;
+  scoped_refptr<base::SingleThreadTaskRunner> init_runner_;
+
+  // Thread-internal state.
+  InputDeviceFactoryEvdev* input_device_factory_;
+};
+
+}  // namespace
+
+EventThreadEvdev::EventThreadEvdev() {
+}
+
+EventThreadEvdev::~EventThreadEvdev() {
+}
+
+void EventThreadEvdev::Start(scoped_ptr<DeviceEventDispatcherEvdev> dispatcher,
+                             CursorDelegateEvdev* cursor,
+                             const EventThreadStartCallback& callback) {
+  TRACE_EVENT0("ozone", "EventThreadEvdev::Start");
+  thread_.reset(new EvdevThread(dispatcher.Pass(), cursor, callback));
+  if (!thread_->StartWithOptions(
+          base::Thread::Options(base::MessageLoop::TYPE_UI, 0)))
+    LOG(FATAL) << "Failed to create input thread";
+}
+
+}  // namespace ui