/hg/icedtea6: 2009-10-12 Gary Benson <gbenson at redhat.com>

[gbenson at icedtea.classpath.org]

changeset f2b2f87f120a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2b2f87f120a
author: Gary Benson <gbenson at redhat.com>
date: Mon Oct 12 06:54:47 2009 -0400

	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.


diffstat:

3 files changed, 7 insertions(+), 30 deletions(-)
ChangeLog                                          |    7 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   21 --------------------
ports/hotspot/src/share/vm/shark/shark_globals.hpp |    9 --------

diffs (64 lines):

diff -r 594e47c327ad -r f2b2f87f120a ChangeLog
--- a/ChangeLog	Fri Oct 09 17:21:41 2009 +0100
+++ b/ChangeLog	Mon Oct 12 06:54:47 2009 -0400
@@ -1,3 +1,10 @@ 2009-10-09  Edward Nevill   <ed at camswl.c
+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 594e47c327ad -r f2b2f87f120a ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Oct 09 17:21:41 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Oct 12 06:54:47 2009 -0400
@@ -93,27 +93,6 @@ void SharkCompiler::compile_method(ciEnv
 
   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;
diff -r 594e47c327ad -r f2b2f87f120a ports/hotspot/src/share/vm/shark/shark_globals.hpp
--- a/ports/hotspot/src/share/vm/shark/shark_globals.hpp	Fri Oct 09 17:21:41 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/shark_globals.hpp	Mon Oct 12 06:54:47 2009 -0400
@@ -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")                       \
                                                                               \