Fix AutoNet regression

src/autonet/AutoNetServerImpl.cpp

@@ -161,9 +161,8 @@ void AutoNetServerImpl::NewContext(CoreContext& newCtxt){
         {"name", autowiring::demangle(ctxt->GetSigilType())}
     };
 
-    if(ctxt->GetParentContext()){
+    if(ctxt != GetContext() && ctxt->GetParentContext())
       context["parent"] = ResolveContextID(ctxt->GetParentContext().get());
-    }
 
     BroadcastMessage("newContext", ResolveContextID(ctxt.get()), context);
   };
@@ -284,12 +283,19 @@ void AutoNetServerImpl::HandleSubscribe(websocketpp::connection_hdl hdl) {
   }
 
   SendMessage(hdl, "subscribed", types);
-  GetContext()->BuildCurrentState();
+
+  for (auto ctxt : ContextEnumerator{ GetContext() }) {
+    // Send update about this newly discovered context
+    NewContext(*ctxt);
+
+    // Build total image of all objects, recursively:
+    for (const auto* pObj : ctxt->BuildObjectState())
+      NewObject(*ctxt, *pObj);
+  }
 
   // Send breakpoint message
-  for(const auto& breakpoint : m_breakpoints) {
+  for(const auto& breakpoint : m_breakpoints)
     SendMessage(hdl, "breakpoint", breakpoint);
-  }
 }
 
 void AutoNetServerImpl::HandleUnsubscribe(websocketpp::connection_hdl hdl) {

src/autonet/test/BreakpointTest.cpp

@@ -45,7 +45,12 @@ class WaitsThenSimulatesResume:
   }
 };
 
+
+struct MySigil {};
+
 TEST_F(BreakpointTest, SimplePauseAndResume) {
+  AutoCreateContextT<MySigil> child;
+
   AutoCurrentContext()->Initiate();
   AutoRequired<ExposedAutoNetServer> autonet;
   AutoRequired<BreakpointThread> thread;

src/autowiring/CoreContext.cpp

@@ -677,25 +677,14 @@ AnySharedPointer CoreContext::Await(auto_id id, std::chrono::nanoseconds timeout
   return memo.m_value;
 }
 
-void CoreContext::BuildCurrentState(void) {
-  auto glbl = GlobalCoreContext::Get();
-  if(m_pParent)
-    m_pParent->newContext(this);
-
-  // Enumerate objects injected into this context
-  for(auto& object : m_concreteTypes)
-    newObject(object);
+std::vector<const autowiring::CoreObjectDescriptor*> CoreContext::BuildObjectState(void) const {
+  std::vector<const autowiring::CoreObjectDescriptor*> retVal;
+  retVal.reserve(m_concreteTypes.size());
 
-  // Recurse on all children
   std::lock_guard<std::mutex> lk(m_stateBlock->m_lock);
-  for(const auto& c : m_children) {
-    auto cur = c.lock();
-    if(!cur)
-      continue;
-
-    // Recurse into the child instance:
-    cur->BuildCurrentState();
-  }
+  for(const auto& obj : m_concreteTypes)
+    retVal.push_back(&obj);
+  return retVal;
 }
 
 void CoreContext::Dump(std::ostream& os) const {

src/autowiring/CoreContext.h

@@ -683,11 +683,13 @@ class CoreContext:
     return reg.m_value != nullptr;
   }
 
-  /// \internal
   /// <summary>
-  /// Sends AutowiringEvents to build current state.
+  /// Gets a snapshot of all of the objects currently in the context
+  /// </summary>
+  /// <summary>
+  /// The returned vector will only be valid for as long as this CoreContext is
   /// </summary>
-  void BuildCurrentState(void);
+  std::vector<const autowiring::CoreObjectDescriptor*> BuildObjectState(void) const;
 
   /// <summary>
   /// A copy of the current list of child CoreRunnables of this context.