diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 13:57:11 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-10 13:57:11 +0000 |
commit | c51a826764c3307a7fe9258e1d18ddca93cb7b5f (patch) | |
tree | b6139e61fe139e418a606ff611b0b6c30ce30dfe /ext/socket | |
parent | 1a853390ee08af1b8ff3d1882a8762155d151306 (diff) | |
download | ruby-c51a826764c3307a7fe9258e1d18ddca93cb7b5f.tar.gz |
rb_thread_call_without_gvl
* include/ruby/thread.h: new header file for thread stuff.
* thread.c (rb_thread_call_without_gvl): export. [Feature#4328]
returns void* instead of VALUE. [Feature #5543]
* thread.c (rb_thread_blocking_region): deprecate. [ruby-core:46295]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/ancdata.c | 12 | ||||
-rw-r--r-- | ext/socket/depend | 2 | ||||
-rw-r--r-- | ext/socket/raddrinfo.c | 20 | ||||
-rw-r--r-- | ext/socket/rubysocket.h | 1 |
4 files changed, 18 insertions, 17 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index 52f92a170a..5af090c9b9 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -1110,11 +1110,11 @@ struct sendmsg_args_struct { int flags; }; -static VALUE +static void * nogvl_sendmsg_func(void *ptr) { struct sendmsg_args_struct *args = ptr; - return sendmsg(args->fd, args->msg, args->flags); + return (void *)sendmsg(args->fd, args->msg, args->flags); } static ssize_t @@ -1124,7 +1124,7 @@ rb_sendmsg(int fd, const struct msghdr *msg, int flags) args.fd = fd; args.msg = msg; args.flags = flags; - return rb_thread_blocking_region(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0); + return (ssize_t)rb_thread_call_without_gvl(nogvl_sendmsg_func, &args, RUBY_UBF_IO, 0); } static VALUE @@ -1368,12 +1368,12 @@ rsock_recvmsg(int socket, struct msghdr *message, int flags) return recvmsg(socket, message, flags); } -static VALUE +static void * nogvl_recvmsg_func(void *ptr) { struct recvmsg_args_struct *args = ptr; int flags = args->flags; - return rsock_recvmsg(args->fd, args->msg, flags); + return (void *)rsock_recvmsg(args->fd, args->msg, flags); } static ssize_t @@ -1383,7 +1383,7 @@ rb_recvmsg(int fd, struct msghdr *msg, int flags) args.fd = fd; args.msg = msg; args.flags = flags; - return rb_thread_blocking_region(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0); + return (ssize_t)rb_thread_call_without_gvl(nogvl_recvmsg_func, &args, RUBY_UBF_IO, 0); } #if defined(HAVE_ST_MSG_CONTROL) diff --git a/ext/socket/depend b/ext/socket/depend index ab0a5e81b3..1716f9cb89 100644 --- a/ext/socket/depend +++ b/ext/socket/depend @@ -1,5 +1,5 @@ SOCK_HEADERS = $(srcdir)/rubysocket.h $(hdrdir)/ruby/ruby.h $(arch_hdrdir)/ruby/config.h \ - $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h \ + $(hdrdir)/ruby/defines.h $(hdrdir)/ruby/io.h $(hdrdir)/ruby/thread.h \ $(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(top_srcdir)/internal.h init.o: init.c $(SOCK_HEADERS) diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index a7391c95b8..f37c87bc5e 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -154,12 +154,12 @@ struct getaddrinfo_arg struct addrinfo **res; }; -static VALUE +static void * nogvl_getaddrinfo(void *arg) { struct getaddrinfo_arg *ptr = arg; - return getaddrinfo(ptr->node, ptr->service, - ptr->hints, ptr->res); + return (void *)getaddrinfo(ptr->node, ptr->service, + ptr->hints, ptr->res); } #endif @@ -178,7 +178,7 @@ rb_getaddrinfo(const char *node, const char *service, arg.service = service; arg.hints = hints; arg.res = res; - ret = (int)BLOCKING_REGION(nogvl_getaddrinfo, &arg); + ret = (int)rb_thread_call_without_gvl(nogvl_getaddrinfo, &arg, RUBY_UBF_IO, 0); return ret; #endif } @@ -195,14 +195,14 @@ struct getnameinfo_arg int flags; }; -static VALUE +static void * nogvl_getnameinfo(void *arg) { struct getnameinfo_arg *ptr = arg; - return getnameinfo(ptr->sa, ptr->salen, - ptr->host, (socklen_t)ptr->hostlen, - ptr->serv, (socklen_t)ptr->servlen, - ptr->flags); + return (void *)getnameinfo(ptr->sa, ptr->salen, + ptr->host, (socklen_t)ptr->hostlen, + ptr->serv, (socklen_t)ptr->servlen, + ptr->flags); } #endif @@ -223,7 +223,7 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, arg.serv = serv; arg.servlen = servlen; arg.flags = flags; - ret = (int)BLOCKING_REGION(nogvl_getnameinfo, &arg); + ret = (int)rb_thread_call_without_gvl(nogvl_getnameinfo, &arg, RUBY_UBF_IO, 0); return ret; #endif } diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 3b6f51f376..bbc8249f00 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -3,6 +3,7 @@ #include "ruby/ruby.h" #include "ruby/io.h" +#include "ruby/thread.h" #include "ruby/util.h" #include "internal.h" #include <stdio.h> |