Fixed the logging output to be done consistently across all plug-ins.

Added a new log category for DWARF called "aranges" to log the parsing
of address ranges.

llvm-svn: 139489
This commit is contained in:
Greg Clayton 2011-09-12 04:05:41 +00:00
parent 6372d1cda2
commit b14eeddaa1
5 changed files with 61 additions and 58 deletions

View File

@ -151,21 +151,21 @@ ProcessKDPLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, Args &a
void void
ProcessKDPLog::ListLogCategories (Stream *strm) ProcessKDPLog::ListLogCategories (Stream *strm)
{ {
strm->Printf("Logging categories for '%s':\n" strm->Printf ("Logging categories for '%s':\n"
"\tall - turn on all available logging categories\n" " all - turn on all available logging categories\n"
"\tasync - log asynchronous activity\n" " async - log asynchronous activity\n"
"\tbreak - log breakpoints\n" " break - log breakpoints\n"
"\tcommunication - log communication activity\n" " communication - log communication activity\n"
"\tdefault - enable the default set of logging categories for liblldb\n" " default - enable the default set of logging categories for liblldb\n"
"\tpackets - log gdb remote packets\n" " packets - log gdb remote packets\n"
"\tmemory - log memory reads and writes\n" " memory - log memory reads and writes\n"
"\tdata-short - log memory bytes for memory reads and writes for short transactions only\n" " data-short - log memory bytes for memory reads and writes for short transactions only\n"
"\tdata-long - log memory bytes for memory reads and writes for all transactions\n" " data-long - log memory bytes for memory reads and writes for all transactions\n"
"\tprocess - log process events and activities\n" " process - log process events and activities\n"
"\tthread - log thread events and activities\n" " thread - log thread events and activities\n"
"\tstep - log step related activities\n" " step - log step related activities\n"
"\tverbose - enable verbose logging\n" " verbose - enable verbose logging\n"
"\twatch - log watchpoint related activities\n", ProcessKDP::GetPluginNameStatic()); " watch - log watchpoint related activities\n", ProcessKDP::GetPluginNameStatic());
} }

View File

@ -151,21 +151,21 @@ ProcessGDBRemoteLog::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, A
void void
ProcessGDBRemoteLog::ListLogCategories (Stream *strm) ProcessGDBRemoteLog::ListLogCategories (Stream *strm)
{ {
strm->Printf("Logging categories for '%s':\n" strm->Printf ("Logging categories for '%s':\n"
"\tall - turn on all available logging categories\n" " all - turn on all available logging categories\n"
"\tasync - log asynchronous activity\n" " async - log asynchronous activity\n"
"\tbreak - log breakpoints\n" " break - log breakpoints\n"
"\tcommunication - log communication activity\n" " communication - log communication activity\n"
"\tdefault - enable the default set of logging categories for liblldb\n" " default - enable the default set of logging categories for liblldb\n"
"\tpackets - log gdb remote packets\n" " packets - log gdb remote packets\n"
"\tmemory - log memory reads and writes\n" " memory - log memory reads and writes\n"
"\tdata-short - log memory bytes for memory reads and writes for short transactions only\n" " data-short - log memory bytes for memory reads and writes for short transactions only\n"
"\tdata-long - log memory bytes for memory reads and writes for all transactions\n" " data-long - log memory bytes for memory reads and writes for all transactions\n"
"\tprocess - log process events and activities\n" " process - log process events and activities\n"
"\tthread - log thread events and activities\n" " thread - log thread events and activities\n"
"\tstep - log step related activities\n" " step - log step related activities\n"
"\tverbose - enable verbose logging\n" " verbose - enable verbose logging\n"
"\twatch - log watchpoint related activities\n", ProcessGDBRemote::GetPluginNameStatic()); " watch - log watchpoint related activities\n", ProcessGDBRemote::GetPluginNameStatic());
} }

View File

@ -108,6 +108,7 @@ LogChannelDWARF::Disable (Args &categories, Stream *feedback_strm)
else if (::strcasecmp (arg, "line") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_LINE; else if (::strcasecmp (arg, "line") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_LINE;
else if (::strcasecmp (arg, "pubnames") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_PUBNAMES; else if (::strcasecmp (arg, "pubnames") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_PUBNAMES;
else if (::strcasecmp (arg, "pubtypes") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_PUBTYPES; else if (::strcasecmp (arg, "pubtypes") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_PUBTYPES;
else if (::strcasecmp (arg, "aranges") == 0 ) flag_bits &= ~DWARF_LOG_DEBUG_ARANGES;
else if (::strcasecmp (arg, "default") == 0 ) flag_bits &= ~DWARF_LOG_DEFAULT; else if (::strcasecmp (arg, "default") == 0 ) flag_bits &= ~DWARF_LOG_DEFAULT;
else else
{ {
@ -149,6 +150,7 @@ LogChannelDWARF::Enable
else if (::strcasecmp (arg, "line") == 0 ) flag_bits |= DWARF_LOG_DEBUG_LINE; else if (::strcasecmp (arg, "line") == 0 ) flag_bits |= DWARF_LOG_DEBUG_LINE;
else if (::strcasecmp (arg, "pubnames") == 0 ) flag_bits |= DWARF_LOG_DEBUG_PUBNAMES; else if (::strcasecmp (arg, "pubnames") == 0 ) flag_bits |= DWARF_LOG_DEBUG_PUBNAMES;
else if (::strcasecmp (arg, "pubtypes") == 0 ) flag_bits |= DWARF_LOG_DEBUG_PUBTYPES; else if (::strcasecmp (arg, "pubtypes") == 0 ) flag_bits |= DWARF_LOG_DEBUG_PUBTYPES;
else if (::strcasecmp (arg, "aranges") == 0 ) flag_bits |= DWARF_LOG_DEBUG_ARANGES;
else if (::strcasecmp (arg, "default") == 0 ) flag_bits |= DWARF_LOG_DEFAULT; else if (::strcasecmp (arg, "default") == 0 ) flag_bits |= DWARF_LOG_DEFAULT;
else else
{ {
@ -170,13 +172,13 @@ LogChannelDWARF::Enable
void void
LogChannelDWARF::ListCategories (Stream *strm) LogChannelDWARF::ListCategories (Stream *strm)
{ {
strm->Printf("Logging categories for '%s':\n" strm->Printf ("Logging categories for '%s':\n"
" all - turn on all available logging categories\n" " all - turn on all available logging categories\n"
" info - log the parsing if .debug_info\n" " info - log the parsing if .debug_info\n"
" line - log the parsing if .debug_line\n" " line - log the parsing if .debug_line\n"
" pubnames - log the parsing if .debug_pubnames\n" " pubnames - log the parsing if .debug_pubnames\n"
" pubtypes - log the parsing if .debug_pubtypes\n\n", " pubtypes - log the parsing if .debug_pubtypes\n\n",
SymbolFileDWARF::GetPluginNameStatic()); SymbolFileDWARF::GetPluginNameStatic());
} }
Log * Log *

View File

@ -7,8 +7,8 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#ifndef liblldb_LogChannelDWARF_h_ #ifndef SymbolFileDWARF_LogChannelDWARF_h_
#define liblldb_LogChannelDWARF_h_ #define SymbolFileDWARF_LogChannelDWARF_h_
// C Includes // C Includes
// C++ Includes // C++ Includes
@ -22,6 +22,7 @@
#define DWARF_LOG_DEBUG_LINE (1u << 2) #define DWARF_LOG_DEBUG_LINE (1u << 2)
#define DWARF_LOG_DEBUG_PUBNAMES (1u << 3) #define DWARF_LOG_DEBUG_PUBNAMES (1u << 3)
#define DWARF_LOG_DEBUG_PUBTYPES (1u << 4) #define DWARF_LOG_DEBUG_PUBTYPES (1u << 4)
#define DWARF_LOG_DEBUG_ARANGES (1u << 5)
#define DWARF_LOG_ALL (UINT32_MAX) #define DWARF_LOG_ALL (UINT32_MAX)
#define DWARF_LOG_DEFAULT (DWARF_LOG_DEBUG_INFO) #define DWARF_LOG_DEFAULT (DWARF_LOG_DEBUG_INFO)
@ -82,4 +83,4 @@ public:
LogIf (uint32_t mask, const char *format, ...); LogIf (uint32_t mask, const char *format, ...);
}; };
#endif // liblldb_LogChannelDWARF_h_ #endif // SymbolFileDWARF_LogChannelDWARF_h_

View File

@ -225,22 +225,22 @@ void
lldb_private::ListLogCategories (Stream *strm) lldb_private::ListLogCategories (Stream *strm)
{ {
strm->Printf("Logging categories for 'lldb':\n" strm->Printf("Logging categories for 'lldb':\n"
"\tall - turn on all available logging categories\n" " all - turn on all available logging categories\n"
"\tapi - enable logging of API calls and return values\n" " api - enable logging of API calls and return values\n"
"\tcommand - log command argument parsing\n" " command - log command argument parsing\n"
"\tdefault - enable the default set of logging categories for liblldb\n" " default - enable the default set of logging categories for liblldb\n"
"\tbreak - log breakpoints\n" " break - log breakpoints\n"
"\tevents - log broadcaster, listener and event queue activities\n" " events - log broadcaster, listener and event queue activities\n"
"\texpr - log expressions\n" " expr - log expressions\n"
"\tobject - log object construction/destruction for important objects\n" " object - log object construction/destruction for important objects\n"
"\tprocess - log process events and activities\n" " process - log process events and activities\n"
"\tthread - log thread events and activities\n" " thread - log thread events and activities\n"
"\tscript - log events about the script interpreter\n" " script - log events about the script interpreter\n"
"\tdyld - log shared library related activities\n" " dyld - log shared library related activities\n"
"\tstate - log private and public process state changes\n" " state - log private and public process state changes\n"
"\tstep - log step related activities\n" " step - log step related activities\n"
"\tunwind - log stack unwind activities\n" " unwind - log stack unwind activities\n"
"\tverbose - enable verbose logging\n" " verbose - enable verbose logging\n"
"\twatch - log watchpoint related activities\n" " watch - log watchpoint related activities\n"
"\ttypes - log type system related activities\n"); " types - log type system related activities\n");
} }