diff options
Diffstat (limited to 'lldb/source/Core')
| -rw-r--r-- | lldb/source/Core/DataBufferMemoryMap.cpp | 22 | ||||
| -rw-r--r-- | lldb/source/Core/Logging.cpp | 9 |
2 files changed, 7 insertions, 24 deletions
diff --git a/lldb/source/Core/DataBufferMemoryMap.cpp b/lldb/source/Core/DataBufferMemoryMap.cpp index 5ea4b4f5a3a..be571a45a90 100644 --- a/lldb/source/Core/DataBufferMemoryMap.cpp +++ b/lldb/source/Core/DataBufferMemoryMap.cpp @@ -175,14 +175,11 @@ size_t DataBufferMemoryMap::MemoryMapFromFileDescriptor(int fd, bool fd_is_file) { Clear(); if (fd >= 0) { - Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_MMAP | - LIBLLDB_LOG_VERBOSE)); - if (log) { - log->Printf("DataBufferMemoryMap::MemoryMapFromFileDescriptor(fd=%i, " - "offset=0x%" PRIx64 ", length=0x%" PRIx64 - ", writeable=%i, fd_is_file=%i)", - fd, offset, (uint64_t)length, writeable, fd_is_file); - } + Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_MMAP)); + LLDB_LOGV(log, + "(fd={0}, offset={1:x}, length={2:x}, " + "writeable={3}, fd_is_file={4})", + fd, offset, length, writeable, fd_is_file); #ifdef _WIN32 HANDLE handle = (HANDLE)_get_osfhandle(fd); DWORD file_size_low, file_size_high; @@ -291,13 +288,8 @@ size_t DataBufferMemoryMap::MemoryMapFromFileDescriptor(int fd, m_data = m_mmap_addr; m_size = length; } - - if (log) { - log->Printf( - "DataBufferMemoryMap::MemoryMapFromFileSpec() m_mmap_addr = " - "%p, m_mmap_size = %" PRIu64 ", error = %s", - (void *)m_mmap_addr, (uint64_t)m_mmap_size, error.AsCString()); - } + LLDB_LOGV(log, "m_mmap_addr = {0}, m_mmap_size = {1}, error = {2}", + m_mmap_addr, m_mmap_size, error); } } } diff --git a/lldb/source/Core/Logging.cpp b/lldb/source/Core/Logging.cpp index 4d63b60eecc..1d42df111a4 100644 --- a/lldb/source/Core/Logging.cpp +++ b/lldb/source/Core/Logging.cpp @@ -44,11 +44,6 @@ uint32_t lldb_private::GetLogMask() { return 0; } -bool lldb_private::IsLogVerbose() { - uint32_t mask = GetLogMask(); - return (mask & LIBLLDB_LOG_VERBOSE); -} - Log *lldb_private::GetLogIfAllCategoriesSet(uint32_t mask) { Log *log(GetLog()); if (log && mask) { @@ -130,8 +125,6 @@ void lldb_private::DisableLog(const char **categories, Stream *feedback_strm) { flag_bits &= ~LIBLLDB_LOG_THREAD; else if (0 == ::strcasecmp(arg, "target")) flag_bits &= ~LIBLLDB_LOG_TARGET; - else if (0 == ::strcasecmp(arg, "verbose")) - flag_bits &= ~LIBLLDB_LOG_VERBOSE; else if (0 == ::strncasecmp(arg, "watch", 5)) flag_bits &= ~LIBLLDB_LOG_WATCHPOINTS; else if (0 == ::strncasecmp(arg, "temp", 4)) @@ -257,8 +250,6 @@ Log *lldb_private::EnableLog(StreamSP &log_stream_sp, uint32_t log_options, flag_bits |= LIBLLDB_LOG_TYPES; else if (0 == ::strncasecmp(arg, "unwind", 6)) flag_bits |= LIBLLDB_LOG_UNWIND; - else if (0 == ::strcasecmp(arg, "verbose")) - flag_bits |= LIBLLDB_LOG_VERBOSE; else if (0 == ::strncasecmp(arg, "watch", 5)) flag_bits |= LIBLLDB_LOG_WATCHPOINTS; else if (0 == ::strcasecmp(arg, "jit")) |
