src/share/vm/memory/metaspace.cpp

rev 7563 : 8067941: [TESTBUG] Fix tests for OS with 64K page size.

*** 3826,3840 ****
        vsn.retire(&cm);
        assert(cm.sum_free_chunks_count() == 2, "should have been memory left for 2 medium chunks");
        assert(cm.sum_free_chunks() == 2*MediumChunk, "sizes should add up");
      }
  
!     { // 4 pages of VSN is committed, some is used by chunks
        ChunkManager cm(SpecializedChunk, SmallChunk, MediumChunk);
        VirtualSpaceNode vsn(vsn_test_size_bytes);
!       const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord;
!       assert(page_chunks < MediumChunk, "Test expects medium chunks to be at least 4*page_size");
        vsn.initialize();
        vsn.expand_by(page_chunks, page_chunks);
        vsn.get_chunk_vs(SmallChunk);
        vsn.get_chunk_vs(SpecializedChunk);
        vsn.retire(&cm);
--- 3826,3842 ----
        vsn.retire(&cm);
        assert(cm.sum_free_chunks_count() == 2, "should have been memory left for 2 medium chunks");
        assert(cm.sum_free_chunks() == 2*MediumChunk, "sizes should add up");
      }
  
!     const size_t page_chunks = 4 * (size_t)os::vm_page_size() / BytesPerWord;
!     // This doesn't work for systems with vm_page_size >= 16K.
!     if (page_chunks < MediumChunk) {
!       // 4 pages of VSN is committed, some is used by chunks
        ChunkManager cm(SpecializedChunk, SmallChunk, MediumChunk);
        VirtualSpaceNode vsn(vsn_test_size_bytes);
! 
        vsn.initialize();
        vsn.expand_by(page_chunks, page_chunks);
        vsn.get_chunk_vs(SmallChunk);
        vsn.get_chunk_vs(SpecializedChunk);
        vsn.retire(&cm);