truffle: src/share/vm/memory/metaspace.cpp comparison

comparison src/share/vm/memory/metaspace.cpp @ 14237:db1ff6781ab4

Merge

author	morris
date	Fri, 10 Jan 2014 12:54:08 -0800
parents	ce86c36b8921 a2a3f08b96fa
children	e4e941b83466

comparison

equal deleted inserted replaced

-:c8907928a976
+:db1ff6781ab4
 // Accessors
 MemRegion* reserved() { return &_reserved; }
 VirtualSpace* virtual_space() const { return (VirtualSpace*) &_virtual_space; }
 // Returns true if "word_size" is available in the VirtualSpace
-bool is_available(size_t word_size) { return _top + word_size <= end(); }
+bool is_available(size_t word_size) { return word_size <= pointer_delta(end(), _top, sizeof(MetaWord)); }
 MetaWord* top() const { return _top; }
 void inc_top(size_t word_size) { _top += word_size; }
 uintx container_count() { return _container_count; }
 assert(cm.sum_free_chunks_count() == (num_small_chunks + num_spec_chunks), "should be space for 3 chunks");
 assert(cm.sum_free_chunks() == words_left, "sizes should add up");
 }
 }
+#define assert_is_available_positive(word_size) \
+assert(vsn.is_available(word_size), \
+err_msg(#word_size ": " PTR_FORMAT " bytes were not available in " \
+"VirtualSpaceNode [" PTR_FORMAT ", " PTR_FORMAT ")", \
+(uintptr_t)(word_size * BytesPerWord), vsn.bottom(), vsn.end()));
+#define assert_is_available_negative(word_size) \
+assert(!vsn.is_available(word_size), \
+err_msg(#word_size ": " PTR_FORMAT " bytes should not be available in " \
+"VirtualSpaceNode [" PTR_FORMAT ", " PTR_FORMAT ")", \
+(uintptr_t)(word_size * BytesPerWord), vsn.bottom(), vsn.end()));
+static void test_is_available_positive() {
+// Reserve some memory.
+VirtualSpaceNode vsn(os::vm_allocation_granularity());
+assert(vsn.initialize(), "Failed to setup VirtualSpaceNode");
+// Commit some memory.
+size_t commit_word_size = os::vm_allocation_granularity() / BytesPerWord;
+bool expanded = vsn.expand_by(commit_word_size, commit_word_size);
+assert(expanded, "Failed to commit");
+// Check that is_available accepts the committed size.
+assert_is_available_positive(commit_word_size);
+// Check that is_available accepts half the committed size.
+size_t expand_word_size = commit_word_size / 2;
+assert_is_available_positive(expand_word_size);
+}
+static void test_is_available_negative() {
+// Reserve some memory.
+VirtualSpaceNode vsn(os::vm_allocation_granularity());
+assert(vsn.initialize(), "Failed to setup VirtualSpaceNode");
+// Commit some memory.
+size_t commit_word_size = os::vm_allocation_granularity() / BytesPerWord;
+bool expanded = vsn.expand_by(commit_word_size, commit_word_size);
+assert(expanded, "Failed to commit");
+// Check that is_available doesn't accept a too large size.
+size_t two_times_commit_word_size = commit_word_size * 2;
+assert_is_available_negative(two_times_commit_word_size);
+}
+static void test_is_available_overflow() {
+// Reserve some memory.
+VirtualSpaceNode vsn(os::vm_allocation_granularity());
+assert(vsn.initialize(), "Failed to setup VirtualSpaceNode");
+// Commit some memory.
+size_t commit_word_size = os::vm_allocation_granularity() / BytesPerWord;
+bool expanded = vsn.expand_by(commit_word_size, commit_word_size);
+assert(expanded, "Failed to commit");
+// Calculate a size that will overflow the virtual space size.
+void* virtual_space_max = (void*)(uintptr_t)-1;
+size_t bottom_to_max = pointer_delta(virtual_space_max, vsn.bottom(), 1);
+size_t overflow_size = bottom_to_max + BytesPerWord;
+size_t overflow_word_size = overflow_size / BytesPerWord;
+// Check that is_available can handle the overflow.
+assert_is_available_negative(overflow_word_size);
+}
+static void test_is_available() {
+TestVirtualSpaceNodeTest::test_is_available_positive();
+TestVirtualSpaceNodeTest::test_is_available_negative();
+TestVirtualSpaceNodeTest::test_is_available_overflow();
+}
 };
 void TestVirtualSpaceNode_test() {
 TestVirtualSpaceNodeTest::test();
+TestVirtualSpaceNodeTest::test_is_available();
 }
 #endif

Mercurial > hg > truffle

comparison src/share/vm/memory/metaspace.cpp @ 14237:db1ff6781ab4