harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfur...@apache.org
Subject svn commit: r600979 - in /harmony/enhanced/drlvm/trunk/vm/vmcore: build/vmcore.exp src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java src/thread/thread_manager.cpp
Date Tue, 04 Dec 2007 15:37:55 GMT
Author: mfursov
Date: Tue Dec  4 07:37:50 2007
New Revision: 600979

URL: http://svn.apache.org/viewvc?rev=600979&view=rev
Log:
Fix for HARMONY-5249 [drlvm][regression] Build on Linux is broken.
Fix for HARMONY-5243 [drlvm][jit][server] Resgression on smoke tests in server mode.


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp?rev=600979&r1=600978&r2=600979&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/build/vmcore.exp Tue Dec  4 07:37:50 2007
@@ -67,7 +67,7 @@
     class_iterator_initialize;
     class_load_class_by_descriptor;
     class_load_class_by_name;
-    class_load_class_by_name_using_bootstrap_class_loader;
+    class_lookup_class_by_name_using_bootstrap_class_loader;
     class_loader_load_native_lib;
     class_loader_lookup;
     class_lookup_method_recursively;
@@ -272,6 +272,7 @@
     Java_java_util_concurrent_locks_LockSupport_parkUntil;
     Java_java_util_concurrent_locks_LockSupport_unpark;
     Java_org_apache_harmony_drlvm_thread_ThreadHelper_getThreadIdOffset;
+    Java_org_apache_harmony_drlvm_thread_ThreadHelper_getLockWordOffset;
     Java_org_apache_harmony_drlvm_VMHelperFastPath_getObjectVtableOffset;
     Java_org_apache_harmony_drlvm_VMHelperFastPath_getVtableClassOffset;
     Java_org_apache_harmony_drlvm_VMHelperFastPath_getVtableIntfTableOffset;

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java?rev=600979&r1=600978&r2=600979&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/org/apache/harmony/drlvm/thread/ThreadHelper.java
Tue Dec  4 07:37:50 2007
@@ -28,9 +28,9 @@
     public static final int HI_BITS = 0xffff0000;
     public static final int RECURSION_INC_IN_PLACE = 0x800;
     public static final int ZEROED_BITS_FOR_INITIAL_LOCK = 0xffff0400;
-    public static final int LOCK_WORD_OFFSET = 4;
 
-    public static final int TLS_THREAD_ID_OFFSET=getThreadIdOffset();
+    public static final int LOCK_WORD_OFFSET    = getLockWordOffset();
+    public static final int TLS_THREAD_ID_OFFSET= getThreadIdOffset();
 
     @Inline
     static int getThreadId() {
@@ -106,6 +106,7 @@
     }
 
     private static native int getThreadIdOffset();
+    private static native int getLockWordOffset();
 }
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?rev=600979&r1=600978&r2=600979&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Tue Dec  4 07:37:50
2007
@@ -297,6 +297,19 @@
     return (jint)hythread_get_thread_id_offset();
 }
 
+
+/*
+ * Class:     org_apache_harmony_drlvm_thread_ThreadHelper
+ * Method:    getLockWordOffset
+ * Signature: ()I
+ */
+VMEXPORT jint JNICALL
+Java_org_apache_harmony_drlvm_thread_ThreadHelper_getLockWordOffset(JNIEnv *env, jclass klass)
+{
+	unsigned offset = ManagedObject::header_offset();
+	return (jint)offset;
+}
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */



Mime
View raw message