src/share/vm/runtime/vm_version.cpp

rev 9054 : 8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
Reviewed-by: dholmes, mdoerr

*** 1,7 ****
  /*
!  * Copyright (c) 1998, 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.
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2019, 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.
*** 51,60 ****
--- 51,62 ----
  bool Abstract_VM_Version::_supports_atomic_getadd8 = false;
  unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
  unsigned int Abstract_VM_Version::_L1_data_cache_line_size = 0;
  int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0;
  
+ VirtualizationType Abstract_VM_Version::_detected_virtualization = NoDetectedVirtualization;
+ 
  #ifndef HOTSPOT_RELEASE_VERSION
    #error HOTSPOT_RELEASE_VERSION must be defined
  #endif
  #ifndef JRE_RELEASE_VERSION
    #error JRE_RELEASE_VERSION must be defined
*** 285,305 ****
    return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) |
           ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) |
           (Abstract_VM_Version::vm_build_number() & 0xFF);
  }
  
- 
  void VM_Version_init() {
    VM_Version::initialize();
  
  #ifndef PRODUCT
    if (PrintMiscellaneous && Verbose) {
      os::print_cpu_info(tty);
    }
  #endif
  }
  
  unsigned int Abstract_VM_Version::nof_parallel_worker_threads(
                                                        unsigned int num,
                                                        unsigned int den,
                                                        unsigned int switch_pt) {
    if (FLAG_IS_DEFAULT(ParallelGCThreads)) {
--- 287,328 ----
    return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) |
           ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) |
           (Abstract_VM_Version::vm_build_number() & 0xFF);
  }
  
  void VM_Version_init() {
    VM_Version::initialize();
  
  #ifndef PRODUCT
    if (PrintMiscellaneous && Verbose) {
      os::print_cpu_info(tty);
    }
  #endif
  }
  
+ bool Abstract_VM_Version::print_matching_lines_from_file(const char* filename, outputStream* st, const char* keywords_to_match[]) {
+   char line[500];
+   FILE* fp = fopen(filename, "r");
+   if (fp == NULL) {
+     return false;
+   }
+ 
+   st->print_cr("Virtualization information:");
+   while (fgets(line, sizeof(line), fp) != NULL) {
+     int i = 0;
+     while (keywords_to_match[i] != NULL) {
+       if (strncmp(line, keywords_to_match[i], strlen(keywords_to_match[i])) == 0) {
+         st->print("%s", line);
+         break;
+       }
+       i++;
+     }
+   }
+   fclose(fp);
+   return true;
+ }
+ 
  unsigned int Abstract_VM_Version::nof_parallel_worker_threads(
                                                        unsigned int num,
                                                        unsigned int den,
                                                        unsigned int switch_pt) {
    if (FLAG_IS_DEFAULT(ParallelGCThreads)) {