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

Side by Side Diff: device/usb/usb_service.cc

Issue 2849953003: Use the task scheduler for blocking tasks in the USB service on Linux (Closed)
Patch Set: Remove more passing of the SequencedTaskRunner Created 3 years, 7 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/usb/usb_service.h ('k') | device/usb/usb_service_android.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 "device/usb/usb_service.h" 5 #include "device/usb/usb_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/feature_list.h" 8 #include "base/feature_list.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/task_scheduler/post_task.h"
11 #include "base/threading/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "components/device_event_log/device_event_log.h" 14 #include "components/device_event_log/device_event_log.h"
14 #include "device/base/features.h" 15 #include "device/base/features.h"
15 #include "device/usb/usb_device.h" 16 #include "device/usb/usb_device.h"
16 #include "device/usb/usb_device_handle.h" 17 #include "device/usb/usb_device_handle.h"
17 18
18 #if defined(OS_ANDROID) 19 #if defined(OS_ANDROID)
19 #include "device/usb/usb_service_android.h" 20 #include "device/usb/usb_service_android.h"
20 #elif defined(USE_UDEV) 21 #elif defined(USE_UDEV)
(...skipping 18 matching lines...) Expand all
39 void UsbService::Observer::OnDeviceRemovedCleanup( 40 void UsbService::Observer::OnDeviceRemovedCleanup(
40 scoped_refptr<UsbDevice> device) { 41 scoped_refptr<UsbDevice> device) {
41 } 42 }
42 43
43 void UsbService::Observer::WillDestroyUsbService() {} 44 void UsbService::Observer::WillDestroyUsbService() {}
44 45
45 // static 46 // static
46 std::unique_ptr<UsbService> UsbService::Create( 47 std::unique_ptr<UsbService> UsbService::Create(
47 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) { 48 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner) {
48 #if defined(OS_ANDROID) 49 #if defined(OS_ANDROID)
49 return base::WrapUnique(new UsbServiceAndroid(blocking_task_runner)); 50 return base::WrapUnique(new UsbServiceAndroid());
50 #elif defined(USE_UDEV) 51 #elif defined(USE_UDEV)
51 return base::WrapUnique(new UsbServiceLinux(blocking_task_runner)); 52 return base::WrapUnique(new UsbServiceLinux());
52 #elif defined(OS_WIN) 53 #elif defined(OS_WIN)
53 if (base::FeatureList::IsEnabled(kNewUsbBackend)) 54 if (base::FeatureList::IsEnabled(kNewUsbBackend))
54 return base::WrapUnique(new UsbServiceWin(blocking_task_runner)); 55 return base::WrapUnique(new UsbServiceWin(blocking_task_runner));
55 else 56 else
56 return base::WrapUnique(new UsbServiceImpl(blocking_task_runner)); 57 return base::WrapUnique(new UsbServiceImpl(blocking_task_runner));
57 #elif defined(OS_MACOSX) 58 #elif defined(OS_MACOSX)
58 return base::WrapUnique(new UsbServiceImpl(blocking_task_runner)); 59 return base::WrapUnique(new UsbServiceImpl(blocking_task_runner));
59 #else 60 #else
60 return nullptr; 61 return nullptr;
61 #endif 62 #endif
62 } 63 }
63 64
65 // static
66 scoped_refptr<base::SequencedTaskRunner>
67 UsbService::CreateBlockingTaskRunner() {
68 return base::CreateSequencedTaskRunnerWithTraits(
69 base::TaskTraits()
70 .MayBlock()
71 .WithPriority(base::TaskPriority::USER_VISIBLE)
72 .WithShutdownBehavior(
73 base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN));
74 }
75
64 UsbService::~UsbService() { 76 UsbService::~UsbService() {
65 #if DCHECK_IS_ON() 77 #if DCHECK_IS_ON()
66 DCHECK(did_shutdown_); 78 DCHECK(did_shutdown_);
67 #endif 79 #endif
68 for (const auto& map_entry : devices_) 80 for (const auto& map_entry : devices_)
69 map_entry.second->OnDisconnect(); 81 map_entry.second->OnDisconnect();
70 for (auto& observer : observer_list_) 82 for (auto& observer : observer_list_)
71 observer.WillDestroyUsbService(); 83 observer.WillDestroyUsbService();
72 } 84 }
73 85
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 DCHECK(CalledOnValidThread()); 178 DCHECK(CalledOnValidThread());
167 179
168 for (auto& observer : observer_list_) 180 for (auto& observer : observer_list_)
169 observer.OnDeviceRemoved(device); 181 observer.OnDeviceRemoved(device);
170 device->NotifyDeviceRemoved(); 182 device->NotifyDeviceRemoved();
171 for (auto& observer : observer_list_) 183 for (auto& observer : observer_list_)
172 observer.OnDeviceRemovedCleanup(device); 184 observer.OnDeviceRemovedCleanup(device);
173 } 185 }
174 186
175 } // namespace device 187 } // namespace device
OLDNEW
« no previous file with comments | « device/usb/usb_service.h ('k') | device/usb/usb_service_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698