third_party/tcmalloc/chromium/src/tests/sampler_test.cc - 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/tests/sampler_test.cc

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, 6 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 | « third_party/tcmalloc/chromium/src/tests/realloc_unittest.cc ('k') | third_party/tcmalloc/chromium/src/tests/sampling_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/tcmalloc/chromium/src/tests/sampler_test.cc

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

--- third_party/tcmalloc/chromium/src/tests/sampler_test.cc (revision 88335)

+++ third_party/tcmalloc/chromium/src/tests/sampler_test.cc (working copy)

@@ -87,7 +87,7 @@

char buf[256]; // should be big enough for all logging

va_list ap;

va_start(ap, format);

- vsnprintf(buf, sizeof(buf), format, ap);

+ perftools_vsnprintf(buf, sizeof(buf), format, ap);

va_end(ap);

return buf;

}

@@ -647,6 +647,11 @@

LOG(INFO) << "Size of Sampler object is: " << sizeof(sampler);

}

+// Make sure sampling is enabled, or the tests won't work right.

+DECLARE_int64(tcmalloc_sample_parameter);

int main(int argc, char **argv) {

+ if (FLAGS_tcmalloc_sample_parameter == 0)

+ FLAGS_tcmalloc_sample_parameter = 524288;

return RUN_ALL_TESTS();

}