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

Unified Diff: content/common/host_discardable_shared_memory_manager.cc

Issue 1018743003: Re-land: base: Replace PurgeAndTruncate with Shrink function. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo Created 5 years, 8 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/discardable_shared_memory_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/host_discardable_shared_memory_manager.cc
diff --git a/content/common/host_discardable_shared_memory_manager.cc b/content/common/host_discardable_shared_memory_manager.cc
index 49c24f812424dac4e3c16efe9eda29d1355126a2..04c677eaeb836200585a58181dbb96e7f47c40d8 100644
--- a/content/common/host_discardable_shared_memory_manager.cc
+++ b/content/common/host_discardable_shared_memory_manager.cc
@@ -359,12 +359,17 @@ void HostDiscardableSharedMemoryManager::ReduceMemoryUsageUntilWithinLimit(
scoped_refptr<MemorySegment> segment = segments_.back();
segments_.pop_back();
- // Attempt to purge and truncate LRU segment. When successful, as much
- // memory as possible will be released to the OS. How much memory is
- // released depends on the platform. The child process should perform
- // periodic cleanup to ensure that all memory is release within a
- // reasonable amount of time.
- if (segment->memory()->PurgeAndTruncate(current_time)) {
+ // Attempt to purge LRU segment. When successful, released the memory.
+ if (segment->memory()->Purge(current_time)) {
+#if defined(DISCARDABLE_SHARED_MEMORY_SHRINKING)
+ size_t size = segment->memory()->mapped_size();
+ DCHECK_GE(bytes_allocated_, size);
+ bytes_allocated_ -= size;
+ // Shrink memory segment. This will immediately release the memory to
+ // the OS.
+ segment->memory()->Shrink();
+ DCHECK_EQ(segment->memory()->mapped_size(), 0u);
+#endif
ReleaseMemory(segment->memory());
continue;
}
« no previous file with comments | « base/memory/discardable_shared_memory_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698