intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-31 16:29:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 1d885845d1451e7b232f53fba2e36be67aadabd8.

llvm-svn: 279200
This commit is contained in:
Todd Fiala
2016-08-19 03:03:58 +00:00
parent fdc4c6b426
commit a07e4a8352
130 changed files with 61 additions and 11356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lldb/tools/debugserver/source/debugserver.cpp
View File

@@ -34,7 +34,6 @@ extern "C" int proc_set_wakemon_params(pid_t, int, int); // <libproc_internal.h>
#include "DNB.h"
#include "DNBLog.h"
#include "DNBTimer.h"
#include "OsLogger.h"
#include "PseudoTerminal.h"
#include "RNBContext.h"
#include "RNBServices.h"
@@ -525,9 +524,6 @@ RNBRunLoopInferiorExecuting (RNBRemote *remote)
// Clear some bits if we are not running so we don't send any async packets
event_mask &= ~RNBContext::event_proc_stdio_available;
event_mask &= ~RNBContext::event_proc_profile_data;
// When we enable async structured data packets over another logical channel,
// this can be relaxed.
event_mask &= ~RNBContext::event_darwin_log_data_available;
}
// We want to make sure we consume all process state changes and have
@@ -552,11 +548,6 @@ RNBRunLoopInferiorExecuting (RNBRemote *remote)
remote->SendAsyncProfileData();
}
if (set_events & RNBContext::event_darwin_log_data_available)
{
remote->SendAsyncDarwinLogData();
}
if (set_events & RNBContext::event_read_packet_available)
{
// handleReceivedPacket will take care of resetting the
@@ -1316,20 +1307,7 @@ main (int argc, char *argv[])
else
{
// Enable DNB logging
// if os_log() support is available, log through that.
auto log_callback = OsLogger::GetLogFunction();
if (log_callback)
{
DNBLogSetLogCallback(log_callback, nullptr);
DNBLog("debugserver will use os_log for internal logging.");
}
else
{
// Fall back to ASL support.
DNBLogSetLogCallback(ASLLogCallback, NULL);
DNBLog("debugserver will use ASL for internal logging.");
}
DNBLogSetLogCallback(ASLLogCallback, NULL);
DNBLogSetLogMask (log_flags);
}