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 | /* A memory allocator for zlib use in SPDY that reports to about:memory. */ |
michael@0 | 8 | |
michael@0 | 9 | #include "mozilla/Assertions.h" |
michael@0 | 10 | #include "mozilla/Atomics.h" |
michael@0 | 11 | #include "mozilla/Attributes.h" |
michael@0 | 12 | #include "nsIMemoryReporter.h" |
michael@0 | 13 | #include "zlib.h" |
michael@0 | 14 | |
michael@0 | 15 | namespace mozilla { |
michael@0 | 16 | |
michael@0 | 17 | class SpdyZlibReporter MOZ_FINAL : public nsIMemoryReporter |
michael@0 | 18 | { |
michael@0 | 19 | public: |
michael@0 | 20 | NS_DECL_ISUPPORTS |
michael@0 | 21 | |
michael@0 | 22 | SpdyZlibReporter() |
michael@0 | 23 | { |
michael@0 | 24 | #ifdef DEBUG |
michael@0 | 25 | // There must be only one instance of this class, due to |sAmount| |
michael@0 | 26 | // being static. |
michael@0 | 27 | static bool hasRun = false; |
michael@0 | 28 | MOZ_ASSERT(!hasRun); |
michael@0 | 29 | hasRun = true; |
michael@0 | 30 | #endif |
michael@0 | 31 | sAmount = 0; |
michael@0 | 32 | } |
michael@0 | 33 | |
michael@0 | 34 | static void* Alloc(void*, uInt items, uInt size); |
michael@0 | 35 | static void Free(void*, void* p); |
michael@0 | 36 | |
michael@0 | 37 | private: |
michael@0 | 38 | // |sAmount| can be (implicitly) accessed by multiple threads, so it |
michael@0 | 39 | // must be thread-safe. |
michael@0 | 40 | static Atomic<size_t> sAmount; |
michael@0 | 41 | |
michael@0 | 42 | MOZ_DEFINE_MALLOC_SIZE_OF(MallocSizeOf) |
michael@0 | 43 | MOZ_DEFINE_MALLOC_SIZE_OF_ON_ALLOC(MallocSizeOfOnAlloc) |
michael@0 | 44 | MOZ_DEFINE_MALLOC_SIZE_OF_ON_FREE(MallocSizeOfOnFree) |
michael@0 | 45 | |
michael@0 | 46 | NS_IMETHODIMP |
michael@0 | 47 | CollectReports(nsIHandleReportCallback* aHandleReport, nsISupports* aData); |
michael@0 | 48 | }; |
michael@0 | 49 | |
michael@0 | 50 | } // namespace mozilla |