SBFrame is now threadsafe using some extra tricks. One issue is that stack

frames might go away (the object itself, not the actual logical frame) when
we are single stepping due to the way we currently sometimes end up flushing
frames when stepping in/out/over. They later will come back to life 
represented by another object yet they have the same StackID. Now when you get
a lldb::SBFrame object, it will track the frame it is initialized with until 
the thread goes away or the StackID no longer exists in the stack for the 
thread it was created on. It uses a weak_ptr to both the frame and thread and
also stores the StackID. These three items allow us to determine when the
stack frame object has gone away (the weak_ptr will be NULL) and allows us to
find the correct frame again. In our test suite we had such cases where we
were just getting lucky when something like this happened:

1 - stop at breakpoint
2 - get first frame in thread where we stopped
3 - run an expression that causes the program to JIT and run code
4 - run more expressions on the frame from step 2 which was very very luckily
    still around inside a shared pointer, yet, not part of the current 
    thread (a new stack frame object had appeared with the same stack ID and
    depth). 
    
We now avoid all such issues and properly keep up to date, or we start 
returning errors when the frame doesn't exist and always responds with
invalid answers.

Also fixed the UserSettingsController  (not going to rewrite this just yet)
so that it doesn't crash on shutdown. Using weak_ptr's came in real handy to
track when the master controller has already gone away and this allowed me to
pull out the previous NotifyOwnerIsShuttingDown() patch as it is no longer 
needed.




git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@149231 91177308-0d34-0410-b5e6-96231b3b80d8

Author: Greg Clayton

include/lldb/API/SBFrame.h

@@ -19,6 +19,7 @@ namespace lldb {
 class SBFrame
 {
 public:
+    typedef SHARED_PTR(lldb_private::StackFrameImpl) StackFrameImplSP;
     SBFrame ();
 
     SBFrame (const lldb::SBFrame &rhs);
@@ -207,24 +208,13 @@ class SBFrame
     friend class lldb_private::ScriptInterpreterPython;
 #endif
 
-#ifndef SWIG
-
-    lldb_private::StackFrame *
-    operator->() const;
-
-    // Mimic shared pointer...
-    lldb_private::StackFrame *
-    get() const;
-
-    lldb::StackFrameSP &
-    get_sp();
-    
-#endif
+    lldb::StackFrameSP
+    GetFrameSP() const;
 
     void
-    SetFrame (const lldb::StackFrameSP &lldb_object_sp);
+    SetFrameSP (const lldb::StackFrameSP &lldb_object_sp);
 
-    lldb::StackFrameSP m_opaque_sp;
+    StackFrameImplSP m_opaque_sp;
 };
 
 } // namespace lldb

include/lldb/API/SBProcess.h

@@ -197,22 +197,13 @@ class SBProcess
     friend class SBThread;
     friend class SBValue;
 
-#ifndef SWIG
-
-    lldb_private::Process *
-    operator->() const;
-
-    // Mimic shared pointer...
-    lldb_private::Process *
-    get() const;
-
-#endif
-
-
     SBProcess (const lldb::ProcessSP &process_sp);
 
+    lldb::ProcessSP
+    GetSP() const;
+    
     void
-    SetProcess (const lldb::ProcessSP &process_sp);
+    SetSP (const lldb::ProcessSP &process_sp);
 
     lldb::ProcessSP m_opaque_sp;
 };

include/lldb/API/SBTarget.h

@@ -540,17 +540,12 @@ class SBTarget
 
     SBTarget (const lldb::TargetSP& target_sp);
 
-    void
-    reset (const lldb::TargetSP& target_sp);
-
-    lldb_private::Target *
-    operator ->() const;
+    lldb::TargetSP
+    GetSP () const;
 
-    lldb_private::Target *
-    get() const;
+    void
+    SetSP (const lldb::TargetSP& target_sp);
 
-    const lldb::TargetSP &
-    get_sp () const;
 
 private:
     //------------------------------------------------------------------

include/lldb/Core/Debugger.h

@@ -52,7 +52,7 @@ class DebuggerInstanceSettings : public InstanceSettings
     };
 
 
-    DebuggerInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
+    DebuggerInstanceSettings (const lldb::UserSettingsControllerSP &m_owner_sp, bool live_instance = true, const char *name = NULL);
 
     DebuggerInstanceSettings (const DebuggerInstanceSettings &rhs);
 

include/lldb/Core/UserSettingsController.h

@@ -49,7 +49,8 @@ typedef struct
     std::vector<SettingEntry> instance_settings;
 } UserSettingDefinition;
 
-class UserSettingsController
+class UserSettingsController : 
+    public std::tr1::enable_shared_from_this<UserSettingsController>
 {
 public:
 
@@ -130,6 +131,11 @@ class UserSettingsController
     void
     RenameInstanceSettings (const char *old_name, const char *new_name);
 
+    void
+    SetDefaultInstanceSettings (const lldb::InstanceSettingsSP &instance_settings_sp)
+    {
+        m_default_settings = instance_settings_sp;
+    }
     // -------------------------------------------------------------------------
     // Public static methods
     // -------------------------------------------------------------------------
@@ -387,7 +393,7 @@ class InstanceSettings
 {
 public:
 
-    InstanceSettings (UserSettingsController &owner, const char *instance_name, bool live_instance = true);
+    InstanceSettings (const lldb::UserSettingsControllerSP &owner_sp, const char *instance_name, bool live_instance = true);
 
     InstanceSettings (const InstanceSettings &rhs);
 
@@ -399,9 +405,6 @@ class InstanceSettings
 
     // Begin Pure Virtual Functions
 
-    virtual void
-    NotifyOwnerIsShuttingDown ();
-
     virtual void
     UpdateInstanceSettingsVariable (const ConstString &var_name,
                                     const char *index_value,
@@ -442,8 +445,7 @@ class InstanceSettings
 
 protected:
 
-    UserSettingsController &m_owner;
-    bool m_owner_is_live;
+    lldb::UserSettingsControllerWP m_owner_wp;
     ConstString m_instance_name;
 };
 

include/lldb/Target/Process.h

@@ -54,7 +54,7 @@ class ProcessInstanceSettings : public InstanceSettings
 {
 public:
 
-    ProcessInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
+    ProcessInstanceSettings (const lldb::UserSettingsControllerSP &owner_sp, bool live_instance = true, const char *name = NULL);
 
     ProcessInstanceSettings (const ProcessInstanceSettings &rhs);
 

include/lldb/Target/Target.h

@@ -43,7 +43,7 @@ class TargetInstanceSettings : public InstanceSettings
 public:
     static OptionEnumValueElement g_dynamic_value_types[];
 
-    TargetInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
+    TargetInstanceSettings (const lldb::UserSettingsControllerSP &owner_sp, bool live_instance = true, const char *name = NULL);
 
     TargetInstanceSettings (const TargetInstanceSettings &rhs);
 

include/lldb/Target/Thread.h

@@ -25,7 +25,7 @@ class ThreadInstanceSettings : public InstanceSettings
 {
 public:
 
-    ThreadInstanceSettings (UserSettingsController &owner, bool live_instance = true, const char *name = NULL);
+    ThreadInstanceSettings (const lldb::UserSettingsControllerSP &owner_sp, bool live_instance = true, const char *name = NULL);
 
     ThreadInstanceSettings (const ThreadInstanceSettings &rhs);
 

include/lldb/lldb-forward.h

@@ -142,6 +142,7 @@ class   SectionList;
 class   SourceManager;
 class   SourceManagerImpl;
 class   StackFrame;
+class   StackFrameImpl;
 class   StackFrameList;
 class   StackID;
 class   StopInfo;
@@ -293,6 +294,7 @@ namespace lldb {
     typedef std::tr1::shared_ptr<lldb_private::TypeImpl> TypeImplSP;
     typedef std::tr1::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
     typedef std::tr1::shared_ptr<lldb_private::UserSettingsController> UserSettingsControllerSP;
+    typedef std::tr1::weak_ptr<lldb_private::UserSettingsController> UserSettingsControllerWP;
     typedef std::tr1::shared_ptr<lldb_private::UnwindPlan> UnwindPlanSP;
     typedef lldb_private::SharingPtr<lldb_private::ValueObject> ValueObjectSP;
     typedef std::tr1::shared_ptr<lldb_private::Value> ValueSP;

source/API/SBAddress.cpp

@@ -170,18 +170,19 @@ SBAddress::GetLoadAddress (const SBTarget &target) const
     LogSP log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
     lldb::addr_t addr = LLDB_INVALID_ADDRESS;
+    TargetSP target_sp (target.GetSP());
     if (m_opaque_ap.get())
     {
-        Mutex::Locker api_locker (target->GetAPIMutex());
-        addr = m_opaque_ap->GetAddress().GetLoadAddress (target.get());
+        Mutex::Locker api_locker (target_sp->GetAPIMutex());
+        addr = m_opaque_ap->GetAddress().GetLoadAddress (target_sp.get());
     }
 
     if (log)
     {
         if (addr == LLDB_INVALID_ADDRESS)
-            log->Printf ("SBAddress::GetLoadAddress (SBTarget(%p)) => LLDB_INVALID_ADDRESS", target.get());
+            log->Printf ("SBAddress::GetLoadAddress (SBTarget(%p)) => LLDB_INVALID_ADDRESS", target_sp.get());
         else
-            log->Printf ("SBAddress::GetLoadAddress (SBTarget(%p)) => 0x%llx", target.get(), addr);
+            log->Printf ("SBAddress::GetLoadAddress (SBTarget(%p)) => 0x%llx", target_sp.get(), addr);
     }
 
     return addr;

source/API/SBCommandInterpreter.cpp

@@ -188,24 +188,26 @@ SBCommandInterpreter::HasAliasOptions ()
 SBProcess
 SBCommandInterpreter::GetProcess ()
 {
-    SBProcess process;
+    SBProcess sb_process;
+    ProcessSP process_sp;
     if (m_opaque_ptr)
     {
         TargetSP target_sp(m_opaque_ptr->GetDebugger().GetSelectedTarget());
         if (target_sp)
         {
             Mutex::Locker api_locker(target_sp->GetAPIMutex());
-            process.SetProcess(target_sp->GetProcessSP());
+            process_sp = target_sp->GetProcessSP();
+            sb_process.SetSP(process_sp);
         }
     }
     LogSP log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
     if (log)
         log->Printf ("SBCommandInterpreter(%p)::GetProcess () => SBProcess(%p)", 
-                     m_opaque_ptr, process.get());
+                     m_opaque_ptr, process_sp.get());
 
 
-    return process;
+    return sb_process;
 }
 
 CommandInterpreter *