summaryrefslogtreecommitdiffstats
path: root/net/socket_stream
diff options
context:
space:
mode:
authorjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 04:48:53 +0000
committerjar@chromium.org <jar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-05 04:48:53 +0000
commit81ce9f3b1eb34dc7f6954f0f6657a76b0f01fc12 (patch)
tree41b3caf1a55ba3cfa2f6cf13b0a5ce3d773d631f /net/socket_stream
parent4f7f4854821e8e4933ad2c662bfd9417eb604a68 (diff)
downloadchromium_src-81ce9f3b1eb34dc7f6954f0f6657a76b0f01fc12.zip
chromium_src-81ce9f3b1eb34dc7f6954f0f6657a76b0f01fc12.tar.gz
chromium_src-81ce9f3b1eb34dc7f6954f0f6657a76b0f01fc12.tar.bz2
Use lock-free lazy initialization for static histogram references
Make all histogram macros thread safe, and fast by again using statics to achieve performance. ...at the cost of: Leak all histograms to avoid races at shutdown. Also included leak suppression for valgrind. r=rtenneti BUG=78207 Review URL: http://codereview.chromium.org/6780035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket_stream')
-rw-r--r--net/socket_stream/socket_stream_metrics_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/socket_stream/socket_stream_metrics_unittest.cc b/net/socket_stream/socket_stream_metrics_unittest.cc
index 72ae142..23f227d 100644
--- a/net/socket_stream/socket_stream_metrics_unittest.cc
+++ b/net/socket_stream/socket_stream_metrics_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
@@ -25,7 +25,7 @@ TEST(SocketStreamMetricsTest, Initialize) {
}
TEST(SocketStreamMetricsTest, ProtocolType) {
- scoped_refptr<Histogram> histogram;
+ Histogram* histogram;
// First we'll preserve the original values. We need to do this
// as histograms can get affected by other tests. In particular,
@@ -57,7 +57,7 @@ TEST(SocketStreamMetricsTest, ProtocolType) {
}
TEST(SocketStreamMetricsTest, ConnectionType) {
- scoped_refptr<Histogram> histogram;
+ Histogram* histogram;
// First we'll preserve the original values.
Histogram::SampleSet original;
@@ -91,7 +91,7 @@ TEST(SocketStreamMetricsTest, ConnectionType) {
}
TEST(SocketStreamMetricsTest, OtherNumbers) {
- scoped_refptr<Histogram> histogram;
+ Histogram* histogram;
// First we'll preserve the original values.
int64 original_received_bytes = 0;