timespec.
* thread_win32.c (ruby_native_cond_timedwait): added.
Index: thread_pthread.c
===================================================================
--- thread_pthread.c (revision 25770)
+++ thread_pthread.c (working copy)
@@ -117,7 +117,10 @@ native_cond_wait(pthread_cond_t *cond, p
int
-native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, struct timespec *ts)
+native_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timeval *tv)
{
- return pthread_cond_timedwait(cond, mutex, ts);
+ struct timespec ts;
+ ts.tv_sec = tv->tv_sec;
+ ts.tv_nsec = tv->tv_usec * 1000;
+ return pthread_cond_timedwait(cond, mutex, &ts) == ETIMEDOUT;
}
@@ -783,5 +786,5 @@ thread_timer(void *dummy)
native_mutex_lock(&timer_thread_lock);
native_cond_broadcast(&timer_thread_cond);
-#define WAIT_FOR_10MS() native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100))
+#define WAIT_FOR_10MS() pthread_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100))
while (system_working > 0) {
int err = WAIT_FOR_10MS();
Index: thread_win32.c
===================================================================
--- thread_win32.c (revision 25770)
+++ thread_win32.c (working copy)
@@ -22,13 +22,13 @@
static volatile DWORD ruby_native_thread_key = TLS_OUT_OF_INDEXES;
-static int native_mutex_lock(rb_thread_lock_t *);
-static int native_mutex_unlock(rb_thread_lock_t *);
-static int native_mutex_trylock(rb_thread_lock_t *);
-
-static void native_cond_signal(rb_thread_cond_t *cond);
-static void native_cond_broadcast(rb_thread_cond_t *cond);
-static void native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex);
-static void native_cond_initialize(rb_thread_cond_t *cond);
-static void native_cond_destroy(rb_thread_cond_t *cond);
+int native_mutex_lock(rb_thread_lock_t *);
+int native_mutex_unlock(rb_thread_lock_t *);
+int native_mutex_trylock(rb_thread_lock_t *);
+
+void native_cond_signal(rb_thread_cond_t *cond);
+void native_cond_broadcast(rb_thread_cond_t *cond);
+void native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex);
+void native_cond_initialize(rb_thread_cond_t *cond);
+void native_cond_destroy(rb_thread_cond_t *cond);
rb_thread_t *
@@ -256,6 +256,6 @@ native_sleep(rb_thread_t *th, struct tim
}
-static int
-native_mutex_lock(rb_thread_lock_t *lock)
+int
+ruby_native_mutex_lock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
@@ -293,11 +293,5 @@ native_mutex_lock(rb_thread_lock_t *lock
int
-ruby_native_thread_lock(rb_thread_lock_t *lock)
-{
- return native_mutex_lock(lock);
-}
-
-static int
-native_mutex_unlock(rb_thread_lock_t *lock)
+ruby_native_thread_unlock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
@@ -311,11 +305,5 @@ native_mutex_unlock(rb_thread_lock_t *lo
int
-ruby_native_thread_unlock(rb_thread_lock_t *lock)
-{
- return native_mutex_unlock(lock);
-}
-
-static int
-native_mutex_trylock(rb_thread_lock_t *lock)
+ruby_native_mutex_trylock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
@@ -370,6 +358,6 @@ struct rb_thread_cond_struct {
};
-static void
-native_cond_signal(rb_thread_cond_t *cond)
+void
+ruby_native_cond_signal(rb_thread_cond_t *cond)
{
/* cond is guarded by mutex */
@@ -385,6 +373,6 @@ native_cond_signal(rb_thread_cond_t *con
}
-static void
-native_cond_broadcast(rb_thread_cond_t *cond)
+void
+ruby_native_cond_broadcast(rb_thread_cond_t *cond)
{
/* cond is guarded by mutex */
@@ -398,6 +386,6 @@ native_cond_broadcast(rb_thread_cond_t *
}
-static void
-native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex)
+static int
+native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, ULONG timeout)
{
DWORD r;
@@ -419,6 +407,6 @@ native_cond_wait(rb_thread_cond_t *cond,
native_mutex_unlock(mutex);
{
- r = WaitForSingleObject(entry.event, INFINITE);
- if (r != WAIT_OBJECT_0) {
+ r = WaitForSingleObject(entry.event, timeout);
+ if (r != WAIT_OBJECT_0 && r != WAIT_TIMEOUT) {
rb_bug("native_cond_wait: WaitForSingleObject returns %lu", r);
}
@@ -427,8 +415,25 @@ native_cond_wait(rb_thread_cond_t *cond,
w32_close_handle(entry.event);
+ return r;
}
-static void
-native_cond_initialize(rb_thread_cond_t *cond)
+void
+ruby_native_cond_wait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex)
+{
+ native_cond_wait(cond, mutex, INFINITE);
+}
+
+int
+ruby_native_cond_timedwait(rb_thread_cond_t *cond, rb_thread_lock_t *mutex, const struct timeval *tv)
+{
+ ULONG timeout = INFINITE;
+ if (tv) {
+ timeout = tv->tv_sec * 1000000 + (tv->tv_nsec + 500) / 1000;
+ }
+ return native_cond_wait(cond, mutex, timeout) == WAIT_TIMEOUT;
+}
+
+void
+ruby_native_cond_initialize(rb_thread_cond_t *cond)
{
cond->next = 0;
@@ -436,6 +441,6 @@ native_cond_initialize(rb_thread_cond_t
}
-static void
-native_cond_destroy(rb_thread_cond_t *cond)
+void
+ruby_native_cond_destroy(rb_thread_cond_t *cond)
{
/* */
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/mvm@25776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e