src/hotspot/share/prims/jvm.cpp

*** 21,30 ****
--- 21,31 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "jvm.h"
  #include "classfile/classFileStream.hpp"
  #include "classfile/classLoader.hpp"
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/javaAssertions.hpp"
  #include "classfile/javaClasses.inline.hpp"
*** 44,54 ****
  #include "oops/instanceKlass.hpp"
  #include "oops/method.hpp"
  #include "oops/objArrayKlass.hpp"
  #include "oops/objArrayOop.inline.hpp"
  #include "oops/oop.inline.hpp"
- #include "prims/jvm.h"
  #include "prims/jvm_misc.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/jvmtiThreadState.hpp"
  #include "prims/nativeLookup.hpp"
  #include "prims/privilegedStack.hpp"
--- 45,54 ----
*** 213,223 ****
  
  // Wrapper to trace JVM functions
  
  #ifdef ASSERT
    Histogram* JVMHistogram;
!   volatile jint JVMHistogram_lock = 0;
  
    class JVMHistogramElement : public HistogramElement {
      public:
       JVMHistogramElement(const char* name);
    };
--- 213,223 ----
  
  // Wrapper to trace JVM functions
  
  #ifdef ASSERT
    Histogram* JVMHistogram;
!   volatile int JVMHistogram_lock = 0;
  
    class JVMHistogramElement : public HistogramElement {
      public:
       JVMHistogramElement(const char* name);
    };
*** 3764,3774 ****
    info->patch_version = Abstract_VM_Version::vm_patch_version();
  
    // when we add a new capability in the jvm_version_info struct, we should also
    // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
    // counter defined in runtimeService.cpp.
!   info->is_attachable = AttachListener::is_attach_supported();
  }
  JVM_END
  
  // Returns an array of java.lang.String objects containing the input arguments to the VM.
  JVM_ENTRY(jobjectArray, JVM_GetVmArguments(JNIEnv *env))
--- 3764,3774 ----
    info->patch_version = Abstract_VM_Version::vm_patch_version();
  
    // when we add a new capability in the jvm_version_info struct, we should also
    // consider to expose this new capability in the sun.rt.jvmCapabilities jvmstat
    // counter defined in runtimeService.cpp.
!   info->is_attach_supported = AttachListener::is_attach_supported();
  }
  JVM_END
  
  // Returns an array of java.lang.String objects containing the input arguments to the VM.
  JVM_ENTRY(jobjectArray, JVM_GetVmArguments(JNIEnv *env))