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

Unified Diff: base/memory/shared_memory_tracker.h

Issue 2873433004: Replace SharedMemory::UniqueID usages with SharedMemoryHandle's guid (Closed)
Patch Set: Address on reviews Created 3 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/memory/shared_memory_posix.cc ('k') | base/memory/shared_memory_tracker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/shared_memory_tracker.h
diff --git a/base/memory/shared_memory_tracker.h b/base/memory/shared_memory_tracker.h
index 039e48d515fafc1fe2b49bcee9f743d485de3454..007bcd29e532779e39df39fee187fb2717a36787 100644
--- a/base/memory/shared_memory_tracker.h
+++ b/base/memory/shared_memory_tracker.h
@@ -5,7 +5,7 @@
#ifndef BASE_MEMORY_SHARED_MEMORY_TRACKER_H_
#define BASE_MEMORY_SHARED_MEMORY_TRACKER_H_
-#include <unordered_map>
+#include <map>
#include "base/memory/shared_memory.h"
#include "base/synchronization/lock.h"
@@ -18,8 +18,7 @@ class ProcessMemoryDump;
}
// SharedMemoryTracker tracks shared memory usage.
-class BASE_EXPORT SharedMemoryTracker
- : public base::trace_event::MemoryDumpProvider {
+class BASE_EXPORT SharedMemoryTracker : public trace_event::MemoryDumpProvider {
public:
// Returns a singleton instance.
static SharedMemoryTracker* GetInstance();
@@ -31,24 +30,16 @@ class BASE_EXPORT SharedMemoryTracker
void DecrementMemoryUsage(const SharedMemory& shared_memory);
private:
- struct Usage {
- Usage();
- Usage(const Usage& rhs);
- ~Usage();
- SharedMemory::UniqueId unique_id;
- size_t size;
- };
-
SharedMemoryTracker();
~SharedMemoryTracker() override;
- // base::trace_event::MemoryDumpProvider implementation.
- bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
- base::trace_event::ProcessMemoryDump* pmd) override;
+ // trace_event::MemoryDumpProvider implementation.
+ bool OnMemoryDump(const trace_event::MemoryDumpArgs& args,
+ trace_event::ProcessMemoryDump* pmd) override;
// Used to lock when |usages_| is modified or read.
Lock usages_lock_;
- std::unordered_map<const SharedMemory*, Usage> usages_;
+ std::map<const SharedMemory*, size_t> usages_;
DISALLOW_COPY_AND_ASSIGN(SharedMemoryTracker);
};
« no previous file with comments | « base/memory/shared_memory_posix.cc ('k') | base/memory/shared_memory_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698