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

Side by Side Diff: device/generic_sensor/sensor_provider_impl.cc

Issue 2368193003: [sensors] Introduce asynchronous way to create sensors. (Closed)
Patch Set: avoid potential future reentrancy problems Created 4 years, 2 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
« no previous file with comments | « device/generic_sensor/sensor_provider_impl.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "device/generic_sensor/sensor_provider_impl.h" 5 #include "device/generic_sensor/sensor_provider_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "device/generic_sensor/platform_sensor_provider.h" 9 #include "device/generic_sensor/platform_sensor_provider.h"
10 #include "device/generic_sensor/sensor_impl.h" 10 #include "device/generic_sensor/sensor_impl.h"
11 #include "mojo/public/cpp/bindings/strong_binding.h" 11 #include "mojo/public/cpp/bindings/strong_binding.h"
12 12
13 namespace device { 13 namespace device {
14 14
15 namespace { 15 namespace {
16 16
17 uint64_t GetBufferOffset(mojom::SensorType type) { 17 uint64_t GetBufferOffset(mojom::SensorType type) {
18 return (static_cast<uint64_t>(mojom::SensorType::LAST) - 18 return (static_cast<uint64_t>(mojom::SensorType::LAST) -
19 static_cast<uint64_t>(type)) * 19 static_cast<uint64_t>(type)) *
20 mojom::SensorInitParams::kReadBufferSize; 20 mojom::SensorInitParams::kReadBufferSize;
21 } 21 }
22 22
23 void RunCallback(mojom::SensorInitParamsPtr init_params,
24 SensorImpl* sensor,
25 const SensorProviderImpl::GetSensorCallback& callback) {
26 callback.Run(std::move(init_params), sensor->GetClient());
27 }
28
23 } // namespace 29 } // namespace
24 30
25 // static 31 // static
26 void SensorProviderImpl::Create(mojom::SensorProviderRequest request) { 32 void SensorProviderImpl::Create(mojom::SensorProviderRequest request) {
27 PlatformSensorProvider* provider = PlatformSensorProvider::GetInstance(); 33 PlatformSensorProvider* provider = PlatformSensorProvider::GetInstance();
28 if (provider) { 34 if (provider) {
29 mojo::MakeStrongBinding(base::WrapUnique(new SensorProviderImpl(provider)), 35 mojo::MakeStrongBinding(base::WrapUnique(new SensorProviderImpl(provider)),
30 std::move(request)); 36 std::move(request));
31 } 37 }
32 } 38 }
33 39
34 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider) 40 SensorProviderImpl::SensorProviderImpl(PlatformSensorProvider* provider)
35 : provider_(provider) { 41 : provider_(provider), weak_ptr_factory_(this) {
36 DCHECK(provider_); 42 DCHECK(provider_);
37 } 43 }
38 44
39 SensorProviderImpl::~SensorProviderImpl() {} 45 SensorProviderImpl::~SensorProviderImpl() {}
40 46
41 void SensorProviderImpl::GetSensor(mojom::SensorType type, 47 void SensorProviderImpl::GetSensor(mojom::SensorType type,
42 mojom::SensorRequest sensor_request, 48 mojom::SensorRequest sensor_request,
43 const GetSensorCallback& callback) { 49 const GetSensorCallback& callback) {
44 auto cloned_handle = provider_->CloneSharedBufferHandle(); 50 auto cloned_handle = provider_->CloneSharedBufferHandle();
45 if (!cloned_handle.is_valid()) { 51 if (!cloned_handle.is_valid()) {
46 callback.Run(nullptr, nullptr); 52 callback.Run(nullptr, nullptr);
timvolodine 2016/10/04 18:39:15 also posttask?
47 return; 53 return;
48 } 54 }
49 55
50 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type); 56 scoped_refptr<PlatformSensor> sensor = provider_->GetSensor(type);
51 if (!sensor) { 57 if (!sensor) {
52 sensor = provider_->CreateSensor( 58 PlatformSensorProviderBase::CreateSensorCallback cb = base::Bind(
53 type, mojom::SensorInitParams::kReadBufferSize, GetBufferOffset(type)); 59 &SensorProviderImpl::SensorCreated, weak_ptr_factory_.GetWeakPtr(),
60 type, base::Passed(&cloned_handle), base::Passed(&sensor_request),
61 callback);
62 provider_->CreateSensor(type, mojom::SensorInitParams::kReadBufferSize,
63 GetBufferOffset(type), cb);
64 return;
54 } 65 }
55 66
67 SensorCreated(type, std::move(cloned_handle), std::move(sensor_request),
68 callback, std::move(sensor));
69 }
70
71 void SensorProviderImpl::SensorCreated(
72 mojom::SensorType type,
73 mojo::ScopedSharedBufferHandle cloned_handle,
74 mojom::SensorRequest sensor_request,
75 const GetSensorCallback& callback,
76 scoped_refptr<PlatformSensor> sensor) {
56 if (!sensor) { 77 if (!sensor) {
57 callback.Run(nullptr, nullptr); 78 callback.Run(nullptr, nullptr);
timvolodine 2016/10/04 18:39:15 and here?
58 return; 79 return;
59 } 80 }
60 81
61 auto sensor_impl = base::MakeUnique<SensorImpl>(sensor); 82 auto sensor_impl = base::MakeUnique<SensorImpl>(sensor);
62 83
63 auto init_params = mojom::SensorInitParams::New(); 84 auto init_params = mojom::SensorInitParams::New();
64 init_params->memory = std::move(cloned_handle); 85 init_params->memory = std::move(cloned_handle);
65 init_params->buffer_offset = GetBufferOffset(type); 86 init_params->buffer_offset = GetBufferOffset(type);
66 init_params->mode = sensor->GetReportingMode(); 87 init_params->mode = sensor->GetReportingMode();
67 init_params->default_configuration = sensor->GetDefaultConfiguration(); 88 init_params->default_configuration = sensor->GetDefaultConfiguration();
68 89
69 callback.Run(std::move(init_params), sensor_impl->GetClient()); 90 base::MessageLoop::current()->task_runner()->PostTask(
timvolodine 2016/10/04 18:39:15 maybe use a helper function for this because in mu
91 FROM_HERE, base::Bind(RunCallback, base::Passed(&init_params),
92 sensor_impl.get(), callback));
70 93
71 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request)); 94 mojo::MakeStrongBinding(std::move(sensor_impl), std::move(sensor_request));
72 } 95 }
73 96
74 } // namespace device 97 } // namespace device
OLDNEW
« no previous file with comments | « device/generic_sensor/sensor_provider_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698