Reverting 180831 as it crashes TestDefaultConstructorForAPIObjects.py
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@180868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Process.cpp b/source/Target/Process.cpp
index e0ea32a..f60adca 100644
--- a/source/Target/Process.cpp
+++ b/source/Target/Process.cpp
@@ -101,7 +101,6 @@
{ "unwind-on-error-in-expressions", OptionValue::eTypeBoolean, true, true, NULL, NULL, "If true, errors in expression evaluation will unwind the stack back to the state before the call." },
{ "python-os-plugin-path", OptionValue::eTypeFileSpec, false, true, NULL, NULL, "A path to a python OS plug-in module file that contains a OperatingSystemPlugIn class." },
{ "stop-on-sharedlibrary-events" , OptionValue::eTypeBoolean, true, false, NULL, NULL, "If true, stop when a shared library is loaded or unloaded." },
- { "detach-keeps-stopped" , OptionValue::eTypeBoolean, true, false, NULL, NULL, "If true, detach will attempt to keep the process stopped." },
{ NULL , OptionValue::eTypeInvalid, false, 0, NULL, NULL, NULL }
};
@@ -111,8 +110,7 @@
ePropertyIgnoreBreakpointsInExpressions,
ePropertyUnwindOnErrorInExpressions,
ePropertyPythonOSPluginPath,
- ePropertyStopOnSharedLibraryEvents,
- ePropertyDetachKeepsStopped
+ ePropertyStopOnSharedLibraryEvents
};
ProcessProperties::ProcessProperties (bool is_global) :
@@ -215,20 +213,6 @@
m_collection_sp->SetPropertyAtIndexAsBoolean(NULL, idx, stop);
}
-bool
-ProcessProperties::GetDetachKeepsStopped () const
-{
- const uint32_t idx = ePropertyDetachKeepsStopped;
- return m_collection_sp->GetPropertyAtIndexAsBoolean(NULL, idx, g_properties[idx].default_uint_value != 0);
-}
-
-void
-ProcessProperties::SetDetachKeepsStopped (bool stop)
-{
- const uint32_t idx = ePropertyDetachKeepsStopped;
- m_collection_sp->SetPropertyAtIndexAsBoolean(NULL, idx, stop);
-}
-
void
ProcessInstanceInfo::Dump (Stream &s, Platform *platform) const
{
@@ -1112,11 +1096,7 @@
case eStateCrashed:
case eStateSuspended:
if (GetShouldDetach())
- {
- // FIXME: This will have to be a process setting:
- bool keep_stopped = false;
- Detach(keep_stopped);
- }
+ Detach();
else
Destroy();
break;
@@ -3451,7 +3431,7 @@
}
Error
-Process::Detach (bool keep_stopped)
+Process::Detach ()
{
EventSP exit_event_sp;
Error error;
@@ -3478,16 +3458,12 @@
}
}
- error = DoDetach(keep_stopped);
+ error = DoDetach();
if (error.Success())
{
DidDetach();
StopPrivateStateThread();
}
- else
- {
- return error;
- }
}
m_destroy_in_process = false;