Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
michael@0 | 1 | /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
michael@0 | 2 | /* vim: set sw=2 ts=8 et tw=80 : */ |
michael@0 | 3 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 4 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 5 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 6 | |
michael@0 | 7 | #include "SpdyZlibReporter.h" |
michael@0 | 8 | |
michael@0 | 9 | namespace mozilla { |
michael@0 | 10 | |
michael@0 | 11 | NS_IMPL_ISUPPORTS(SpdyZlibReporter, nsIMemoryReporter) |
michael@0 | 12 | |
michael@0 | 13 | /* static */ Atomic<size_t> SpdyZlibReporter::sAmount; |
michael@0 | 14 | |
michael@0 | 15 | /* static */ void* |
michael@0 | 16 | SpdyZlibReporter::Alloc(void*, uInt items, uInt size) |
michael@0 | 17 | { |
michael@0 | 18 | void* p = moz_xmalloc(items * size); |
michael@0 | 19 | sAmount += MallocSizeOfOnAlloc(p); |
michael@0 | 20 | return p; |
michael@0 | 21 | } |
michael@0 | 22 | |
michael@0 | 23 | /* static */ void |
michael@0 | 24 | SpdyZlibReporter::Free(void*, void* p) |
michael@0 | 25 | { |
michael@0 | 26 | sAmount -= MallocSizeOfOnFree(p); |
michael@0 | 27 | moz_free(p); |
michael@0 | 28 | } |
michael@0 | 29 | |
michael@0 | 30 | NS_IMETHODIMP |
michael@0 | 31 | SpdyZlibReporter::CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData) |
michael@0 | 32 | { |
michael@0 | 33 | return MOZ_COLLECT_REPORT( |
michael@0 | 34 | "explicit/network/spdy-zlib-buffers", KIND_HEAP, UNITS_BYTES, sAmount, |
michael@0 | 35 | "Memory allocated for SPDY zlib send and receive buffers."); |
michael@0 | 36 | } |
michael@0 | 37 | |
michael@0 | 38 | } // namespace mozilla |