Merge "Undecoded jobject leaking in through attachThread"

[android-x86/dalvik.git] / vm / Globals.h

diff --git a/vm/Globals.h b/vm/Globals.h
index 90e9e88..6ba6d5a 100644 (file)
--- a/vm/Globals.h
+++ b/vm/Globals.h
@@ -91,6 +91,9 @@ struct DvmGlobals {
     int         jdwpPort;
     bool        jdwpSuspend;
 
+    /* use wall clock as method profiler clock source? */
+    bool        profilerWallClock;
+
     /*
      * Lock profiling threshold value in milliseconds.  Acquires that
      * exceed threshold are logged.  Acquires within the threshold are
@@ -115,6 +118,8 @@ struct DvmGlobals {
     DexOptimizerMode    dexOptMode;
     DexClassVerifyMode  classVerifyMode;
 
+    bool        dexOptForSmp;
+
     /*
      * GC option flags.
      */
@@ -296,7 +301,7 @@ struct DvmGlobals {
     //int         offJavaNioDirectByteBufferImpl_pointer;
 
     /* method pointers - java.security.AccessController */
-    volatile bool javaSecurityAccessControllerReady;
+    volatile int javaSecurityAccessControllerReady;
     Method*     methJavaSecurityAccessController_doPrivileged[4];
 
     /* constructor method pointers; no vtable involved, so use Method* */
@@ -598,7 +603,6 @@ struct DvmGlobals {
     enum { kDPOff=0, kDPWarn, kDPErr, kDPAbort } deadlockPredictMode;
 #endif
 
-#ifdef WITH_PROFILER
     /*
      * When a profiler is enabled, this is incremented.  Distinct profilers
      * include "dmtrace" method tracing, emulator method tracing, and
@@ -628,7 +632,8 @@ struct DvmGlobals {
     /*
      * Pointers to the original methods for things that have been inlined.
      * This makes it easy for us to output method entry/exit records for
-     * the method calls we're not actually making.
+     * the method calls we're not actually making.  (Used by method
+     * profiling.)
      */
     Method**    inlinedMethods;
 
@@ -637,7 +642,6 @@ struct DvmGlobals {
      */
     int*        executedInstrCounts;
     bool        instructionCountEnableCount;
-#endif
 
     /*
      * Signal catcher thread (for SIGQUIT).