RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-02-17 20:56:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

issue-446: Fixes compatability issues in malloc_hook_test for PPC64

Browse Source 
git-svn-id: http://gperftools.googlecode.com/svn/trunk@158 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
This commit is contained in:
chappedm@gmail.com 2012-09-18 01:43:02 +00:00
parent b05b6fc765
commit a2fec7c694
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/tests/malloc_hook_test.cc
View File

@ -97,11 +97,11 @@ using base::internal::kHookListMaxValues;
// values as integers for testing. // values as integers for testing.
typedef base::internal::HookList<MallocHook::NewHook> TestHookList; typedef base::internal::HookList<MallocHook::NewHook> TestHookList;
int TestHookList_Traverse(const TestHookList& list, int* output_array, int n) { int TestHookList_Traverse(const TestHookList& list, uintptr_t* output_array, int n) {
MallocHook::NewHook values_as_hooks[kHookListMaxValues]; MallocHook::NewHook values_as_hooks[kHookListMaxValues];
int result = list.Traverse(values_as_hooks, min(n, kHookListMaxValues)); int result = list.Traverse(values_as_hooks, min(n, kHookListMaxValues));
for (int i = 0; i < result; ++i) { for (int i = 0; i < result; ++i) {
output_array[i] = reinterpret_cast<const int&>(values_as_hooks[i]); output_array[i] = reinterpret_cast<const uintptr_t>(*values_as_hooks[i]);
} }
return result; return result;
} }
@ -120,7 +120,7 @@ bool TestHookList_Remove(TestHookList* list, int val) {
TEST(HookListTest, InitialValueExists) { TEST(HookListTest, InitialValueExists) {
TestHookList list = INIT_HOOK_LIST(69); TestHookList list = INIT_HOOK_LIST(69);
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(1, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(1, TestHookList_Traverse(list, values, 2));
EXPECT_EQ(69, values[0]); EXPECT_EQ(69, values[0]);
EXPECT_EQ(1, list.priv_end); EXPECT_EQ(1, list.priv_end);
@ -131,7 +131,7 @@ TEST(HookListTest, CanRemoveInitialValue) {
ASSERT_TRUE(TestHookList_Remove(&list, 69)); ASSERT_TRUE(TestHookList_Remove(&list, 69));
EXPECT_EQ(0, list.priv_end); EXPECT_EQ(0, list.priv_end);
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(0, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(0, TestHookList_Traverse(list, values, 2));
} }
@ -140,7 +140,7 @@ TEST(HookListTest, AddAppends) {
ASSERT_TRUE(TestHookList_Add(&list, 42)); ASSERT_TRUE(TestHookList_Add(&list, 42));
EXPECT_EQ(2, list.priv_end); EXPECT_EQ(2, list.priv_end);
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(2, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(2, TestHookList_Traverse(list, values, 2));
EXPECT_EQ(69, values[0]); EXPECT_EQ(69, values[0]);
EXPECT_EQ(42, values[1]); EXPECT_EQ(42, values[1]);
@ -153,7 +153,7 @@ TEST(HookListTest, RemoveWorksAndWillClearSize) {
ASSERT_TRUE(TestHookList_Remove(&list, 69)); ASSERT_TRUE(TestHookList_Remove(&list, 69));
EXPECT_EQ(2, list.priv_end); EXPECT_EQ(2, list.priv_end);
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(1, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(1, TestHookList_Traverse(list, values, 2));
EXPECT_EQ(42, values[0]); EXPECT_EQ(42, values[0]);
@ -172,7 +172,7 @@ TEST(HookListTest, AddPrependsAfterRemove) {
ASSERT_TRUE(TestHookList_Add(&list, 7)); ASSERT_TRUE(TestHookList_Add(&list, 7));
EXPECT_EQ(2, list.priv_end); EXPECT_EQ(2, list.priv_end);
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(2, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(2, TestHookList_Traverse(list, values, 2));
EXPECT_EQ(7, values[0]); EXPECT_EQ(7, values[0]);
EXPECT_EQ(42, values[1]); EXPECT_EQ(42, values[1]);
@ -182,7 +182,7 @@ TEST(HookListTest, InvalidAddRejected) {
TestHookList list = INIT_HOOK_LIST(69); TestHookList list = INIT_HOOK_LIST(69);
EXPECT_FALSE(TestHookList_Add(&list, 0)); EXPECT_FALSE(TestHookList_Add(&list, 0));
int values[2] = { 0, 0 }; uintptr_t values[2] = { 0, 0 };
EXPECT_EQ(1, TestHookList_Traverse(list, values, 2)); EXPECT_EQ(1, TestHookList_Traverse(list, values, 2));
EXPECT_EQ(69, values[0]); EXPECT_EQ(69, values[0]);
EXPECT_EQ(1, list.priv_end); EXPECT_EQ(1, list.priv_end);
@ -196,7 +196,7 @@ TEST(HookListTest, FillUpTheList) {
EXPECT_EQ(kHookListMaxValues, num_inserts); EXPECT_EQ(kHookListMaxValues, num_inserts);
EXPECT_EQ(kHookListMaxValues, list.priv_end); EXPECT_EQ(kHookListMaxValues, list.priv_end);
int values[kHookListMaxValues + 1]; uintptr_t values[kHookListMaxValues + 1];
EXPECT_EQ(kHookListMaxValues, TestHookList_Traverse(list, values, EXPECT_EQ(kHookListMaxValues, TestHookList_Traverse(list, values,
kHookListMaxValues)); kHookListMaxValues));
EXPECT_EQ(69, values[0]); EXPECT_EQ(69, values[0]);
@ -218,7 +218,7 @@ void MultithreadedTestThread(TestHookList* list, int shift,
int value = (i << shift) + thread_num; int value = (i << shift) + thread_num;
EXPECT_TRUE(TestHookList_Add(list, value)); EXPECT_TRUE(TestHookList_Add(list, value));
sched_yield(); // Ensure some more interleaving. sched_yield(); // Ensure some more interleaving.
int values[kHookListMaxValues + 1]; uintptr_t values[kHookListMaxValues + 1];
int num_values = TestHookList_Traverse(*list, values, kHookListMaxValues); int num_values = TestHookList_Traverse(*list, values, kHookListMaxValues);
EXPECT_LT(0, num_values); EXPECT_LT(0, num_values);
int value_index; int value_index;
@ -284,7 +284,7 @@ TEST(HookListTest, MultithreadedTest) {
RunManyThreadsWithId(&MultithreadedTestThreadRunner, num_threads_remaining, RunManyThreadsWithId(&MultithreadedTestThreadRunner, num_threads_remaining,
1 << 15); 1 << 15);
int values[kHookListMaxValues + 1]; uintptr_t values[kHookListMaxValues + 1];
EXPECT_EQ(0, TestHookList_Traverse(list, values, kHookListMaxValues)); EXPECT_EQ(0, TestHookList_Traverse(list, values, kHookListMaxValues));
EXPECT_EQ(0, list.priv_end); EXPECT_EQ(0, list.priv_end);
} }