third_party/tcmalloc/chromium/src/packed-cache-inl.h - Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/tcmalloc/chromium/src/packed-cache-inl.h

Issue 7050034: Merge google-perftools r109 (the current contents of third_party/tcmalloc/vendor) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 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

« third_party/tcmalloc/chromium/src/config_win.h ('K') | « third_party/tcmalloc/chromium/src/memory_region_map.cc ('k') | third_party/tcmalloc/chromium/src/page_heap.h » ('j') | third_party/tcmalloc/chromium/src/page_heap.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/packed-cache-inl.h

===================================================================

--- third_party/tcmalloc/chromium/src/packed-cache-inl.h (revision 87277)

+++ third_party/tcmalloc/chromium/src/packed-cache-inl.h (working copy)

@@ -112,10 +112,11 @@

#define TCMALLOC_PACKED_CACHE_INL_H_

#include "config.h"

+#include <stddef.h> // for size_t

#ifdef HAVE_STDINT_H

-#include <stdint.h>

+#include <stdint.h> // for uintptr_t

#endif

-#include "base/basictypes.h" // for COMPILE_ASSERT

+#include "base/basictypes.h"

#include "internal_logging.h"

// A safe way of doing "(1 << n) - 1" -- without worrying about overflow

@@ -134,7 +135,12 @@

public:

typedef uintptr_t K;

typedef size_t V;

+#ifdef TCMALLOC_SMALL_BUT_SLOW

+ // Decrease the size map cache if running in the small memory mode.

static const int kHashbits = 12;

+#else

+ static const int kHashbits = 16;

+#endif

static const int kValuebits = 7;

static const bool kUseWholeKeys = kKeybits + kValuebits <= 8 * sizeof(T);