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

Side by Side Diff: Source/wtf/Partitions.h

Issue 1288773004: Merge 198825 "PartitionAlloc: Add a lock to Partitions::initiali..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2454/
Patch Set: Created 5 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | Source/wtf/Partitions.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 return totalSize; 92 return totalSize;
93 } 93 }
94 94
95 static void decommitFreeableMemory(); 95 static void decommitFreeableMemory();
96 96
97 static void reportMemoryUsageHistogram(); 97 static void reportMemoryUsageHistogram();
98 98
99 static void dumpMemoryStats(PartitionStatsDumper*); 99 static void dumpMemoryStats(PartitionStatsDumper*);
100 100
101 private: 101 private:
102 static int s_initializationLock;
102 static bool s_initialized; 103 static bool s_initialized;
103 static PartitionAllocatorGeneric m_fastMallocAllocator; 104 static PartitionAllocatorGeneric m_fastMallocAllocator;
104 static PartitionAllocatorGeneric m_bufferAllocator; 105 static PartitionAllocatorGeneric m_bufferAllocator;
105 static SizeSpecificPartitionAllocator<3328> m_objectModelAllocator; 106 static SizeSpecificPartitionAllocator<3328> m_objectModelAllocator;
106 static SizeSpecificPartitionAllocator<1024> m_layoutAllocator; 107 static SizeSpecificPartitionAllocator<1024> m_layoutAllocator;
107 static HistogramEnumerationFunction m_histogramEnumeration; 108 static HistogramEnumerationFunction m_histogramEnumeration;
108 }; 109 };
109 110
110 } // namespace WTF 111 } // namespace WTF
111 112
112 #endif // Partitions_h 113 #endif // Partitions_h
OLDNEW
« no previous file with comments | « no previous file | Source/wtf/Partitions.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698