Adding eStopReasonThreadExiting and fixing the handling of this state on Linux.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@170800 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/lldb/lldb-enumerations.h b/include/lldb/lldb-enumerations.h
index 2b99874..b4ed1f5 100644
--- a/include/lldb/lldb-enumerations.h
+++ b/include/lldb/lldb-enumerations.h
@@ -177,7 +177,8 @@
eStopReasonSignal,
eStopReasonException,
eStopReasonExec, // Program was re-exec'ed
- eStopReasonPlanComplete
+ eStopReasonPlanComplete,
+ eStopReasonThreadExiting
} StopReason;
//----------------------------------------------------------------------
diff --git a/source/API/SBThread.cpp b/source/API/SBThread.cpp
index c1e834b..3f3c904 100644
--- a/source/API/SBThread.cpp
+++ b/source/API/SBThread.cpp
@@ -151,6 +151,7 @@
case eStopReasonTrace:
case eStopReasonExec:
case eStopReasonPlanComplete:
+ case eStopReasonThreadExiting:
// There is no data for these stop reasons.
return 0;
@@ -209,6 +210,7 @@
case eStopReasonTrace:
case eStopReasonExec:
case eStopReasonPlanComplete:
+ case eStopReasonThreadExiting:
// There is no data for these stop reasons.
return 0;
@@ -348,6 +350,13 @@
}
break;
+ case eStopReasonThreadExiting:
+ {
+ char limbo_desc[] = "thread exiting";
+ stop_desc = limbo_desc;
+ stop_desc_len = sizeof(limbo_desc);
+ }
+ break;
default:
break;
}
diff --git a/source/Plugins/Process/POSIX/POSIXStopInfo.cpp b/source/Plugins/Process/POSIX/POSIXStopInfo.cpp
index 79f0a58..3dd3c86 100644
--- a/source/Plugins/Process/POSIX/POSIXStopInfo.cpp
+++ b/source/Plugins/Process/POSIX/POSIXStopInfo.cpp
@@ -21,7 +21,7 @@
lldb::StopReason
POSIXLimboStopInfo::GetStopReason() const
{
- return lldb::eStopReasonTrace;
+ return lldb::eStopReasonThreadExiting;
}
const char *
@@ -33,13 +33,13 @@
bool
POSIXLimboStopInfo::ShouldStop(Event *event_ptr)
{
- return true;
+ return false;
}
bool
POSIXLimboStopInfo::ShouldNotify(Event *event_ptr)
{
- return true;
+ return false;
}
//===----------------------------------------------------------------------===//
diff --git a/source/Target/Thread.cpp b/source/Target/Thread.cpp
index 7c5a0d7..4750a4d 100644
--- a/source/Target/Thread.cpp
+++ b/source/Target/Thread.cpp
@@ -1582,15 +1582,16 @@
{
switch (reason)
{
- case eStopReasonInvalid: return "invalid";
- case eStopReasonNone: return "none";
- case eStopReasonTrace: return "trace";
- case eStopReasonBreakpoint: return "breakpoint";
- case eStopReasonWatchpoint: return "watchpoint";
- case eStopReasonSignal: return "signal";
- case eStopReasonException: return "exception";
- case eStopReasonExec: return "exec";
- case eStopReasonPlanComplete: return "plan complete";
+ case eStopReasonInvalid: return "invalid";
+ case eStopReasonNone: return "none";
+ case eStopReasonTrace: return "trace";
+ case eStopReasonBreakpoint: return "breakpoint";
+ case eStopReasonWatchpoint: return "watchpoint";
+ case eStopReasonSignal: return "signal";
+ case eStopReasonException: return "exception";
+ case eStopReasonExec: return "exec";
+ case eStopReasonPlanComplete: return "plan complete";
+ case eStopReasonThreadExiting: return "thread exiting";
}
diff --git a/source/Target/ThreadPlanBase.cpp b/source/Target/ThreadPlanBase.cpp
index ebf4686..4440837 100644
--- a/source/Target/ThreadPlanBase.cpp
+++ b/source/Target/ThreadPlanBase.cpp
@@ -146,7 +146,8 @@
log->Printf("Base plan discarding thread plans for thread tid = 0x%4.4" PRIx64 " (exec.)", m_thread.GetID());
m_thread.DiscardThreadPlans(false);
return true;
-
+
+ case eStopReasonThreadExiting:
case eStopReasonSignal:
if (stop_info_sp->ShouldStop(event_ptr))
{
diff --git a/source/Target/ThreadPlanStepInRange.cpp b/source/Target/ThreadPlanStepInRange.cpp
index 1e51245..d4324b6 100644
--- a/source/Target/ThreadPlanStepInRange.cpp
+++ b/source/Target/ThreadPlanStepInRange.cpp
@@ -384,6 +384,7 @@
case eStopReasonSignal:
case eStopReasonException:
case eStopReasonExec:
+ case eStopReasonThreadExiting:
{
LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_STEP));
if (log)
diff --git a/source/Target/ThreadPlanStepOut.cpp b/source/Target/ThreadPlanStepOut.cpp
index 5343324..678498f 100644
--- a/source/Target/ThreadPlanStepOut.cpp
+++ b/source/Target/ThreadPlanStepOut.cpp
@@ -252,6 +252,7 @@
case eStopReasonSignal:
case eStopReasonException:
case eStopReasonExec:
+ case eStopReasonThreadExiting:
return false;
default:
diff --git a/source/Target/ThreadPlanStepOverRange.cpp b/source/Target/ThreadPlanStepOverRange.cpp
index 66754d2..7851f70 100644
--- a/source/Target/ThreadPlanStepOverRange.cpp
+++ b/source/Target/ThreadPlanStepOverRange.cpp
@@ -320,6 +320,7 @@
case eStopReasonSignal:
case eStopReasonException:
case eStopReasonExec:
+ case eStopReasonThreadExiting:
default:
if (log)
log->PutCString ("ThreadPlanStepInRange got asked if it explains the stop for some reason other than step.");
diff --git a/source/Target/ThreadPlanStepUntil.cpp b/source/Target/ThreadPlanStepUntil.cpp
index 95b0a35..deda7d9 100644
--- a/source/Target/ThreadPlanStepUntil.cpp
+++ b/source/Target/ThreadPlanStepUntil.cpp
@@ -292,6 +292,7 @@
case eStopReasonSignal:
case eStopReasonException:
case eStopReasonExec:
+ case eStopReasonThreadExiting:
m_explains_stop = false;
break;
default:
diff --git a/tools/driver/Driver.cpp b/tools/driver/Driver.cpp
index 96fd4cf..623eddf 100644
--- a/tools/driver/Driver.cpp
+++ b/tools/driver/Driver.cpp
@@ -807,6 +807,7 @@
case eStopReasonSignal:
case eStopReasonException:
case eStopReasonExec:
+ case eStopReasonThreadExiting:
if (!other_thread.IsValid())
other_thread = thread;
break;