stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8166804: Convert TestMetachunk_test to GTest

Browse Source 
Reviewed-by: iignatyev
This commit is contained in:
Kirill Zhaldybin 2016-09-28 17:26:43 +03:00
parent ecccfb5c76
commit c6515608b6
4 changed files with 93 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hotspot/src/share/vm/memory/metachunk.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -111,61 +111,3 @@ void Metachunk::verify() {
return;
}
/////////////// Unit tests ///////////////
#ifndef PRODUCT
class TestMetachunk {
public:
static void test() {
size_t size = 2 * 1024 * 1024;
void* memory = malloc(size);
assert(memory != NULL, "Failed to malloc 2MB");
Metachunk* metachunk = ::new (memory) Metachunk(size / BytesPerWord, NULL);
assert(metachunk->bottom() == (MetaWord*)metachunk, "assert");
assert(metachunk->end() == (uintptr_t*)metachunk + metachunk->size(), "assert");
// Check sizes
assert(metachunk->size() == metachunk->word_size(), "assert");
assert(metachunk->word_size() == pointer_delta(metachunk->end(), metachunk->bottom(),
sizeof(MetaWord*)), "assert");
// Check usage
assert(metachunk->used_word_size() == metachunk->overhead(), "assert");
assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
assert(metachunk->top() == metachunk->initial_top(), "assert");
assert(metachunk->is_empty(), "assert");
// Allocate
size_t alloc_size = 64; // Words
assert(is_size_aligned(alloc_size, Metachunk::object_alignment()), "assert");
MetaWord* mem = metachunk->allocate(alloc_size);
// Check post alloc
assert(mem == metachunk->initial_top(), "assert");
assert(mem + alloc_size == metachunk->top(), "assert");
assert(metachunk->used_word_size() == metachunk->overhead() + alloc_size, "assert");
assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
assert(!metachunk->is_empty(), "assert");
// Clear chunk
metachunk->reset_empty();
// Check post clear
assert(metachunk->used_word_size() == metachunk->overhead(), "assert");
assert(metachunk->free_word_size() == metachunk->word_size() - metachunk->used_word_size(), "assert");
assert(metachunk->top() == metachunk->initial_top(), "assert");
assert(metachunk->is_empty(), "assert");
free(memory);
}
};
void TestMetachunk_test() {
TestMetachunk::test();
}
#endif

4
hotspot/src/share/vm/memory/metachunk.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -95,7 +95,7 @@ class Metabase VALUE_OBJ_CLASS_SPEC {
// +--------------+ <- bottom --+ --+
class Metachunk : public Metabase<Metachunk> {
friend class TestMetachunk;
friend class MetachunkTest;
// The VirtualSpaceNode containing this chunk.
VirtualSpaceNode* _container;

1
hotspot/src/share/vm/utilities/internalVMTests.cpp
View File

@ -48,7 +48,6 @@ void InternalVMTests::run() {
run_unit_test(TestReserveMemorySpecial_test);
run_unit_test(TestVirtualSpace_test);
run_unit_test(TestMetaspaceAux_test);
run_unit_test(TestMetachunk_test);
run_unit_test(TestVirtualSpaceNode_test);
run_unit_test(TestGlobalDefinitions_test);
run_unit_test(GCTimer_test);

90
hotspot/test/native/memory/test_metachunk.cpp Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
#include "precompiled.hpp"
#include "memory/allocation.hpp"
#include "memory/metachunk.hpp"
#include "unittest.hpp"
#include "utilities/copy.hpp"
#include "utilities/debug.hpp"
class MetachunkTest {
public:
static MetaWord* initial_top(Metachunk* metachunk) {
return metachunk->initial_top();
}
static MetaWord* top(Metachunk* metachunk) {
return metachunk->top();
}
};
TEST(Metachunk, basic) {
size_t size = 2 * 1024 * 1024;
void* memory = malloc(size);
ASSERT_TRUE(NULL != memory) << "Failed to malloc 2MB";
Metachunk* metachunk = ::new (memory) Metachunk(size / BytesPerWord, NULL);
EXPECT_EQ((MetaWord*) metachunk, metachunk->bottom());
EXPECT_EQ((uintptr_t*) metachunk + metachunk->size(), metachunk->end());
// Check sizes
EXPECT_EQ(metachunk->size(), metachunk->word_size());
EXPECT_EQ(pointer_delta(metachunk->end(), metachunk->bottom(),
sizeof (MetaWord*)),
metachunk->word_size());
// Check usage
EXPECT_EQ(metachunk->used_word_size(), metachunk->overhead());
EXPECT_EQ(metachunk->word_size() - metachunk->used_word_size(),
metachunk->free_word_size());
EXPECT_EQ(MetachunkTest::top(metachunk), MetachunkTest::initial_top(metachunk));
EXPECT_TRUE(metachunk->is_empty());
// Allocate
size_t alloc_size = 64; // Words
EXPECT_TRUE(is_size_aligned(alloc_size, Metachunk::object_alignment()));
MetaWord* mem = metachunk->allocate(alloc_size);
// Check post alloc
EXPECT_EQ(MetachunkTest::initial_top(metachunk), mem);
EXPECT_EQ(MetachunkTest::top(metachunk), mem + alloc_size);
EXPECT_EQ(metachunk->overhead() + alloc_size, metachunk->used_word_size());
EXPECT_EQ(metachunk->word_size() - metachunk->used_word_size(),
metachunk->free_word_size());
EXPECT_FALSE(metachunk->is_empty());
// Clear chunk
metachunk->reset_empty();
// Check post clear
EXPECT_EQ(metachunk->used_word_size(), metachunk->overhead());
EXPECT_EQ(metachunk->word_size() - metachunk->used_word_size(),
metachunk->free_word_size());
EXPECT_EQ(MetachunkTest::top(metachunk), MetachunkTest::initial_top(metachunk));
EXPECT_TRUE(metachunk->is_empty());
free(memory);
}