changeset in /hg/icedtea: 2009-06-26 Gary Benson <gbenson at redh...

[Gary Benson]

changeset 97798e89d452 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=97798e89d452
description:
	2009-06-26  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
		(SharkCompiler::SharkCompiler): Moved LLVM multithreading
		initialization from SharkFunction::initialize.
		* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
		(SharkFunction::initialize): Moved LLVM multithreading
		initialization to SharkCompiler::SharkCompiler.

diffstat:

3 files changed, 18 insertions(+), 6 deletions(-)
ChangeLog                                          |    9 +++++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    9 +++++++++
ports/hotspot/src/share/vm/shark/sharkFunction.cpp |    6 ------

diffs (51 lines):

diff -r b26e1c8bfc51 -r 97798e89d452 ChangeLog
--- a/ChangeLog	Thu Jun 25 11:40:43 2009 +0100
+++ b/ChangeLog	Fri Jun 26 04:51:17 2009 -0400
@@ -1,3 +1,12 @@ 2009-06-25  Gary Benson  <gbenson at redhat
+2009-06-26  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Moved LLVM multithreading
+	initialization from SharkFunction::initialize.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::initialize): Moved LLVM multithreading
+	initialization to SharkCompiler::SharkCompiler.
+
 2009-06-25  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
diff -r b26e1c8bfc51 -r 97798e89d452 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu Jun 25 11:40:43 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Jun 26 04:51:17 2009 -0400
@@ -33,6 +33,15 @@ SharkCompiler::SharkCompiler()
 SharkCompiler::SharkCompiler()
   : AbstractCompiler()
 {
+#if SHARK_LLVM_VERSION >= 26
+  // Make LLVM safe for multithreading.  We only make LLVM calls from
+  // the compiler thread, but if LLVM leaves stubs to be rewritten on
+  // execution then it's possible for Java threads to be making LLVM
+  // calls at the same time we are.
+  if (!llvm_start_multithreaded()) 
+    warning("llvm_start_multithreaded() failed");
+#endif
+
   // Create a module to build our functions into
   _module = new Module("shark");
 
diff -r b26e1c8bfc51 -r 97798e89d452 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Thu Jun 25 11:40:43 2009 +0100
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Jun 26 04:51:17 2009 -0400
@@ -30,12 +30,6 @@ using namespace llvm;
 
 void SharkFunction::initialize(const char *name)
 {
-
-#if SHARK_LLVM_VERSION >= 26
-  // Initialize llvm mutex guards
-  llvm_start_multithreaded();
-#endif
-
   // Create the function
   _function = Function::Create(
     SharkType::entry_point_type(),