#define THREAD_FLAG_DAEMON 0x04 /* daemon thread */
#define THREAD_FLAG_IN_NATIVE 0x08 /* currently executing native code */
-#define SUSPEND_REASON_JNI 1 /* suspended from JNI */
-#define SUSPEND_REASON_STOPWORLD 2 /* suspended from stop-thw-world */
+#define SUSPEND_REASON_NONE 0 /* no reason to suspend */
+#define SUSPEND_REASON_JAVA 1 /* suspended from java.lang.Thread */
+#define SUSPEND_REASON_STOPWORLD 2 /* suspended from stop-the-world */
+#define SUSPEND_REASON_DUMP 3 /* suspended from threadlist dumping */
+#define SUSPEND_REASON_JVMTI 4 /* suspended from JVMTI agent */
typedef struct threadobject threadobject;
/* for the sable tasuki lock extension */
bool flc_bit;
struct threadobject *flc_list; /* FLC list head for this thread */
+ struct threadobject *flc_tail; /* tail pointer for FLC list */
struct threadobject *flc_next; /* next pointer for FLC list */
java_handle_t *flc_object;
Mutex* flc_lock; /* controlling access to these fields */
bool interrupted;
bool signaled;
+ bool park_permit;
bool suspended; /* is this thread suspended? */
s4 suspend_reason; /* reason for suspending */
// Includes.
-#include "mm/memory.h"
+#include "mm/memory.hpp"
-#include "native/localref.h"
+#include "native/localref.hpp"
#include "threads/lock.hpp"
# include "vm/jit/replace.hpp"
#endif
-#include "vm/jit/stacktrace.hpp"
-
#if defined(ENABLE_INTRP)
#include "vm/jit/intrp/intrp.h"
#endif
-#if defined(__DARWIN__)
-# include <mach/mach.h>
-
-typedef struct {
- Mutex* mutex;
- Condition* cond;
- int value;
-} sem_t;
-
-#else
-# include <semaphore.h>
-#endif
-
// FIXME
#ifdef __cplusplus
result = pthread_setspecific(thread_current_key, t);
if (result != 0)
- vm_abort_errnum(result, "thread_set_current: pthread_setspecific failed");
+ //os::abort_errnum(result, "thread_set_current: pthread_setspecific failed");
+ vm_abort("thread_set_current: pthread_setspecific failed");
#endif
}
-inline static stackframeinfo_t *threads_get_current_stackframeinfo(void)
+inline static struct stackframeinfo_t* threads_get_current_stackframeinfo(void)
{
return THREADOBJECT->_stackframeinfo;
}
-inline static void threads_set_current_stackframeinfo(stackframeinfo_t *sfi)
+inline static void threads_set_current_stackframeinfo(struct stackframeinfo_t* sfi)
{
THREADOBJECT->_stackframeinfo = sfi;
}
/* functions ******************************************************************/
-void threads_sem_init(sem_t *sem, bool shared, int value);
-void threads_sem_wait(sem_t *sem);
-void threads_sem_post(sem_t *sem);
-
void threads_start_thread(threadobject *thread, functionptr function);
void threads_set_thread_priority(pthread_t tid, int priority);
-#if defined(ENABLE_GC_CACAO)
-bool threads_suspend_thread(threadobject *thread, s4 reason);
-void threads_suspend_ack(u1* pc, u1* sp);
-bool threads_resume_thread(threadobject *thread);
-#endif
+bool threads_suspend_thread(threadobject *thread, int32_t reason);
+bool threads_resume_thread(threadobject *thread, int32_t reason);
+void threads_suspend_ack();
void threads_join_all_threads(void);
void threads_thread_interrupt(threadobject *thread);
+void threads_park(bool absolute, int64_t nanos);
+void threads_unpark(threadobject *thread);
+
#if defined(ENABLE_TLH)
void threads_tlh_add_frame();
void threads_tlh_remove_frame();