d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r353363 in preparation for applying upstream fix:

Browse Source 
Put in a band-aid fix for lldb 9 exiting with "Expected<T> must be
checked before access or destruction" when launching executables, while
we sort this out with upstream.

PR:		241137
MFC after:	1 month
X-MFC-With:	r353358
This commit is contained in:
Dimitry Andric 2019-10-10 20:30:54 +00:00
parent 302abfb279
commit 6cc0992fb5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=353415
2 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
View File

@ -708,7 +708,7 @@ ProcessMonitor::ProcessMonitor(
const lldb_private::ProcessLaunchInfo & /* launch_info */,
lldb_private::Status &error)
: m_process(static_cast<ProcessFreeBSD *>(process)),
m_operation_thread(), m_monitor_thread(), m_pid(LLDB_INVALID_PROCESS_ID), m_terminal_fd(-1), m_operation(0) {
m_operation_thread(nullptr), m_monitor_thread(nullptr), m_pid(LLDB_INVALID_PROCESS_ID), m_terminal_fd(-1), m_operation(0) {
using namespace std::placeholders;
std::unique_ptr<LaunchArgs> args(
@ -735,21 +735,20 @@ ProcessMonitor::ProcessMonitor(
}
// Finally, start monitoring the child process for change in state.
auto monitor_thread = Host::StartMonitoringChildProcess(
m_monitor_thread = Host::StartMonitoringChildProcess(
std::bind(&ProcessMonitor::MonitorCallback, this, _1, _2, _3, _4),
GetPID(), true);
if (!monitor_thread || !monitor_thread->IsJoinable()) {
if (!m_monitor_thread->IsJoinable()) {
error.SetErrorToGenericError();
error.SetErrorString("Process launch failed.");
return;
}
m_monitor_thread = *monitor_thread;
}
ProcessMonitor::ProcessMonitor(ProcessFreeBSD *process, lldb::pid_t pid,
lldb_private::Status &error)
: m_process(static_cast<ProcessFreeBSD *>(process)),
m_operation_thread(), m_monitor_thread(), m_pid(pid), m_terminal_fd(-1), m_operation(0) {
m_operation_thread(nullptr), m_monitor_thread(nullptr), m_pid(pid), m_terminal_fd(-1), m_operation(0) {
using namespace std::placeholders;
sem_init(&m_operation_pending, 0, 0);
@ -774,15 +773,14 @@ ProcessMonitor::ProcessMonitor(ProcessFreeBSD *process, lldb::pid_t pid,
}
// Finally, start monitoring the child process for change in state.
auto monitor_thread = Host::StartMonitoringChildProcess(
m_monitor_thread = Host::StartMonitoringChildProcess(
std::bind(&ProcessMonitor::MonitorCallback, this, _1, _2, _3, _4),
GetPID(), true);
if (!monitor_thread || !monitor_thread->IsJoinable()) {
if (!m_monitor_thread->IsJoinable()) {
error.SetErrorToGenericError();
error.SetErrorString("Process attach failed.");
return;
}
m_monitor_thread = *monitor_thread;
}
ProcessMonitor::~ProcessMonitor() { StopMonitor(); }
@ -791,15 +789,13 @@ ProcessMonitor::~ProcessMonitor() { StopMonitor(); }
void ProcessMonitor::StartLaunchOpThread(LaunchArgs *args, Status &error) {
static const char *g_thread_name = "freebsd.op";
if (m_operation_thread.IsJoinable())
if (m_operation_thread->IsJoinable())
return;
auto operation_thread =
m_operation_thread =
ThreadLauncher::LaunchThread(g_thread_name, LaunchOpThread, args);
if (operation_thread)
m_operation_thread = *operation_thread;
else
error = operation_thread.takeError();
if (!m_operation_thread)
error = m_operation_thread.takeError();
}
void *ProcessMonitor::LaunchOpThread(void *arg) {
@ -961,15 +957,14 @@ void ProcessMonitor::StartAttachOpThread(AttachArgs *args,
lldb_private::Status &error) {
static const char *g_thread_name = "freebsd.op";
if (m_operation_thread.IsJoinable())
if (m_operation_thread->IsJoinable())
return;
auto operation_thread =
m_operation_thread =
ThreadLauncher::LaunchThread(g_thread_name, AttachOpThread, args);
if (operation_thread)
m_operation_thread = *operation_thread;
else
error = operation_thread.takeError();
if (!m_operation_thread)
error = m_operation_thread.takeError();
}
void *ProcessMonitor::AttachOpThread(void *arg) {
@ -1389,10 +1384,10 @@ bool ProcessMonitor::DupDescriptor(const FileSpec &file_spec, int fd,
}
void ProcessMonitor::StopMonitoringChildProcess() {
if (m_monitor_thread.IsJoinable()) {
m_monitor_thread.Cancel();
m_monitor_thread.Join(nullptr);
m_monitor_thread.Reset();
if (m_monitor_thread->IsJoinable()) {
m_monitor_thread->Cancel();
m_monitor_thread->Join(nullptr);
m_monitor_thread->Reset();
}
}
@ -1427,10 +1422,10 @@ void ProcessMonitor::StopMonitor() {
bool ProcessMonitor::WaitForInitialTIDStop(lldb::tid_t tid) { return true; }
void ProcessMonitor::StopOpThread() {
if (!m_operation_thread.IsJoinable())
if (!m_operation_thread->IsJoinable())
return;
m_operation_thread.Cancel();
m_operation_thread.Join(nullptr);
m_operation_thread.Reset();
m_operation_thread->Cancel();
m_operation_thread->Join(nullptr);
m_operation_thread->Reset();
}

4
contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
View File

@ -183,8 +183,8 @@ class ProcessMonitor {
private:
ProcessFreeBSD *m_process;
lldb_private::HostThread m_operation_thread;
lldb_private::HostThread m_monitor_thread;
llvm::Expected<lldb_private::HostThread> m_operation_thread;
llvm::Expected<lldb_private::HostThread> m_monitor_thread;
lldb::pid_t m_pid;
int m_terminal_fd;