Make sure creating a pending instance doesn't also trigger creating a live instance; also make sure creating a

pending instance uses the specified instance name rather than creating a new one; add brackets to instance names
when searching for and removing pending instances.

llvm-svn: 113370

4 files changed, 8 insertions, 8 deletions

diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h
index cac01c197e6..2649b3f2956 100644
--- a/lldb/include/lldb/Core/Debugger.h
+++ b/lldb/include/lldb/Core/Debugger.h
@@ -40,7 +40,7 @@ class DebuggerInstanceSettings : public InstanceSettings
 {
 public:
     
-    DebuggerInstanceSettings (UserSettingsController &owner, const char *name = NULL);
+    DebuggerInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
 
     DebuggerInstanceSettings (const DebuggerInstanceSettings &rhs);
 
@@ -124,7 +124,7 @@ public:
     protected:
 
         lldb::InstanceSettingsSP
-        CreateNewInstanceSettings ();
+        CreateNewInstanceSettings (const char *instance_name);
 
         bool
         ValidTermWidthValue (const char *value, Error err);
diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h
index 0a41f0ee74d..b9e88e2f13f 100644
--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@@ -61,7 +61,7 @@ public:
     // Pure virtual functions, which all sub-classes must implement.
 
     virtual lldb::InstanceSettingsSP
-    CreateNewInstanceSettings () = 0;
+    CreateNewInstanceSettings (const char *instance_name) = 0;
   
     virtual void
     UpdateGlobalVariable (const ConstString &var_name,
@@ -334,7 +334,7 @@ class InstanceSettings
 {
 public:
 
-    InstanceSettings (UserSettingsController &owner, const char *instance_name);
+    InstanceSettings (UserSettingsController &owner, const char *instance_name, bool live_instance = true);
 
     InstanceSettings (const InstanceSettings &rhs);
 
diff --git a/lldb/include/lldb/Target/Process.h b/lldb/include/lldb/Target/Process.h
index 36eb791dee2..b7e21d4698e 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -41,7 +41,7 @@ class ProcessInstanceSettings : public InstanceSettings
 {
 public:
 
-    ProcessInstanceSettings (UserSettingsController &owner, const char *name = NULL);
+    ProcessInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
   
     ProcessInstanceSettings (const ProcessInstanceSettings &rhs);
 
@@ -251,7 +251,7 @@ public:
     protected:
 
         lldb::InstanceSettingsSP
-        CreateNewInstanceSettings ();
+        CreateNewInstanceSettings (const char *instance_name);
 
         static lldb::OptionEnumValueElement g_plugins[];
 
diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h
index 7a28e1ae8b1..ab964e9ee88 100644
--- a/lldb/include/lldb/Target/Thread.h
+++ b/lldb/include/lldb/Target/Thread.h
@@ -29,7 +29,7 @@ class ThreadInstanceSettings : public InstanceSettings
 {
 public:
 
-    ThreadInstanceSettings (UserSettingsController &owner, const char *name = NULL);
+    ThreadInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
   
     ThreadInstanceSettings (const ThreadInstanceSettings &rhs);
 
@@ -112,7 +112,7 @@ public:
     protected:
 
         lldb::InstanceSettingsSP
-        CreateNewInstanceSettings ();
+        CreateNewInstanceSettings (const char *instance_name);
 
     private: