replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make it possible to stop the operation thread in NativeProcessLinux 

Previously the operation thread is stopped with a cancel event but
pthread_cancel is not supported on android. This CL creates a custom
operation which asks the operation thread to exit without any pthread
call.

Differential revision: http://reviews.llvm.org/D7937

llvm-svn: 230945
This commit is contained in:
Tamas Berghammer 2015-03-02 11:04:03 +00:00
parent f1115fe0c5
commit 6806fded8c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
View File

@ -3370,6 +3370,15 @@ NativeProcessLinux::ServeOperation(OperationArgs *args)
assert(false && "Unexpected errno from sem_wait");
}
// nullptr as operation means the operation thread should exit. Cancel() can't be used
// because it is not supported on android.
if (!monitor->m_operation)
{
// notify calling thread that operation is complete
sem_post(&monitor->m_operation_done);
break;
}
reinterpret_cast<Operation*>(monitor->m_operation)->Execute(monitor);
// notify calling thread that operation is complete
@ -3555,8 +3564,8 @@ NativeProcessLinux::StopMonitoringChildProcess()
void
NativeProcessLinux::StopMonitor()
{
StopMonitoringChildProcess();
StopOpThread();
StopMonitoringChildProcess();
StopCoordinatorThread ();
sem_destroy(&m_operation_pending);
sem_destroy(&m_operation_done);
@ -3574,7 +3583,7 @@ NativeProcessLinux::StopOpThread()
if (!m_operation_thread.IsJoinable())
return;
m_operation_thread.Cancel();
DoOperation(nullptr); // nullptr as operation ask the operation thread to exit
m_operation_thread.Join(nullptr);
}