* Removed all Id tags.

[cacao.git] / src / threads / native / threads.h

diff --git a/src/threads/native/threads.h b/src/threads/native/threads.h
index 890b420603caa8b3b66e096e581eb01319700785..417b273d1849ff2236f6a5fe6b4dc10d7cfc5d9c 100644 (file)
--- a/src/threads/native/threads.h
+++ b/src/threads/native/threads.h
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: threads.h 7897 2007-05-11 18:23:27Z twisti $
-
 */
 
 
@@ -44,6 +42,7 @@ typedef struct threadobject threadobject;
 
 #include "mm/memory.h"
 #include "native/jni.h"
+#include "native/localref.h"
 #include "native/include/java_lang_Thread.h"
 
 #include "threads/native/lock.h"
@@ -104,8 +103,6 @@ extern pthread_key_t threads_current_threadobject_key;
 struct threadobject {
        java_lang_Thread     *object;       /* link to java.lang.Thread object    */
 
-       lock_execution_env_t  ee;           /* data for the lock implementation   */
-
        ptrint                thinlock;     /* pre-computed thin lock value       */
 
        s4                    index;        /* thread index, starting with 1      */
@@ -128,7 +125,7 @@ struct threadobject {
 
        u1                   *pc;           /* current PC (used for profiling)    */
 
-       java_objectheader    *_exceptionptr;     /* current exception             */
+       java_object_t        *_exceptionptr;     /* current exception             */
        stackframeinfo       *_stackframeinfo;   /* current native stackframeinfo */
        localref_table       *_localref_table;   /* JNI local references          */
 
@@ -137,6 +134,17 @@ struct threadobject {
 #endif
 
        dumpinfo_t            dumpinfo;     /* dump memory info structure         */
+
+#if defined(ENABLE_DEBUG_FILTER)
+       u2                    filterverbosecallctr[2]; /* counters for verbose call filter */
+#endif
+
+#if !defined(NDEBUG)
+       s4                    tracejavacallindent;
+       u4                    tracejavacallcount;
+#endif
+
+       listnode_t            linkage;      /* threads-list                       */
 };
 
 
@@ -149,6 +157,18 @@ struct threadobject {
 
 #define STACKFRAMEINFO    (THREADOBJECT->_stackframeinfo)
 
+/* counter for verbose call filter ********************************************/
+
+#if defined(ENABLE_DEBUG_FILTER)
+#      define FILTERVERBOSECALLCTR (THREADOBJECT->filterverbosecallctr)
+#endif
+
+/* state for trace java call **************************************************/
+
+#if !defined(NDEBUG)
+#      define TRACEJAVACALLINDENT (THREADOBJECT->tracejavacallindent)
+#      define TRACEJAVACALLCOUNT (THREADOBJECT->tracejavacallcount)
+#endif
 
 /* functions ******************************************************************/
 
@@ -170,7 +190,6 @@ bool threads_detach_thread(threadobject *thread);
 void threads_join_all_threads(void);
 
 void threads_sleep(s8 millis, s4 nanos);
-void threads_yield(void);
 
 bool threads_wait_with_timeout_relative(threadobject *t, s8 millis, s4 nanos);