9080518a39
I mistakenly ommitted the checks when logging.h was ported from libjingle to webrtc. This caused a significant CPU cost for logs which were later filtered out anyway. Verified with LS_VERBOSE logging in neteq4, running: $ out/Release/modules_unittests \ --gtest_filter=NetEqDecodingTest.TestBitExactness \ --gtest_repeat=50 > time.txt $ grep "case ran" time.txt | grep "[0-9]* ms" -o | sort Results on a MacBook Retina, averaged over 5 runs: Verbose logs disabled: 666 ms Exisiting implementation, verbose logs enabled: 944 ms (1.42x) New implementation, verbose logs enabled: 673 ms (1.01x) BUG=2314 R=henrik.lundin@webrtc.org, henrike@webrtc.org, kjellander@webrtc.org, turaj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2160005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4682 4adac7df-926f-26a2-2b94-8c16560cd09d
62 lines
1.8 KiB
C++
62 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/system_wrappers/interface/logging.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <sstream>
|
|
|
|
#include "webrtc/common_types.h"
|
|
#include "webrtc/system_wrappers/interface/trace.h"
|
|
|
|
namespace webrtc {
|
|
namespace {
|
|
|
|
TraceLevel WebRtcSeverity(LoggingSeverity sev) {
|
|
switch (sev) {
|
|
// TODO(ajm): SENSITIVE doesn't have a corresponding webrtc level.
|
|
case LS_SENSITIVE: return kTraceInfo;
|
|
case LS_VERBOSE: return kTraceInfo;
|
|
case LS_INFO: return kTraceTerseInfo;
|
|
case LS_WARNING: return kTraceWarning;
|
|
case LS_ERROR: return kTraceError;
|
|
default: return kTraceNone;
|
|
}
|
|
}
|
|
|
|
const char* DescribeFile(const char* file) {
|
|
const char* end1 = ::strrchr(file, '/');
|
|
const char* end2 = ::strrchr(file, '\\');
|
|
if (!end1 && !end2)
|
|
return file;
|
|
else
|
|
return (end1 > end2) ? end1 + 1 : end2 + 1;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev)
|
|
: severity_(sev) {
|
|
print_stream_ << "(" << DescribeFile(file) << ":" << line << "): ";
|
|
}
|
|
|
|
bool LogMessage::Loggable(LoggingSeverity sev) {
|
|
// |level_filter| is a bitmask, unlike libjingle's minimum severity value.
|
|
return WebRtcSeverity(sev) & Trace::level_filter() ? true : false;
|
|
}
|
|
|
|
LogMessage::~LogMessage() {
|
|
const std::string& str = print_stream_.str();
|
|
WEBRTC_TRACE(WebRtcSeverity(severity_), kTraceUndefined, 0, str.c_str());
|
|
}
|
|
|
|
} // namespace webrtc
|