ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "adbd: fix a case where we can fail to join a thread." am: b530537d46

Browse source 
am: ace5a7c799

Change-Id: I99042d0d5e68dfb0a9ae63e78c9974c1c8d90fa2
This commit is contained in:
Josh Gao 2019-03-01 02:25:18 -08:00 • committed by android-build-merger
commit ee76606206
1 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
adb/daemon/usb.cpp
View file

@ -260,7 +260,6 @@ struct UsbFfsConnection : public Connection {
// until it dies, and then report failure to the transport via HandleError, which will // until it dies, and then report failure to the transport via HandleError, which will
// eventually result in the transport being destroyed, which will result in UsbFfsConnection // eventually result in the transport being destroyed, which will result in UsbFfsConnection
// being destroyed, which unblocks the open thread and restarts this entire process. // being destroyed, which unblocks the open thread and restarts this entire process.
static constexpr int kInterruptionSignal = SIGUSR1;
static std::once_flag handler_once; static std::once_flag handler_once;
std::call_once(handler_once, []() { signal(kInterruptionSignal, [](int) {}); }); std::call_once(handler_once, []() { signal(kInterruptionSignal, [](int) {}); });
@ -286,6 +285,7 @@ struct UsbFfsConnection : public Connection {
} else if (rc == 0) { } else if (rc == 0) {
// Something in the kernel presumably went wrong. // Something in the kernel presumably went wrong.
// Close our endpoints, wait for a bit, and then try again. // Close our endpoints, wait for a bit, and then try again.
StopWorker();
aio_context_.reset(); aio_context_.reset();
read_fd_.reset(); read_fd_.reset();
write_fd_.reset(); write_fd_.reset();
@ -311,7 +311,7 @@ struct UsbFfsConnection : public Connection {
switch (event.type) { switch (event.type) {
case FUNCTIONFS_BIND: case FUNCTIONFS_BIND:
CHECK(!started) << "received FUNCTIONFS_ENABLE while already bound?"; CHECK(!bound) << "received FUNCTIONFS_BIND while already bound?";
bound = true; bound = true;
break; break;
@ -327,28 +327,7 @@ struct UsbFfsConnection : public Connection {
} }
} }
pthread_t worker_thread_handle = worker_thread_.native_handle(); StopWorker();
while (true) {
int rc = pthread_kill(worker_thread_handle, kInterruptionSignal);
if (rc != 0) {
LOG(ERROR) << "failed to send interruption signal to worker: " << strerror(rc);
break;
}
std::this_thread::sleep_for(100ms);
rc = pthread_kill(worker_thread_handle, 0);
if (rc == 0) {
continue;
} else if (rc == ESRCH) {
break;
} else {
LOG(ERROR) << "failed to send interruption signal to worker: " << strerror(rc);
}
}
worker_thread_.join();
aio_context_.reset(); aio_context_.reset();
read_fd_.reset(); read_fd_.reset();
write_fd_.reset(); write_fd_.reset();
@ -379,6 +358,30 @@ struct UsbFfsConnection : public Connection {
}); });
} }
void StopWorker() {
pthread_t worker_thread_handle = worker_thread_.native_handle();
while (true) {
int rc = pthread_kill(worker_thread_handle, kInterruptionSignal);
if (rc != 0) {
LOG(ERROR) << "failed to send interruption signal to worker: " << strerror(rc);
break;
}
std::this_thread::sleep_for(100ms);
rc = pthread_kill(worker_thread_handle, 0);
if (rc == 0) {
continue;
} else if (rc == ESRCH) {
break;
} else {
LOG(ERROR) << "failed to send interruption signal to worker: " << strerror(rc);
}
}
worker_thread_.join();
}
void PrepareReadBlock(IoBlock* block, uint64_t id) { void PrepareReadBlock(IoBlock* block, uint64_t id) {
block->pending = false; block->pending = false;
block->payload = std::make_shared<Block>(kUsbReadSize); block->payload = std::make_shared<Block>(kUsbReadSize);
@ -615,6 +618,8 @@ struct UsbFfsConnection : public Connection {
std::deque<std::unique_ptr<IoBlock>> write_requests_ GUARDED_BY(write_mutex_); std::deque<std::unique_ptr<IoBlock>> write_requests_ GUARDED_BY(write_mutex_);
size_t next_write_id_ GUARDED_BY(write_mutex_) = 0; size_t next_write_id_ GUARDED_BY(write_mutex_) = 0;
size_t writes_submitted_ GUARDED_BY(write_mutex_) = 0; size_t writes_submitted_ GUARDED_BY(write_mutex_) = 0;
static constexpr int kInterruptionSignal = SIGUSR1;
}; };
void usb_init_legacy(); void usb_init_legacy();