third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc - Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes.

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/profiler_unittest.cc

Issue 9311003: Update the tcmalloc chromium branch to r144 (gperftools 2.0), and merge chromium-specific changes. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Rebasec Created 8 years, 10 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/profile-handler_unittest.cc ('k') | third_party/tcmalloc/chromium/src/tests/sampler_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc b/third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc

index 19371b78553c5eae891e7150b2eb0ea088fffbe3..399891bc58b7e811eb4a975e53825c95e4400f7f 100644

--- a/third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc

+++ b/third_party/tcmalloc/chromium/src/tests/profiler_unittest.cc

@@ -41,7 +41,7 @@

#include <unistd.h> // for fork()

#endif

#include <sys/wait.h> // for wait()

-#include "google/profiler.h"

+#include "gperftools/profiler.h"

#include "base/simple_mutex.h"

#include "tests/testutil.h"

@@ -61,7 +61,7 @@ static void test_other_thread() {

for (i = 0; i < g_iters; ++i ) {

result ^= i;

}

- snprintf(b, sizeof(b), "%d", result); // get some libc action

+ snprintf(b, sizeof(b), "other: %d", result); // get some libc action

}

#endif

}

@@ -74,7 +74,7 @@ static void test_main_thread() {

for (i = 0; i < g_iters; ++i ) {

result ^= i;

}

- snprintf(b, sizeof(b), "%d", result); // get some libc action

+ snprintf(b, sizeof(b), "same: %d", result); // get some libc action

}