* ext/openssl/depend: remove dependency from internal headers.
[Feature #9612] * ext/openssl/ossl.c (ossl_fips_mode_set): ditto. * ext/coverage/depend: ditto. * include/ruby/thread_native.h: added. This header file only provides wrapper functions to control native threads. These wrapper functions are used by MRI implementation. * vm_core.h: use include/ruby/thread_native.h. * thread.c: ditto. * thread_pthread.h: ditto. * thread_win32.h: ditto. * thread_native.h: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1b03f51f82
commit
7093a2cb5b
25
ChangeLog
25
ChangeLog
@ -1,3 +1,28 @@
|
|||||||
|
Wed May 14 19:31:03 2014 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
|
* ext/openssl/depend: remove dependency from internal headers.
|
||||||
|
[Feature #9612]
|
||||||
|
|
||||||
|
* ext/openssl/ossl.c (ossl_fips_mode_set): ditto.
|
||||||
|
|
||||||
|
* ext/coverage/depend: ditto.
|
||||||
|
|
||||||
|
* include/ruby/thread_native.h: added.
|
||||||
|
|
||||||
|
This header file only provides wrapper functions to control
|
||||||
|
native threads. These wrapper functions are used by MRI
|
||||||
|
implementation.
|
||||||
|
|
||||||
|
* vm_core.h: use include/ruby/thread_native.h.
|
||||||
|
|
||||||
|
* thread.c: ditto.
|
||||||
|
|
||||||
|
* thread_pthread.h: ditto.
|
||||||
|
|
||||||
|
* thread_win32.h: ditto.
|
||||||
|
|
||||||
|
* thread_native.h: removed.
|
||||||
|
|
||||||
Wed May 14 18:03:28 2014 Koichi Sasada <ko1@atdot.net>
|
Wed May 14 18:03:28 2014 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* gc.c: enable RGENGC_AGE2_PROMOTION.
|
* gc.c: enable RGENGC_AGE2_PROMOTION.
|
||||||
|
@ -8,4 +8,4 @@ $(OBJS): $(HDRS) $(ruby_headers) \
|
|||||||
$(top_srcdir)/ruby_atomic.h \
|
$(top_srcdir)/ruby_atomic.h \
|
||||||
$(top_srcdir)/thread_pthread.h \
|
$(top_srcdir)/thread_pthread.h \
|
||||||
$(top_srcdir)/internal.h \
|
$(top_srcdir)/internal.h \
|
||||||
$(top_srcdir)/thread_native.h
|
$(top_srcdir)/include/ruby/thread_native.h
|
||||||
|
@ -3,4 +3,3 @@ $(OBJS): $(HDRS) $(ruby_headers) \
|
|||||||
$(hdrdir)/ruby/encoding.h \
|
$(hdrdir)/ruby/encoding.h \
|
||||||
$(hdrdir)/ruby/oniguruma.h \
|
$(hdrdir)/ruby/oniguruma.h \
|
||||||
$(hdrdir)/ruby/thread.h
|
$(hdrdir)/ruby/thread.h
|
||||||
ossl.o: $(top_srcdir)/thread_native.h $(top_srcdir)/thread_$(THREAD_MODEL).h
|
|
||||||
|
@ -467,7 +467,7 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
|
|||||||
/**
|
/**
|
||||||
* Stores locks needed for OpenSSL thread safety
|
* Stores locks needed for OpenSSL thread safety
|
||||||
*/
|
*/
|
||||||
#include "../../thread_native.h"
|
#include "ruby/thread_native.h"
|
||||||
static rb_nativethread_lock_t *ossl_locks;
|
static rb_nativethread_lock_t *ossl_locks;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
56
include/ruby/thread_native.h
Normal file
56
include/ruby/thread_native.h
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
/**********************************************************************
|
||||||
|
|
||||||
|
thread_native.h -
|
||||||
|
|
||||||
|
$Author: ko1 $
|
||||||
|
created at: Wed May 14 19:37:31 2014
|
||||||
|
|
||||||
|
Copyright (C) 2014 Yukihiro Matsumoto
|
||||||
|
|
||||||
|
**********************************************************************/
|
||||||
|
|
||||||
|
#ifndef RUBY_THREAD_NATIVE_H
|
||||||
|
#define RUBY_THREAD_NATIVE_H 1
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file contains wrapper APIs for native thread primitives
|
||||||
|
* which Ruby interpreter uses.
|
||||||
|
*
|
||||||
|
* Now, we only suppors pthread and Windows threads.
|
||||||
|
*
|
||||||
|
* If you want to use Ruby's Mutex and so on to synchronize Ruby Threads,
|
||||||
|
* please use Mutex directly.
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#include <windows.h>
|
||||||
|
typedef HANDLE rb_nativethread_id_t;
|
||||||
|
|
||||||
|
typedef union rb_thread_lock_union {
|
||||||
|
HANDLE mutex;
|
||||||
|
CRITICAL_SECTION crit;
|
||||||
|
} rb_nativethread_lock_t;
|
||||||
|
|
||||||
|
#elif defined(HAVE_PTHREAD_H)
|
||||||
|
#include <pthread.h>
|
||||||
|
typedef pthread_t rb_nativethread_id_t;
|
||||||
|
typedef pthread_mutex_t rb_nativethread_lock_t;
|
||||||
|
|
||||||
|
#else
|
||||||
|
#error "unsupported thread type"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
RUBY_SYMBOL_EXPORT_BEGIN
|
||||||
|
|
||||||
|
rb_nativethread_id_t rb_nativethread_self();
|
||||||
|
|
||||||
|
void rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock);
|
||||||
|
void rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock);
|
||||||
|
void rb_nativethread_lock_lock(rb_nativethread_lock_t *lock);
|
||||||
|
void rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock);
|
||||||
|
|
||||||
|
RUBY_SYMBOL_EXPORT_END
|
||||||
|
|
||||||
|
#endif
|
1
thread.c
1
thread.c
@ -62,6 +62,7 @@
|
|||||||
#include "timev.h"
|
#include "timev.h"
|
||||||
#include "ruby/io.h"
|
#include "ruby/io.h"
|
||||||
#include "ruby/thread.h"
|
#include "ruby/thread.h"
|
||||||
|
#include "ruby/thread_native.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
|
|
||||||
#ifndef USE_NATIVE_THREAD_PRIORITY
|
#ifndef USE_NATIVE_THREAD_PRIORITY
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
#ifndef RUBY_THREAD_NATIVE_H
|
|
||||||
#define RUBY_THREAD_NATIVE_H
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
#include "thread_win32.h"
|
|
||||||
#elif defined(HAVE_PTHREAD_H)
|
|
||||||
#include "thread_pthread.h"
|
|
||||||
#else
|
|
||||||
#error "unsupported thread type"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
RUBY_SYMBOL_EXPORT_BEGIN
|
|
||||||
|
|
||||||
rb_nativethread_id_t rb_nativethread_self();
|
|
||||||
|
|
||||||
void rb_nativethread_lock_initialize(rb_nativethread_lock_t *lock);
|
|
||||||
void rb_nativethread_lock_destroy(rb_nativethread_lock_t *lock);
|
|
||||||
void rb_nativethread_lock_lock(rb_nativethread_lock_t *lock);
|
|
||||||
void rb_nativethread_lock_unlock(rb_nativethread_lock_t *lock);
|
|
||||||
|
|
||||||
RUBY_SYMBOL_EXPORT_END
|
|
||||||
|
|
||||||
#endif
|
|
@ -11,12 +11,9 @@
|
|||||||
#ifndef RUBY_THREAD_PTHREAD_H
|
#ifndef RUBY_THREAD_PTHREAD_H
|
||||||
#define RUBY_THREAD_PTHREAD_H
|
#define RUBY_THREAD_PTHREAD_H
|
||||||
|
|
||||||
#include <pthread.h>
|
|
||||||
#ifdef HAVE_PTHREAD_NP_H
|
#ifdef HAVE_PTHREAD_NP_H
|
||||||
#include <pthread_np.h>
|
#include <pthread_np.h>
|
||||||
#endif
|
#endif
|
||||||
typedef pthread_t rb_nativethread_id_t;
|
|
||||||
typedef pthread_mutex_t rb_nativethread_lock_t;
|
|
||||||
|
|
||||||
typedef struct rb_thread_cond_struct {
|
typedef struct rb_thread_cond_struct {
|
||||||
pthread_cond_t cond;
|
pthread_cond_t cond;
|
||||||
|
@ -12,8 +12,6 @@
|
|||||||
#ifndef RUBY_THREAD_WIN32_H
|
#ifndef RUBY_THREAD_WIN32_H
|
||||||
#define RUBY_THREAD_WIN32_H
|
#define RUBY_THREAD_WIN32_H
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
|
|
||||||
# ifdef __CYGWIN__
|
# ifdef __CYGWIN__
|
||||||
# undef _WIN32
|
# undef _WIN32
|
||||||
# endif
|
# endif
|
||||||
@ -21,13 +19,6 @@
|
|||||||
WINBASEAPI BOOL WINAPI
|
WINBASEAPI BOOL WINAPI
|
||||||
TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
|
TryEnterCriticalSection(IN OUT LPCRITICAL_SECTION lpCriticalSection);
|
||||||
|
|
||||||
typedef HANDLE rb_nativethread_id_t;
|
|
||||||
|
|
||||||
typedef union rb_thread_lock_union {
|
|
||||||
HANDLE mutex;
|
|
||||||
CRITICAL_SECTION crit;
|
|
||||||
} rb_nativethread_lock_t;
|
|
||||||
|
|
||||||
typedef struct rb_thread_cond_struct {
|
typedef struct rb_thread_cond_struct {
|
||||||
struct cond_event_entry *next;
|
struct cond_event_entry *next;
|
||||||
struct cond_event_entry *prev;
|
struct cond_event_entry *prev;
|
||||||
|
@ -23,9 +23,15 @@
|
|||||||
#include "id.h"
|
#include "id.h"
|
||||||
#include "method.h"
|
#include "method.h"
|
||||||
#include "ruby_atomic.h"
|
#include "ruby_atomic.h"
|
||||||
#include "thread_native.h"
|
|
||||||
#include "ccan/list/list.h"
|
#include "ccan/list/list.h"
|
||||||
|
|
||||||
|
#include "ruby/thread_native.h"
|
||||||
|
#if defined(_WIN32)
|
||||||
|
#include "thread_win32.h"
|
||||||
|
#elif defined(HAVE_PTHREAD_H)
|
||||||
|
#include "thread_pthread.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef ENABLE_VM_OBJSPACE
|
#ifndef ENABLE_VM_OBJSPACE
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
/*
|
/*
|
||||||
|
Loading…
x
Reference in New Issue
Block a user