jdk8-mips64-public/hotspot: comparison src/share/vm/memory/universe.cpp

-:81adfb064a4f
+:6acf14e730dd
 /*
-* Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1997, 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.
 oop Universe::_out_of_memory_error_gc_overhead_limit  = NULL;
 oop Universe::_out_of_memory_error_realloc_objects    = NULL;
 objArrayOop Universe::_preallocated_out_of_memory_error_array = NULL;
 volatile jint Universe::_preallocated_out_of_memory_error_avail_count = 0;
 bool Universe::_verify_in_progress                    = false;
+long Universe::verify_flags                           = Universe::Verify_All;
 oop Universe::_null_ptr_exception_instance            = NULL;
 oop Universe::_arithmetic_exception_instance          = NULL;
 oop Universe::_virtual_machine_error_instance         = NULL;
 oop Universe::_vm_exception                           = NULL;
 oop Universe::_allocation_context_notification_obj    = NULL;
 ClassLoader::create_package_info_table();
 if (DumpSharedSpaces) {
 MetaspaceShared::prepare_for_dumping();
 }
+}
+if (strlen(VerifySubSet) > 0) {
+Universe::initialize_verify_flags();
 }
 return JNI_OK;
 }
 heap()->print_extended_on(st);
 }
 st->print_cr("}");
 }
+void Universe::initialize_verify_flags() {
+verify_flags = 0;
+const char delimiter[] = " ,";
+size_t length = strlen(VerifySubSet);
+char* subset_list = NEW_C_HEAP_ARRAY(char, length + 1, mtInternal);
+strncpy(subset_list, VerifySubSet, length + 1);
+char* token = strtok(subset_list, delimiter);
+while (token != NULL) {
+if (strcmp(token, "threads") == 0) {
+verify_flags |= Verify_Threads;
+} else if (strcmp(token, "heap") == 0) {
+verify_flags |= Verify_Heap;
+} else if (strcmp(token, "symbol_table") == 0) {
+verify_flags |= Verify_SymbolTable;
+} else if (strcmp(token, "string_table") == 0) {
+verify_flags |= Verify_StringTable;
+} else if (strcmp(token, "codecache") == 0) {
+verify_flags |= Verify_CodeCache;
+} else if (strcmp(token, "dictionary") == 0) {
+verify_flags |= Verify_SystemDictionary;
+} else if (strcmp(token, "classloader_data_graph") == 0) {
+verify_flags |= Verify_ClassLoaderDataGraph;
+} else if (strcmp(token, "metaspace") == 0) {
+verify_flags |= Verify_MetaspaceAux;
+} else if (strcmp(token, "jni_handles") == 0) {
+verify_flags |= Verify_JNIHandles;
+} else if (strcmp(token, "c-heap") == 0) {
+verify_flags |= Verify_CHeap;
+} else if (strcmp(token, "codecache_oops") == 0) {
+verify_flags |= Verify_CodeCacheOops;
+} else {
+vm_exit_during_initialization(err_msg("VerifySubSet: \'%s\' memory sub-system is unknown, please correct it", token));
+}
+token = strtok(NULL, delimiter);
+}
+FREE_C_HEAP_ARRAY(char, subset_list, mtInternal);
+}
+bool Universe::should_verify_subset(uint subset) {
+if (verify_flags & subset) {
+return true;
+}
+return false;
+}
 void Universe::verify(VerifyOption option, const char* prefix, bool silent) {
 // The use of _verify_in_progress is a temporary work around for
 // 6320749.  Don't bother with a creating a class to set and clear
 // it since it is only used in this method and the control flow is
 // straight forward.
 HandleMark hm;  // Handles created during verification can be zapped
 _verify_count++;
 if (!silent) gclog_or_tty->print("%s", prefix);
 if (!silent) gclog_or_tty->print("[Verifying ");
-if (!silent) gclog_or_tty->print("threads ");
+if (should_verify_subset(Verify_Threads)) {
-Threads::verify();
+if (!silent) gclog_or_tty->print("Threads ");
-if (!silent) gclog_or_tty->print("heap ");
+Threads::verify();
-heap()->verify(silent, option);
+}
-if (!silent) gclog_or_tty->print("syms ");
+if (should_verify_subset(Verify_Heap)) {
-SymbolTable::verify();
+if (!silent) gclog_or_tty->print("Heap ");
-if (!silent) gclog_or_tty->print("strs ");
+heap()->verify(silent, option);
-StringTable::verify();
+}
+if (should_verify_subset(Verify_SymbolTable)) {
+if (!silent) gclog_or_tty->print("SymbolTable ");
+SymbolTable::verify();
+}
+if (should_verify_subset(Verify_StringTable)) {
+if (!silent) gclog_or_tty->print("StringTable ");
+StringTable::verify();
+}
+if (should_verify_subset(Verify_CodeCache)) {
 {
 MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
-if (!silent) gclog_or_tty->print("zone ");
+if (!silent) gclog_or_tty->print("CodeCache ");
 CodeCache::verify();
 }
-if (!silent) gclog_or_tty->print("dict ");
+}
-SystemDictionary::verify();
+if (should_verify_subset(Verify_SystemDictionary)) {
+if (!silent) gclog_or_tty->print("SystemDictionary ");
+SystemDictionary::verify();
+}
 #ifndef PRODUCT
-if (!silent) gclog_or_tty->print("cldg ");
+if (should_verify_subset(Verify_ClassLoaderDataGraph)) {
-ClassLoaderDataGraph::verify();
+if (!silent) gclog_or_tty->print("ClassLoaderDataGraph ");
+ClassLoaderDataGraph::verify();
+}
 #endif
-if (!silent) gclog_or_tty->print("metaspace chunks ");
+if (should_verify_subset(Verify_MetaspaceAux)) {
-MetaspaceAux::verify_free_chunks();
+if (!silent) gclog_or_tty->print("MetaspaceAux ");
-if (!silent) gclog_or_tty->print("hand ");
+MetaspaceAux::verify_free_chunks();
-JNIHandles::verify();
+}
-if (!silent) gclog_or_tty->print("C-heap ");
+if (should_verify_subset(Verify_JNIHandles)) {
-os::check_heap();
+if (!silent) gclog_or_tty->print("JNIHandles ");
-if (!silent) gclog_or_tty->print("code cache ");
+JNIHandles::verify();
-CodeCache::verify_oops();
+}
+if (should_verify_subset(Verify_CHeap)) {
+if (!silent) gclog_or_tty->print("C-heap ");
+os::check_heap();
+}
+if (should_verify_subset(Verify_CodeCacheOops)) {
+if (!silent) gclog_or_tty->print("CodeCache Oops ");
+CodeCache::verify_oops();
+}
 if (!silent) gclog_or_tty->print_cr("]");
 _verify_in_progress = false;
 }

Mercurial > jdk8-mips64-public > hotspot / file comparison

comparison: src/share/vm/memory/universe.cpp

src/share/vm/memory/universe.cpp