OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_context.h" | 5 #include "device/usb/usb_context.h" |
6 | 6 |
7 #include "base/atomicops.h" | 7 #include "base/atomicops.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/threading/platform_thread.h" | 9 #include "base/threading/platform_thread.h" |
10 #include "device/usb/usb_error.h" | 10 #include "device/usb/usb_error.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 } | 56 } |
57 } | 57 } |
58 | 58 |
59 VLOG(1) << "UsbEventHandler shutting down."; | 59 VLOG(1) << "UsbEventHandler shutting down."; |
60 delete this; | 60 delete this; |
61 } | 61 } |
62 | 62 |
63 void UsbContext::UsbEventHandler::Stop() { | 63 void UsbContext::UsbEventHandler::Stop() { |
64 base::subtle::Release_Store(&running_, 0); | 64 base::subtle::Release_Store(&running_, 0); |
65 libusb_interrupt_handle_event(context_); | 65 libusb_interrupt_handle_event(context_); |
| 66 base::PlatformThread::Join(thread_handle_); |
66 } | 67 } |
67 | 68 |
68 UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { | 69 UsbContext::UsbContext(PlatformUsbContext context) : context_(context) { |
69 // Ownership of the PlatformUsbContext is passed to the event handler thread. | 70 // Ownership of the PlatformUsbContext is passed to the event handler thread. |
70 event_handler_ = new UsbEventHandler(context_); | 71 event_handler_ = new UsbEventHandler(context_); |
71 } | 72 } |
72 | 73 |
73 UsbContext::~UsbContext() { | 74 UsbContext::~UsbContext() { |
74 DCHECK(thread_checker_.CalledOnValidThread()); | 75 DCHECK(thread_checker_.CalledOnValidThread()); |
75 event_handler_->Stop(); | 76 event_handler_->Stop(); |
76 } | 77 } |
77 | 78 |
78 } // namespace device | 79 } // namespace device |
OLD | NEW |