Web MIDI: add dynamic MidiManager instantiation support for Linux

media/midi/midi_service.cc

Index: media/midi/midi_service.cc
diff --git a/media/midi/midi_service.cc b/media/midi/midi_service.cc
index 0d0112459a8c65939aa85a79ae81db5b80fd5129..cb68981a3c9362e3796d02997e73db4a36b090c2 100644
--- a/media/midi/midi_service.cc
+++ b/media/midi/midi_service.cc
@@ -4,36 +4,84 @@
 
 #include "media/midi/midi_service.h"
 
+#include "base/feature_list.h"
+#include "base/memory/ptr_util.h"
+#include "base/strings/stringprintf.h"
 #include "media/midi/midi_manager.h"
+#include "media/midi/midi_switches.h"
 
 namespace midi {
 
-MidiService::MidiService(std::unique_ptr<MidiManager> manager) {
+namespace {
+
+bool IsDynamicInstantiationEnabled() {
+// TODO(toyoshim): Support on all platforms. See https://crbug.com/672793.
+#if defined(OS_LINUX)
+  return base::FeatureList::IsEnabled(
+      features::kMidiManagerDynamicInstantiation);
+#else
+  return false;
+#endif
+}
+
+}  // namespace
+
+MidiService::MidiService(void)
+    : is_dynamic_instantiation_enabled_(IsDynamicInstantiationEnabled()) {
   base::AutoLock lock(lock_);
-  if (manager.get())
-    manager_ = std::move(manager);
-  else
-    manager_.reset(MidiManager::Create());
+
+  active_clients_ = 0u;

[yhirano, 2017/02/08 10:04:37]

Can you move this initialization to the member initialization list (or the
header)?

[Takashi Toyoshima, 2017/02/08 11:08:56]

Done.

+  if (!is_dynamic_instantiation_enabled_)
+    manager_ = base::WrapUnique(MidiManager::Create(this));
+}
+
+MidiService::MidiService(std::unique_ptr<MidiManager> manager)
+    : is_dynamic_instantiation_enabled_(false) {
+  base::AutoLock lock(lock_);
+
+  active_clients_ = 0u;

[yhirano, 2017/02/08 10:04:37]

ditto

[Takashi Toyoshima, 2017/02/08 11:08:56]

Done.

+  manager_ = std::move(manager);
 }
 
 MidiService::~MidiService() {
   base::AutoLock lock(lock_);
+
   manager_.reset();
+
+  base::AutoLock threads_lock(threads_lock_);
+  threads_.clear();
 }
 
 void MidiService::Shutdown() {
   base::AutoLock lock(lock_);
-  manager_->Shutdown();
+  if (manager_.get())
+    manager_->Shutdown();
 }
 
 void MidiService::StartSession(MidiManagerClient* client) {
   base::AutoLock lock(lock_);
+  if (!manager_.get()) {
+    CHECK(is_dynamic_instantiation_enabled_);
+    CHECK_EQ(0u, active_clients_);
+    manager_.reset(MidiManager::Create(this));
+  }
+  active_clients_++;
   manager_->StartSession(client);
 }
 
 void MidiService::EndSession(MidiManagerClient* client) {
   base::AutoLock lock(lock_);
+  CHECK(manager_.get());
+  CHECK_NE(0u, active_clients_);
   manager_->EndSession(client);
+  active_clients_--;
+  if (is_dynamic_instantiation_enabled_ && !active_clients_) {
+    // MidiManager for each platform should be able to shutdown correctly even
+    // if following Shutdown() call happens in the middle of
+    // StartInitialization() to support the dynamic instantiation feature.
+    manager_->Shutdown();
+    manager_.reset();
+  }
 }
 
 void MidiService::DispatchSendMidiData(MidiManagerClient* client,
@@ -44,4 +92,17 @@ void MidiService::DispatchSendMidiData(MidiManagerClient* client,
   manager_->DispatchSendMidiData(client, port_index, data, timestamp);
 }
 
+scoped_refptr<base::SingleThreadTaskRunner> MidiService::GetTaskRunner(
+    size_t runner_id) {
+  base::AutoLock lock(threads_lock_);
+  if (threads_.size() <= runner_id)
+    threads_.resize(runner_id + 1);
+  if (!threads_[runner_id].get()) {
+    threads_[runner_id] = base::MakeUnique<base::Thread>(
+        base::StringPrintf("MidiServiceThread(%zu)", runner_id));
+    threads_[runner_id]->Start();
+  }
+  return threads_[runner_id]->task_runner();
+}
+
 }  // namespace midi