* src/native/vm/openjdk/jvm.cpp (JVM_GetThreadStateValues): Fixed values of

substates for parked threads.
(JVM_GetThreadStateNames): Likewise

diff --git a/src/native/vm/openjdk/jvm.cpp b/src/native/vm/openjdk/jvm.cpp
index fc8c38fa411b3cc8422969ff81ae6f9d64a2c8ea..6d3bba5be13e63c07726ec24afbbff65d77747f4 100644 (file)
--- a/src/native/vm/openjdk/jvm.cpp
+++ b/src/native/vm/openjdk/jvm.cpp
@@ -3345,12 +3345,11 @@ jintArray JVM_GetThreadStateValues(JNIEnv* env, jint javaThreadState)
                        return NULL;
 
                array_intarray_element_set(ia, 0, THREAD_STATE_WAITING);
-               /* XXX Implement parked stuff. */
-/*             array_intarray_element_set(ia, 1, PARKED); */
+               array_intarray_element_set(ia, 1, THREAD_STATE_PARKED);
                break; 
 
     case THREAD_STATE_TIMED_WAITING:
-               ia = builtin_newarray_int(3);
+               ia = builtin_newarray_int(2);
 
                if (ia == NULL)
                        return NULL;
@@ -3358,26 +3357,7 @@ jintArray JVM_GetThreadStateValues(JNIEnv* env, jint javaThreadState)
                /* XXX Not sure about that one. */
 /*             array_intarray_element_set(ia, 0, SLEEPING); */
                array_intarray_element_set(ia, 0, THREAD_STATE_TIMED_WAITING);
-               /* XXX Implement parked stuff. */
-/*             array_intarray_element_set(ia, 2, PARKED); */
-               break; 
-
-    case THREAD_STATE_PARKED:
-               ia = builtin_newarray_int(2);
-
-               if (ia == NULL)
-                       return NULL;
-
-               array_intarray_element_set(ia, 0, THREAD_STATE_PARKED);
-               break; 
-
-    case THREAD_STATE_TIMED_PARKED:
-               ia = builtin_newarray_int(2);
-
-               if (ia == NULL)
-                       return NULL;
-
-               array_intarray_element_set(ia, 0, THREAD_STATE_TIMED_PARKED);
+               array_intarray_element_set(ia, 1, THREAD_STATE_TIMED_PARKED);
                break; 
 
     case THREAD_STATE_TERMINATED:
@@ -3480,54 +3460,35 @@ jobjectArray JVM_GetThreadStateNames(JNIEnv* env, jint javaThreadState, jintArra
                        return NULL;
 
                array_objectarray_element_set(oa, 0, s);
-/*             array_objectarray_element_set(oa, 1, s); */
-               break; 
-
-    case THREAD_STATE_TIMED_WAITING:
-               oa = builtin_anewarray(3, class_java_lang_String);
 
-               if (oa == NULL)
-                       return NULL;
-
-/*             s = javastring_new(utf_new_char("TIMED_WAITING.SLEEPING")); */
-               s = javastring_new(utf_new_char("TIMED_WAITING.OBJECT_WAIT"));
+               s = javastring_new(utf_new_char("WAITING.PARKED"));
 
                if (s == NULL)
                        return NULL;
 
-/*             array_objectarray_element_set(oa, 0, s); */
-               array_objectarray_element_set(oa, 0, s);
-/*             array_objectarray_element_set(oa, 2, s); */
+               array_objectarray_element_set(oa, 1, s);
                break; 
 
-    case THREAD_STATE_PARKED:
+    case THREAD_STATE_TIMED_WAITING:
                oa = builtin_anewarray(2, class_java_lang_String);
 
                if (oa == NULL)
                        return NULL;
 
-               s = javastring_new(utf_new_char("WAITING.PARKED"));
+/*             s = javastring_new(utf_new_char("TIMED_WAITING.SLEEPING")); */
+               s = javastring_new(utf_new_char("TIMED_WAITING.OBJECT_WAIT"));
 
                if (s == NULL)
                        return NULL;
 
                array_objectarray_element_set(oa, 0, s);
-/*             array_objectarray_element_set(oa, 1, s); */
-               break; 
-
-    case THREAD_STATE_TIMED_PARKED:
-               oa = builtin_anewarray(3, class_java_lang_String);
-
-               if (oa == NULL)
-                       return NULL;
 
                s = javastring_new(utf_new_char("TIMED_WAITING.PARKED"));
 
                if (s == NULL)
                        return NULL;
 
-               array_objectarray_element_set(oa, 0, s);
-/*             array_objectarray_element_set(oa, 1, s); */
+               array_objectarray_element_set(oa, 1, s);
                break; 
 
     case THREAD_STATE_TERMINATED: