Make all debugger-level user settable variables into instance variables.
Make get/set variable at the debugger level always set the particular debugger's instance variables rather than
the default variables.
llvm-svn: 113474
diff --git a/lldb/source/Commands/CommandObjectHelp.cpp b/lldb/source/Commands/CommandObjectHelp.cpp
index 78c2452..9541d36 100644
--- a/lldb/source/Commands/CommandObjectHelp.cpp
+++ b/lldb/source/Commands/CommandObjectHelp.cpp
@@ -96,7 +96,8 @@
{
interpreter.OutputFormattedHelpText (output_strm, "", "", sub_cmd_obj->GetHelp(), 1);
output_strm.Printf ("\nSyntax: %s\n", sub_cmd_obj->GetSyntax());
- sub_cmd_obj->GetOptions()->GenerateOptionUsage (output_strm, sub_cmd_obj);
+ sub_cmd_obj->GetOptions()->GenerateOptionUsage (output_strm, sub_cmd_obj,
+ interpreter.GetDebugger().GetInstanceName().AsCString());
const char *long_help = sub_cmd_obj->GetHelpLong();
if ((long_help != NULL)
&& (strlen (long_help) > 0))
diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp
index ec99ff7..583c39c 100644
--- a/lldb/source/Commands/CommandObjectImage.cpp
+++ b/lldb/source/Commands/CommandObjectImage.cpp
@@ -1424,7 +1424,7 @@
break;
default:
- m_options.GenerateOptionUsage (result.GetErrorStream(), this);
+ m_options.GenerateOptionUsage (result.GetErrorStream(), this, interpreter.GetDebugger().GetInstanceName().AsCString());
syntax_error = true;
break;
}
diff --git a/lldb/source/Commands/CommandObjectProcess.cpp b/lldb/source/Commands/CommandObjectProcess.cpp
index 703221a..b6fb4d0 100644
--- a/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/lldb/source/Commands/CommandObjectProcess.cpp
@@ -162,6 +162,7 @@
process = target->CreateProcess (interpreter.GetDebugger().GetListener(), plugin_name).get();
const char *process_name = process->GetInstanceName().AsCString();
+ const char *debugger_instance_name = interpreter.GetDebugger().GetInstanceName().AsCString();
StreamString run_args_var_name;
StreamString env_vars_var_name;
StreamString disable_aslr_var_name;
@@ -170,7 +171,8 @@
Args *run_args = NULL;
run_args_var_name.Printf ("process.[%s].run-args", process_name);
StringList run_args_value = Debugger::GetSettingsController()->GetVariable (run_args_var_name.GetData(),
- var_type);
+ var_type, debugger_instance_name);
+
if (run_args_value.GetSize() > 0)
{
run_args = new Args;
@@ -181,7 +183,8 @@
Args *environment = NULL;
env_vars_var_name.Printf ("process.[%s].env-vars", process_name);
StringList env_vars_value = Debugger::GetSettingsController()->GetVariable (env_vars_var_name.GetData(),
- var_type);
+ var_type, debugger_instance_name);
+
if (env_vars_value.GetSize() > 0)
{
environment = new Args;
@@ -192,7 +195,9 @@
uint32_t launch_flags = eLaunchFlagNone;
disable_aslr_var_name.Printf ("process.[%s].disable-aslr", process_name);
StringList disable_aslr_value = Debugger::GetSettingsController()->GetVariable(disable_aslr_var_name.GetData(),
- var_type);
+ var_type,
+ debugger_instance_name);
+
if (disable_aslr_value.GetSize() > 0)
{
if (strcmp (disable_aslr_value.GetStringAtIndex(0), "true") == 0)
@@ -214,7 +219,9 @@
// launch-args was not empty; use that, AND re-set run-args to contains launch-args values.
std::string new_run_args;
launch_args.GetCommandString (new_run_args);
- Debugger::GetSettingsController()->SetVariable (run_args_var_name.GetData(), new_run_args.c_str(), lldb::eVarSetOperationAssign, false);
+ Debugger::GetSettingsController()->SetVariable (run_args_var_name.GetData(), new_run_args.c_str(),
+ lldb::eVarSetOperationAssign, false,
+ interpreter.GetDebugger().GetInstanceName().AsCString());
}
diff --git a/lldb/source/Commands/CommandObjectSettings.cpp b/lldb/source/Commands/CommandObjectSettings.cpp
index 33af62f..b0db637 100644
--- a/lldb/source/Commands/CommandObjectSettings.cpp
+++ b/lldb/source/Commands/CommandObjectSettings.cpp
@@ -117,7 +117,8 @@
else
{
Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, lldb::eVarSetOperationAssign,
- m_options.m_override);
+ m_options.m_override,
+ interpreter.GetDebugger().GetInstanceName().AsCString());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -284,7 +285,8 @@
// The user requested to see the value of a particular variable.
lldb::SettableVariableType var_type;
const char *variable_name = command.GetArgumentAtIndex (0);
- StringList value = root_settings->GetVariable (variable_name, var_type);
+ StringList value = root_settings->GetVariable (variable_name, var_type,
+ interpreter.GetDebugger().GetInstanceName().AsCString());
if (value.GetSize() == 0)
{
@@ -456,7 +458,8 @@
index_value_string = index_value;
Error err = root_settings->SetVariable (var_name_string.c_str(), NULL, lldb::eVarSetOperationRemove,
- false, index_value_string.c_str());
+ false, interpreter.GetDebugger().GetInstanceName().AsCString(),
+ index_value_string.c_str());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -565,7 +568,8 @@
else
{
Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, lldb::eVarSetOperationReplace,
- false, index_value_string.c_str());
+ false, interpreter.GetDebugger().GetInstanceName().AsCString(),
+ index_value_string.c_str());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -676,7 +680,8 @@
else
{
Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, lldb::eVarSetOperationInsertBefore,
- false, index_value_string.c_str());
+ false, interpreter.GetDebugger().GetInstanceName().AsCString(),
+ index_value_string.c_str());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -788,7 +793,8 @@
else
{
Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, lldb::eVarSetOperationInsertAfter,
- false, index_value_string.c_str());
+ false, interpreter.GetDebugger().GetInstanceName().AsCString(),
+ index_value_string.c_str());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -888,7 +894,7 @@
else
{
Error err = root_settings->SetVariable (var_name_string.c_str(), var_value, lldb::eVarSetOperationAppend,
- false);
+ false, interpreter.GetDebugger().GetInstanceName().AsCString());
if (err.Fail ())
{
result.AppendError (err.AsCString());
@@ -969,7 +975,8 @@
return false;
}
- Error err = root_settings->SetVariable (var_name, NULL, lldb::eVarSetOperationClear, false);
+ Error err = root_settings->SetVariable (var_name, NULL, lldb::eVarSetOperationClear, false,
+ interpreter.GetDebugger().GetInstanceName().AsCString());
if (err.Fail ())
{
diff --git a/lldb/source/Commands/CommandObjectSyntax.cpp b/lldb/source/Commands/CommandObjectSyntax.cpp
index 072ae29..6574692 100644
--- a/lldb/source/Commands/CommandObjectSyntax.cpp
+++ b/lldb/source/Commands/CommandObjectSyntax.cpp
@@ -76,7 +76,6 @@
if (cmd_obj->GetOptions() != NULL)
{
output_strm.Printf ("\nSyntax: %s\n", cmd_obj->GetSyntax());
- //cmd_obj->GetOptions()->GenerateOptionUsage (output_strm, cmd_obj);
output_strm.Printf ("(Try 'help %s' for more information on command options syntax.)\n",
cmd_obj->GetCommandName());
result.SetStatus (eReturnStatusSuccessFinishNoResult);