summaryrefslogtreecommitdiff
path: root/thread_win32.ci
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-06 19:00:03 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-02-06 19:00:03 +0000
commit8ee7d0767f7940baeae60ffa95afde93f3378c93 (patch)
tree2f90c7d6ab23acba9e00fa773fb76673123db3f8 /thread_win32.ci
parentb1c6339b0c2d3288eab5c45cb86ecd30c9b0dc9d (diff)
* blockinlining.c, compile.c, compile.h, error.c, eval.c,
eval_intern.h, eval_jump.h, eval_load.c, eval_method.h, eval_safe.h, gc.c, insnhelper.h, insns.def, iseq.c, proc.c, process.c, signal.c, thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h, vm_dump.c, vm_evalbody.ci, vm_macro.def, yarv.h, yarvcore.h, yarvcore.c: change type and macro names: * yarv_*_t -> rb_*_t * yarv_*_struct -> rb_*_struct * yarv_tag -> rb_vm_tag * YARV_* -> RUBY_VM_* * proc.c, vm.c: move functions about env object creation from proc.c to vm.c. * proc.c, yarvcore.c: fix rb_cVM initialization place. * inits.c: change Init_ISeq() order (after Init_VM). * ruby.h, proc.c: change declaration place of rb_cEnv from proc.c to ruby.c. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.ci')
-rw-r--r--thread_win32.ci24
1 files changed, 12 insertions, 12 deletions
diff --git a/thread_win32.ci b/thread_win32.ci
index 3dd66932e1..27ea4f0117 100644
--- a/thread_win32.ci
+++ b/thread_win32.ci
@@ -23,7 +23,7 @@
static void
Init_native_thread()
{
- yarv_thread_t *th = GET_THREAD();
+ rb_thead_t *th = GET_THREAD();
DuplicateHandle(GetCurrentProcess(),
GetCurrentThread(),
GetCurrentProcess(),
@@ -53,7 +53,7 @@ w32_show_error_message()
}
static int
-w32_wait_event(HANDLE event, DWORD timeout, yarv_thread_t *th)
+w32_wait_event(HANDLE event, DWORD timeout, rb_thead_t *th)
{
HANDLE events[2];
int count = 0;
@@ -94,7 +94,7 @@ w32_wait_event(HANDLE event, DWORD timeout, yarv_thread_t *th)
}
static void
-native_sleep(yarv_thread_t *th, struct timeval *tv)
+native_sleep(rb_thead_t *th, struct timeval *tv)
{
DWORD msec;
if (tv) {
@@ -120,7 +120,7 @@ native_sleep(yarv_thread_t *th, struct timeval *tv)
}
int
-native_mutex_lock(yarv_thread_lock_t *lock)
+native_mutex_lock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
DWORD result;
@@ -156,7 +156,7 @@ native_mutex_lock(yarv_thread_lock_t *lock)
}
int
-native_mutex_unlock(yarv_thread_lock_t *lock)
+native_mutex_unlock(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
thread_debug("release mutex: %p\n", *lock);
@@ -168,7 +168,7 @@ native_mutex_unlock(yarv_thread_lock_t *lock)
}
int
-native_mutex_trylock(yarv_thread_lock_t *lock)
+native_mutex_trylock(rb_thread_lock_t *lock)
{
#if USE_WIN32MUTEX
int result;
@@ -188,7 +188,7 @@ native_mutex_trylock(yarv_thread_lock_t *lock)
}
void
-native_mutex_initialize(yarv_thread_lock_t *lock)
+native_mutex_initialize(rb_thread_lock_t *lock)
{
#if USE_WIN32MUTEX
*lock = CreateMutex(NULL, FALSE, NULL);
@@ -199,13 +199,13 @@ native_mutex_initialize(yarv_thread_lock_t *lock)
}
NOINLINE(static int
- thread_start_func_2(yarv_thread_t *th, VALUE *stack_start));
+ thread_start_func_2(rb_thead_t *th, VALUE *stack_start));
void static thread_cleanup_func(void *th_ptr);
static unsigned int _stdcall
thread_start_func_1(void *th_ptr)
{
- yarv_thread_t *th = th_ptr;
+ rb_thead_t *th = th_ptr;
VALUE stack_start;
/* run */
th->native_thread_data.interrupt_event = CreateEvent(0, TRUE, FALSE, 0);
@@ -241,7 +241,7 @@ w32_create_thread(DWORD stack_size, void *func, void *val)
}
static int
-native_thread_create(yarv_thread_t *th)
+native_thread_create(rb_thead_t *th)
{
size_t stack_size = 4 * 1024 - sizeof(int); /* 4KB */
@@ -266,7 +266,7 @@ native_thread_join(HANDLE th)
}
static void
-native_thread_apply_priority(yarv_thread_t *th)
+native_thread_apply_priority(rb_thead_t *th)
{
int priority = th->priority;
if (th->priority > 0) {
@@ -283,7 +283,7 @@ native_thread_apply_priority(yarv_thread_t *th)
}
static void
-native_thread_interrupt(yarv_thread_t *th)
+native_thread_interrupt(rb_thead_t *th)
{
thread_debug("native_thread_interrupt: %p\n", th);
SetEvent(th->native_thread_data.interrupt_event);