Remove further outdated "settings" code and also implement a few missing things.

llvm-svn: 162376

1 files changed, 2 insertions, 243 deletions

diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 47b64aa971c..29f3793c360 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -4062,38 +4062,16 @@ Process::SettingsInitialize ()
 //            break;
 //        }
 //    }
-//    UserSettingsControllerSP &usc = GetSettingsController();
-//    UserSettingsController::InitializeSettingsController (usc,
-//                                                          SettingsController::global_settings_table,
-//                                                          SettingsController::instance_settings_table);
 //                                                          
-//    // Now call SettingsInitialize() for each 'child' of Process settings
-//    Thread::SettingsInitialize ();
+    Thread::SettingsInitialize ();
 }
 
 void
 Process::SettingsTerminate ()
 {
-//    // Must call SettingsTerminate() on each 'child' of Process settings before terminating Process settings.
-//    
-//    Thread::SettingsTerminate ();
-//    
-//    // Now terminate Process Settings.
-//    
-//    UserSettingsControllerSP &usc = GetSettingsController();
-//    UserSettingsController::FinalizeSettingsController (usc);
-//    usc.reset();
+    Thread::SettingsTerminate ();
 }
 
-//PropertiesSP &
-//Process::GetProperties ()
-//{
-//    static PropertiesSP g_settings_sp;
-//    if (!g_settings_sp)
-//        g_settings_sp.reset (new ProcessProperties());
-//    return g_settings_sp;
-//}
-
 ExecutionResults
 Process::RunThreadPlan (ExecutionContext &exe_ctx,
                         lldb::ThreadPlanSP &thread_plan_sp,
@@ -4925,222 +4903,3 @@ Process::Flush ()
 {
     m_thread_list.Flush();
 }
-
-//--------------------------------------------------------------
-// class Process::SettingsController
-//--------------------------------------------------------------
-
-//Process::SettingsController::SettingsController () :
-//    UserSettingsController ("process", Target::GetSettingsController())
-//{
-//}
-//
-//Process::SettingsController::~SettingsController ()
-//{
-//}
-//
-//lldb::InstanceSettingsSP
-//Process::SettingsController::CreateInstanceSettings (const char *instance_name)
-//{
-//    lldb::InstanceSettingsSP new_settings_sp (new ProcessInstanceSettings (GetSettingsController(),
-//                                                                           false, 
-//                                                                           instance_name));
-//    return new_settings_sp;
-//}
-
-//--------------------------------------------------------------
-// class ProcessInstanceSettings
-//--------------------------------------------------------------
-//
-//ProcessInstanceSettings::ProcessInstanceSettings
-//(
-//    const UserSettingsControllerSP &owner_sp, 
-//    bool live_instance, 
-//    const char *name
-//) :
-//    InstanceSettings (owner_sp, name ? name : InstanceSettings::InvalidName().AsCString(), live_instance)
-//{
-//    // CopyInstanceSettings is a pure virtual function in InstanceSettings; it therefore cannot be called
-//    // until the vtables for ProcessInstanceSettings are properly set up, i.e. AFTER all the initializers.
-//    // For this reason it has to be called here, rather than in the initializer or in the parent constructor.
-//    // This is true for CreateInstanceName() too.
-//    
-//    if (GetInstanceName () == InstanceSettings::InvalidName())
-//    {
-//        ChangeInstanceName (std::string (CreateInstanceName().AsCString()));
-//        owner_sp->RegisterInstanceSettings (this);
-//    }
-//    
-//    if (live_instance)
-//    {
-//        const lldb::InstanceSettingsSP &pending_settings = owner_sp->FindPendingSettings (m_instance_name);
-//        CopyInstanceSettings (pending_settings,false);
-//    }
-//}
-//
-//ProcessInstanceSettings::ProcessInstanceSettings (const ProcessInstanceSettings &rhs) :
-//    InstanceSettings (Process::GetSettingsController(), CreateInstanceName().AsCString()),
-//    m_disable_memory_cache(rhs.m_disable_memory_cache),
-//    m_extra_startup_commands (rhs.m_extra_startup_commands)
-//{
-//    if (m_instance_name != InstanceSettings::GetDefaultName())
-//    {
-//        UserSettingsControllerSP owner_sp (m_owner_wp.lock());
-//        if (owner_sp)
-//        {
-//            CopyInstanceSettings (owner_sp->FindPendingSettings (m_instance_name), false);
-//            owner_sp->RemovePendingSettings (m_instance_name);
-//        }
-//    }
-//}
-//
-//ProcessInstanceSettings::~ProcessInstanceSettings ()
-//{
-//}
-//
-//ProcessInstanceSettings&
-//ProcessInstanceSettings::operator= (const ProcessInstanceSettings &rhs)
-//{
-//    if (this != &rhs)
-//    {
-//        m_disable_memory_cache = rhs.m_disable_memory_cache;
-//        m_extra_startup_commands = rhs.m_extra_startup_commands;
-//    }
-//
-//    return *this;
-//}
-//
-//
-//void
-//ProcessInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var_name,
-//                                                         const char *index_value,
-//                                                         const char *value,
-//                                                         const ConstString &instance_name,
-//                                                         const SettingEntry &entry,
-//                                                         VarSetOperationType op,
-//                                                         Error &err,
-//                                                         bool pending)
-//{
-//    if (var_name == GetDisableMemoryCacheVarName())
-//    {
-//        bool success;
-//        bool result = Args::StringToBoolean(value, false, &success);
-//        
-//        if (success)
-//        {
-//            m_disable_memory_cache = result;
-//        }
-//        else
-//        {
-//            err.SetErrorStringWithFormat ("Bad value \"%s\" for %s, should be Boolean.", value, GetDisableMemoryCacheVarName().AsCString());
-//        }
-//        
-//    }
-//    else if (var_name == GetExtraStartupCommandVarName())
-//    {
-//        UserSettingsController::UpdateStringArrayVariable (op, index_value, m_extra_startup_commands, value, err);
-//    }
-//}
-//
-//void
-//ProcessInstanceSettings::CopyInstanceSettings (const lldb::InstanceSettingsSP &new_settings,
-//                                               bool pending)
-//{
-//    if (new_settings.get() == NULL)
-//        return;
-//    
-//    ProcessInstanceSettings *new_settings_ptr = static_cast <ProcessInstanceSettings *> (new_settings.get());
-//    
-//    if (!new_settings_ptr)
-//        return;
-//    
-//    *this = *new_settings_ptr;
-//}
-//
-//bool
-//ProcessInstanceSettings::GetInstanceSettingsValue (const SettingEntry &entry,
-//                                                   const ConstString &var_name,
-//                                                   StringList &value,
-//                                                   Error *err)
-//{
-//    if (var_name == GetDisableMemoryCacheVarName())
-//    {
-//        value.AppendString(m_disable_memory_cache ? "true" : "false");
-//        return true;
-//    }
-//    else if (var_name == GetExtraStartupCommandVarName())
-//    {
-//        if (m_extra_startup_commands.GetArgumentCount() > 0)
-//        {
-//            for (int i = 0; i < m_extra_startup_commands.GetArgumentCount(); ++i)
-//                value.AppendString (m_extra_startup_commands.GetArgumentAtIndex (i));
-//        }
-//        return true;
-//    }
-//    else
-//    {
-//        if (err)
-//            err->SetErrorStringWithFormat ("unrecognized variable name '%s'", var_name.AsCString());
-//        return false;
-//    }
-//}
-//
-//const ConstString
-//ProcessInstanceSettings::CreateInstanceName ()
-//{
-//    static int instance_count = 1;
-//    StreamString sstr;
-//
-//    sstr.Printf ("process_%d", instance_count);
-//    ++instance_count;
-//
-//    const ConstString ret_val (sstr.GetData());
-//    return ret_val;
-//}
-//
-//const ConstString &
-//ProcessInstanceSettings::GetDisableMemoryCacheVarName () const
-//{
-//    static ConstString disable_memory_cache_var_name ("disable-memory-cache");
-//    
-//    return disable_memory_cache_var_name;
-//}
-//
-//const ConstString &
-//ProcessInstanceSettings::GetExtraStartupCommandVarName () const
-//{
-//    static ConstString extra_startup_command_var_name ("extra-startup-command");
-//    
-//    return extra_startup_command_var_name;
-//}
-//
-////--------------------------------------------------
-//// SettingsController Variable Tables
-////--------------------------------------------------
-//
-//SettingEntry
-//Process::SettingsController::global_settings_table[] =
-//{
-//  //{ "var-name",    var-type  ,        "default", enum-table, init'd, hidden, "help-text"},
-//    {  NULL, eSetVarTypeNone, NULL, NULL, 0, 0, NULL }
-//};
-//
-//
-//SettingEntry
-//Process::SettingsController::instance_settings_table[] =
-//{
-//  //{ "var-name",       var-type,              "default",       enum-table, init'd, hidden, "help-text"},
-//    {  "disable-memory-cache", eSetVarTypeBoolean,
-//#ifdef ENABLE_MEMORY_CACHING
-//        "false",
-//#else
-//        "true",
-//#endif
-//        NULL,       false,  false,  "Disable reading and caching of memory in fixed-size units." },
-//    { "extra-startup-command", eSetVarTypeArray, NULL, NULL, false,  false,  "A list containing extra commands understood by the particular process plugin used." },
-//    {  NULL,            eSetVarTypeNone,        NULL,           NULL,       false,  false,  NULL }
-//};
-//
-//
-
-