# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1384029171 -3600
# Node ID b699233403adce0316aeac32322bfd0452e795fb
# Parent  9a56121f285bee7f781077285e7c1c4a58d59142
Delegate hprof enabled information from hotspot to graal

diff -r 9a56121f285b -r b699233403ad graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java
--- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Sat Nov 09 21:30:33 2013 +0100
+++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/HotSpotVMConfig.java	Sat Nov 09 21:32:51 2013 +0100
@@ -671,6 +671,7 @@
     }
 
     @HotSpotVMFlag(name = "GraalDeferredInitBarriers") @Stable public boolean useDeferredInitBarriers;
+    @HotSpotVMFlag(name = "GraalHProfEnabled") @Stable public boolean useHeapProfiler;
 
     // Compressed Oops related values.
     @HotSpotVMFlag(name = "UseCompressedOops") @Stable public boolean useCompressedOops;
diff -r 9a56121f285b -r b699233403ad src/share/vm/graal/graalGlobals.hpp
--- a/src/share/vm/graal/graalGlobals.hpp	Sat Nov 09 21:30:33 2013 +0100
+++ b/src/share/vm/graal/graalGlobals.hpp	Sat Nov 09 21:32:51 2013 +0100
@@ -58,6 +58,9 @@
   product(bool, GraalDeferredInitBarriers, true,                            \
           "Defer write barriers of young objects")                          \
                                                                             \
+  product(bool, GraalHProfEnabled, false,                                   \
+          "Is Heap  Profiler enabled")                                      \
+                                                                            \
   develop(bool, GraalUseFastLocking, true,                                  \
           "Use fast inlined locking code")                                  \
                                                                             \
diff -r 9a56121f285b -r b699233403ad src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Sat Nov 09 21:30:33 2013 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Sat Nov 09 21:32:51 2013 +0100
@@ -2632,6 +2632,11 @@
           return JNI_ERR;
         }
 #endif // !INCLUDE_JVMTI
+#if defined(GRAAL)
+        if (strcmp(name, "hprof") == 0) {
+          FLAG_SET_CMDLINE(bool, GraalHProfEnabled, true);
+        }
+#endif
         add_init_library(name, options);
       }
     // -agentlib and -agentpath
@@ -2654,6 +2659,12 @@
           return JNI_ERR;
         }
 #endif // !INCLUDE_JVMTI
+#if defined(GRAAL)
+        if (valid_hprof_or_jdwp_agent(name, is_absolute_path)) {
+          FLAG_SET_CMDLINE(bool, GraalHProfEnabled, true);
+        }
+#endif
+
         add_init_agent(name, options, is_absolute_path);
       }
     // -javaagent