Revert "Add StructuredData plugin type; showcase with new DarwinLog feature"

This reverts commit 1d885845d1451e7b232f53fba2e36be67aadabd8.

llvm-svn: 279200

1 files changed, 3 insertions, 28 deletions

diff --git a/lldb/source/API/SBProcess.cpp b/lldb/source/API/SBProcess.cpp
index 9b8ac8461ac..50211bfde32 100644
--- a/lldb/source/API/SBProcess.cpp
+++ b/lldb/source/API/SBProcess.cpp
@@ -39,7 +39,6 @@
 #include "lldb/API/SBFileSpec.h"
 #include "lldb/API/SBMemoryRegionInfo.h"
 #include "lldb/API/SBMemoryRegionInfoList.h"
-#include "lldb/API/SBStructuredData.h"
 #include "lldb/API/SBThread.h"
 #include "lldb/API/SBThreadCollection.h"
 #include "lldb/API/SBStream.h"
@@ -1030,16 +1029,8 @@ SBProcess::GetRestartedReasonAtIndexFromEvent (const lldb::SBEvent &event, size_
 SBProcess
 SBProcess::GetProcessFromEvent (const SBEvent &event)
 {
-    ProcessSP process_sp =
-        Process::ProcessEventData::GetProcessFromEvent (event.get());
-    if (!process_sp)
-    {
-        // StructuredData events also know the process they come from.
-        // Try that.
-        process_sp = EventDataStructuredData::GetProcessFromEvent(event.get());
-    }
-
-    return SBProcess(process_sp);
+    SBProcess process(Process::ProcessEventData::GetProcessFromEvent (event.get()));
+    return process;
 }
 
 bool
@@ -1048,26 +1039,10 @@ SBProcess::GetInterruptedFromEvent (const SBEvent &event)
     return Process::ProcessEventData::GetInterruptedFromEvent(event.get());
 }
 
-lldb::SBStructuredData
-SBProcess::GetStructuredDataFromEvent (const lldb::SBEvent &event)
-{
-    return SBStructuredData(event.GetSP());
-}
-
 bool
 SBProcess::EventIsProcessEvent (const SBEvent &event)
 {
-    return (event.GetBroadcasterClass() == SBProcess::GetBroadcasterClass()) &&
-        !EventIsStructuredDataEvent (event);
-}
-
-bool
-SBProcess::EventIsStructuredDataEvent (const lldb::SBEvent &event)
-{
-    EventSP event_sp = event.GetSP();
-    EventData *event_data = event_sp ? event_sp->GetData() : nullptr;
-    return event_data &&
-        (event_data->GetFlavor() == EventDataStructuredData::GetFlavorString());
+    return event.GetBroadcasterClass() == SBProcess::GetBroadcasterClass();
 }
 
 SBBroadcaster