1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to

Browse Source 
rb_nativethread_id_t.
* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42136 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2013-07-23 10:38:36 +00:00
parent 55201cac9e
commit 2b1088c89f
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jul 23 19:34:11 2013 Koichi Sasada <ko1@atdot.net>
* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to
rb_nativethread_id_t.
* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.
Tue Jul 23 18:56:11 2013 Koichi Sasada <ko1@atdot.net> Tue Jul 23 18:56:11 2013 Koichi Sasada <ko1@atdot.net>
* ext/openssl/ossl.c: use system native (system provided) * ext/openssl/ossl.c: use system native (system provided)

4
thread_pthread.c
View File

@ -572,7 +572,7 @@ get_stack(void **addr, size_t *size)
#endif #endif
static struct { static struct {
rb_thread_id_t id; rb_nativethread_id_t id;
size_t stack_maxsize; size_t stack_maxsize;
VALUE *stack_start; VALUE *stack_start;
#ifdef __ia64 #ifdef __ia64
@ -694,7 +694,7 @@ ruby_init_stack(volatile VALUE *addr
static int static int
native_thread_init_stack(rb_thread_t *th) native_thread_init_stack(rb_thread_t *th)
{ {
rb_thread_id_t curr = pthread_self(); rb_nativethread_id_t curr = pthread_self();
if (pthread_equal(curr, native_main_thread.id)) { if (pthread_equal(curr, native_main_thread.id)) {
th->machine_stack_start = native_main_thread.stack_start; th->machine_stack_start = native_main_thread.stack_start;

2
thread_pthread.h
View File

@ -15,7 +15,7 @@
#ifdef HAVE_PTHREAD_NP_H #ifdef HAVE_PTHREAD_NP_H
#include <pthread_np.h> #include <pthread_np.h>
#endif #endif
typedef pthread_t rb_thread_id_t; typedef pthread_t rb_nativethread_id_t;
typedef pthread_mutex_t rb_nativethread_lock_t; typedef pthread_mutex_t rb_nativethread_lock_t;
typedef struct rb_thread_cond_struct { typedef struct rb_thread_cond_struct {

2
thread_win32.h
View File

@ -21,7 +21,7 @@
WINBASEAPI BOOL WINAPI WINBASEAPI BOOL WINAPI
TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection); TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
typedef HANDLE rb_thread_id_t; typedef HANDLE rb_nativethread_id_t;
typedef union rb_thread_lock_union { typedef union rb_thread_lock_union {
HANDLE mutex; HANDLE mutex;

2
vm_core.h
View File

@ -526,7 +526,7 @@ typedef struct rb_thread_struct {
VALUE root_svar; VALUE root_svar;
/* thread control */ /* thread control */
rb_thread_id_t thread_id; rb_nativethread_id_t thread_id;
enum rb_thread_status status; enum rb_thread_status status;
int to_kill; int to_kill;
int priority; int priority;