Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Side by Side Diff: webrtc/base/logging.cc

Issue 1316363005: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/base/constructormagic.h ('k') | webrtc/base/natserver.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 uint32 before = Time(); 188 uint32 before = Time();
189 // Must lock streams_ before accessing 189 // Must lock streams_ before accessing
190 CritScope cs(&crit_); 190 CritScope cs(&crit_);
191 for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) { 191 for (StreamList::iterator it = streams_.begin(); it != streams_.end(); ++it) {
192 if (severity_ >= it->second) { 192 if (severity_ >= it->second) {
193 it->first->OnLogMessage(str); 193 it->first->OnLogMessage(str);
194 } 194 }
195 } 195 }
196 uint32 delay = TimeSince(before); 196 uint32 delay = TimeSince(before);
197 if (delay >= warn_slow_logs_delay_) { 197 if (delay >= warn_slow_logs_delay_) {
198 LogMessage slow_log_warning = 198 rtc::LogMessage slow_log_warning(__FILE__, __LINE__, LS_WARNING);
199 rtc::LogMessage(__FILE__, __LINE__, LS_WARNING);
200 // If our warning is slow, we don't want to warn about it, because 199 // If our warning is slow, we don't want to warn about it, because
201 // that would lead to inifinite recursion. So, give a really big 200 // that would lead to inifinite recursion. So, give a really big
202 // number for the delay threshold. 201 // number for the delay threshold.
203 slow_log_warning.warn_slow_logs_delay_ = UINT_MAX; 202 slow_log_warning.warn_slow_logs_delay_ = UINT_MAX;
204 slow_log_warning.stream() << "Slow log: took " << delay << "ms to write " 203 slow_log_warning.stream() << "Slow log: took " << delay << "ms to write "
205 << str.size() << " bytes."; 204 << str.size() << " bytes.";
206 } 205 }
207 } 206 }
208 207
209 uint32 LogMessage::LogStartTime() { 208 uint32 LogMessage::LogStartTime() {
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 } 541 }
543 542
544 if (state) { 543 if (state) {
545 state->unprintable_count_[input] = consecutive_unprintable; 544 state->unprintable_count_[input] = consecutive_unprintable;
546 } 545 }
547 } 546 }
548 547
549 ////////////////////////////////////////////////////////////////////// 548 //////////////////////////////////////////////////////////////////////
550 549
551 } // namespace rtc 550 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/constructormagic.h ('k') | webrtc/base/natserver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698