Shark tweak

[Gary Benson]

Hi all,

This commit removes a bunch of debug options from Shark that duplicate
functionality already in HotSpot.  If you were using the Shark options
then please switch to their HotSpot equivalents:

  SharkStartAt -- use CIStart or CIStartOSR
  SharkStopAfter -- use CIEnd or CIEndOSR
  SharkOnlyCompile -- use CompileOnly

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r d1d6d20cf4d1 ChangeLog
--- a/ChangeLog	Mon Oct 12 11:50:57 2009 +0100
+++ b/ChangeLog	Mon Oct 12 12:01:20 2009 +0100
@@ -1,3 +1,10 @@
+2009-10-12  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/shark_globals.hpp:
+	Removed SharkStartAt, SharkStopAfter and SharkOnlyCompile.
+	* ports/hotspot/src/share/vm/shark/shark_globals.hpp
+	(SharkCompiler::compile_method): Likewise.
+
 2009-10-09  Edward Nevill   <ed at camswl.com>
 
 	* Added initial support for Shark + ARM asm
diff -r d1d6d20cf4d1 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Oct 12 11:50:57 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Oct 12 12:01:20 2009 +0100
@@ -94,27 +94,6 @@
   ResourceMark rm;
   const char *name = methodname(target);
 
-#ifndef PRODUCT
-  // Skip methods if requested
-  static uintx methods_seen = 0;
-  methods_seen++;
-  if (methods_seen < SharkStartAt) {
-    env->record_method_not_compilable("methods_seen < SharkStartAt");
-    return;
-  }
-  else if (methods_seen > SharkStopAfter) {
-    while (true)
-      sleep(1);
-  }
-#endif // !PRODUCT
-
-  if (SharkOnlyCompile != NULL) {
-    if (fnmatch(SharkOnlyCompile, name, 0)) {
-      env->record_method_not_compilable("does not match SharkOnlyCompile");
-      return;
-    }
-  }
-
   // Do the typeflow analysis
   ciTypeFlow *flow;
   if (entry_bci == InvocationEntryBci)
diff -r d1d6d20cf4d1 ports/hotspot/src/share/vm/shark/shark_globals.hpp
--- a/ports/hotspot/src/share/vm/shark/shark_globals.hpp	Mon Oct 12 11:50:57 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/shark_globals.hpp	Mon Oct 12 12:01:20 2009 +0100
@@ -37,15 +37,6 @@
           "Maximum bytecode size of methods to inline when using Shark")      \
                                                                               \
   /* compiler debugging */                                                    \
-  develop(uintx, SharkStartAt, 0,                                             \
-          "First method to consider when using Shark")                        \
-                                                                              \
-  develop(uintx, SharkStopAfter, max_uintx,                                   \
-          "Last method to consider when using Shark")                         \
-                                                                              \
-  develop(ccstr, SharkOnlyCompile, NULL,                                      \
-          "Only compile the specified method")                                \
-                                                                              \
   develop(ccstr, SharkPrintTypeflowOf, NULL,                                  \
           "Print the typeflow of the specified method")                       \
                                                                               \