Index: third_party/libjingle/overrides/talk/base/logging.cc |
=================================================================== |
--- third_party/libjingle/overrides/talk/base/logging.cc (revision 0) |
+++ third_party/libjingle/overrides/talk/base/logging.cc (revision 0) |
@@ -0,0 +1,219 @@ |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Use of this source code is governed by a BSD-style license that can be |
+// found in the LICENSE file. |
+ |
+#include "talk/base/logging.h" |
Sergey Ulanov
2012/01/11 02:25:49
nit: better to include it via full path "third_par
hellner
2012/01/11 19:16:58
Done.
|
+ |
+#include <iomanip> |
+ |
+#include "talk/base/stringencode.h" |
+#include "talk/base/stringutils.h" |
+ |
+namespace talk_base { |
+ |
+///////////////////////////////////////////////////////////////////////////// |
+// Constant Labels |
+///////////////////////////////////////////////////////////////////////////// |
+ |
+const char * FindLabel(int value, const ConstantLabel entries[]) { |
Sergey Ulanov
2012/01/11 02:25:49
nit: "char*" without space
hellner
2012/01/11 19:16:58
Done.
|
+ for (int i = 0; entries[i].label; ++i) { |
+ if (value == entries[i].value) { |
Sergey Ulanov
2012/01/11 02:25:49
nit: no need to have braces here.
hellner
2012/01/11 19:16:58
Done.
|
+ return entries[i].label; |
+ } |
+ } |
+ return 0; |
+} |
+ |
+std::string ErrorName(int err, const ConstantLabel * err_table) { |
Sergey Ulanov
2012/01/11 02:25:49
nit: "ConstantLabel*" without space
hellner
2012/01/11 19:16:58
Done.
|
+ if (err == 0) |
+ return "No error"; |
+ |
+ if (err_table != 0) { |
+ if (const char * value = FindLabel(err, err_table)) |
+ return value; |
+ } |
+ |
+ char buffer[16]; |
+ snprintf(buffer, sizeof(buffer), "0x%08x", err); |
+ return buffer; |
+} |
+ |
+///////////////////////////////////////////////////////////////////////////// |
+// LogEHelper |
+///////////////////////////////////////////////////////////////////////////// |
+ |
+LogEHelper::LogEHelper(const char* file, int line, LoggingSeverity severity, |
Sergey Ulanov
2012/01/11 02:25:49
nit: each argument must be on a separate line if t
hellner
2012/01/11 19:16:58
Done.
|
+ const std::string extra) |
+ : file_name_(file), line_(line), severity_(severity), extra_(extra) {} |
Sergey Ulanov
2012/01/11 02:25:49
nit: it's more readable if each value is initializ
hellner
2012/01/11 19:16:58
Done.
|
+ |
+LogEHelper::~LogEHelper() { |
+ print_stream_ << extra_; |
+ const std::string& str = print_stream_.str(); |
+ LOG_E_BASE(file_name_.c_str(), line_, severity_) << str; |
+} |
+ |
+std::string GenerateExtra(LogErrorContext err_ctx, int err, |
+ const char* module) { |
+ if (err_ctx != ERRCTX_NONE) { |
+ std::ostringstream tmp; |
+ tmp << ": "; |
+ tmp << "[0x" << std::setfill('0') << std::hex << std::setw(8) << err << "]"; |
+ switch (err_ctx) { |
+ case ERRCTX_ERRNO: |
+ tmp << " " << strerror(err); |
+ break; |
+#if WIN32 |
Sergey Ulanov
2012/01/11 02:25:49
Chromium uses OS_WIN instead of WIN32
hellner
2012/01/11 19:16:58
Done.
|
+ case ERRCTX_HRESULT: { |
+ char msgbuf[256]; |
+ DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM; |
+ HMODULE hmod = GetModuleHandleA(module); |
+ if (hmod) |
+ flags |= FORMAT_MESSAGE_FROM_HMODULE; |
+ if (DWORD len = FormatMessageA( |
+ flags, hmod, err, |
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), |
+ msgbuf, sizeof(msgbuf) / sizeof(msgbuf[0]), NULL)) { |
+ while ((len > 0) && |
+ isspace(static_cast<unsigned char>(msgbuf[len-1]))) { |
+ msgbuf[--len] = 0; |
+ } |
+ tmp << " " << msgbuf; |
+ } |
+ break; |
+ } |
+#endif // WIN32 |
+#if OSX |
Sergey Ulanov
2012/01/11 02:25:49
OS_MACOSX
hellner
2012/01/11 19:16:58
Done.
|
+ case ERRCTX_OSSTATUS: { |
+ tmp << " " << nonnull(GetMacOSStatusErrorString(err), "Unknown error"); |
+ if (const char* desc = GetMacOSStatusCommentString(err)) { |
+ tmp << ": " << desc; |
+ } |
+ break; |
+ } |
+#endif // OSX |
+ default: |
+ break; |
+ } |
+ return tmp.str(); |
+ } |
+ return ""; |
+} |
+ |
+void LogMultiline(LoggingSeverity level, const char* label, bool input, |
Sergey Ulanov
2012/01/11 02:25:49
Is is just a copy copy of code from libjingle? If
hellner
2012/01/11 19:16:58
It is.
Done.
|
+ const void* data, size_t len, bool hex_mode, |
+ LogMultilineState* state) { |
+ if (!LOG_CHECK_LEVEL_V(level)) |
+ return; |
+ |
+ const char * direction = (input ? " << " : " >> "); |
+ |
+ // NULL data means to flush our count of unprintable characters. |
+ if (!data) { |
+ if (state && state->unprintable_count_[input]) { |
+ LOG_V(level) << label << direction << "## " |
+ << state->unprintable_count_[input] |
+ << " consecutive unprintable ##"; |
+ state->unprintable_count_[input] = 0; |
+ } |
+ return; |
+ } |
+ |
+ // The ctype classification functions want unsigned chars. |
+ const unsigned char* udata = static_cast<const unsigned char*>(data); |
+ |
+ if (hex_mode) { |
+ const size_t LINE_SIZE = 24; |
+ char hex_line[LINE_SIZE * 9 / 4 + 2], asc_line[LINE_SIZE + 1]; |
+ while (len > 0) { |
+ memset(asc_line, ' ', sizeof(asc_line)); |
+ memset(hex_line, ' ', sizeof(hex_line)); |
+ size_t line_len = _min(len, LINE_SIZE); |
+ for (size_t i = 0; i < line_len; ++i) { |
+ unsigned char ch = udata[i]; |
+ asc_line[i] = isprint(ch) ? ch : '.'; |
+ hex_line[i*2 + i/4] = hex_encode(ch >> 4); |
+ hex_line[i*2 + i/4 + 1] = hex_encode(ch & 0xf); |
+ } |
+ asc_line[sizeof(asc_line)-1] = 0; |
+ hex_line[sizeof(hex_line)-1] = 0; |
+ LOG_V(level) << label << direction |
+ << asc_line << " " << hex_line << " "; |
+ udata += line_len; |
+ len -= line_len; |
+ } |
+ return; |
+ } |
+ |
+ size_t consecutive_unprintable = state ? state->unprintable_count_[input] : 0; |
+ |
+ const unsigned char* end = udata + len; |
+ while (udata < end) { |
+ const unsigned char* line = udata; |
+ const unsigned char* end_of_line = strchrn<unsigned char>(udata, |
+ end - udata, |
+ '\n'); |
+ if (!end_of_line) { |
+ udata = end_of_line = end; |
+ } else { |
+ udata = end_of_line + 1; |
+ } |
+ |
+ bool is_printable = true; |
+ |
+ // If we are in unprintable mode, we need to see a line of at least |
+ // kMinPrintableLine characters before we'll switch back. |
+ const ptrdiff_t kMinPrintableLine = 4; |
+ if (consecutive_unprintable && ((end_of_line - line) < kMinPrintableLine)) { |
+ is_printable = false; |
+ } else { |
+ // Determine if the line contains only whitespace and printable |
+ // characters. |
+ bool is_entirely_whitespace = true; |
+ for (const unsigned char* pos = line; pos < end_of_line; ++pos) { |
+ if (isspace(*pos)) |
+ continue; |
+ is_entirely_whitespace = false; |
+ if (!isprint(*pos)) { |
+ is_printable = false; |
+ break; |
+ } |
+ } |
+ // Treat an empty line following unprintable data as unprintable. |
+ if (consecutive_unprintable && is_entirely_whitespace) { |
+ is_printable = false; |
+ } |
+ } |
+ if (!is_printable) { |
+ consecutive_unprintable += (udata - line); |
+ continue; |
+ } |
+ // Print out the current line, but prefix with a count of prior unprintable |
+ // characters. |
+ if (consecutive_unprintable) { |
+ LOG_V(level) << label << direction << "## " << consecutive_unprintable |
+ << " consecutive unprintable ##"; |
+ consecutive_unprintable = 0; |
+ } |
+ // Strip off trailing whitespace. |
+ while ((end_of_line > line) && isspace(*(end_of_line-1))) { |
+ --end_of_line; |
+ } |
+ // Filter out any private data |
+ std::string substr(reinterpret_cast<const char*>(line), end_of_line - line); |
+ std::string::size_type pos_private = substr.find("Email"); |
+ if (pos_private == std::string::npos) { |
+ pos_private = substr.find("Passwd"); |
+ } |
+ if (pos_private == std::string::npos) { |
+ LOG_V(level) << label << direction << substr; |
+ } else { |
+ LOG_V(level) << label << direction << "## omitted for privacy ##"; |
+ } |
+ } |
+ |
+ if (state) { |
+ state->unprintable_count_[input] = consecutive_unprintable; |
+ } |
+} |
+ |
+} // namespace talk_base |
Property changes on: third_party/libjingle/overrides/talk/base/logging.cc |
___________________________________________________________________ |
Added: svn:eol-style |
+ LF |