Mercurial > hg > truffle
comparison src/share/vm/classfile/javaClasses.cpp @ 11020:3a0774193f71
Merge
author | chegar |
---|---|
date | Wed, 19 Jun 2013 11:02:10 +0100 |
parents | eaf3742822ec f2110083203d |
children | 6b0fd0964b87 ca0165daa6ec |
comparison
equal
deleted
inserted
replaced
11019:eaf3742822ec | 11020:3a0774193f71 |
---|---|
959 } | 959 } |
960 } | 960 } |
961 | 961 |
962 // Read thread status value from threadStatus field in java.lang.Thread java class. | 962 // Read thread status value from threadStatus field in java.lang.Thread java class. |
963 java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { | 963 java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { |
964 assert(Thread::current()->is_VM_thread() || | 964 assert(Thread::current()->is_Watcher_thread() || Thread::current()->is_VM_thread() || |
965 JavaThread::current()->thread_state() == _thread_in_vm, | 965 JavaThread::current()->thread_state() == _thread_in_vm, |
966 "Java Thread is not running in vm"); | 966 "Java Thread is not running in vm"); |
967 // The threadStatus is only present starting in 1.5 | 967 // The threadStatus is only present starting in 1.5 |
968 if (_thread_status_offset > 0) { | 968 if (_thread_status_offset > 0) { |
969 return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | 969 return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); |