ext/kgio/accept.c in kgio-2.8.1 vs ext/kgio/accept.c in kgio-2.9.0

- old
+ new

@@ -1,5 +1,8 @@ +/* ref: rubinius b2811f260de16d1e972462e27852470364608de5 */ +#define RSTRING_MODIFIED 1 + #include "kgio.h" #include "missing_accept4.h" #include "sock_for_fd.h" #include "my_fileno.h" #include "nonblock.h" @@ -8,11 +11,11 @@ static VALUE cClientSocket; static VALUE cKgio_Socket; static VALUE mSocketMethods; static VALUE iv_kgio_addr; -#if defined(__linux__) && defined(HAVE_RB_THREAD_BLOCKING_REGION) +#if defined(__linux__) && defined(KGIO_HAVE_THREAD_CALL_WITHOUT_GVL) static int accept4_flags = SOCK_CLOEXEC; #else /* ! linux */ static int accept4_flags = SOCK_CLOEXEC | SOCK_NONBLOCK; #endif /* ! linux */ @@ -74,21 +77,21 @@ } return (VALUE)rv; } -#ifdef HAVE_RB_THREAD_BLOCKING_REGION +#ifdef KGIO_HAVE_THREAD_CALL_WITHOUT_GVL # include <time.h> # include "blocking_io_region.h" static int thread_accept(struct accept_args *a, int force_nonblock) { if (force_nonblock) set_nonblocking(a->fd); return (int)rb_thread_io_blocking_region(xaccept, a, a->fd); } -#else /* ! HAVE_RB_THREAD_BLOCKING_REGION */ +#else /* ! KGIO_HAVE_THREAD_CALL_WITHOUT_GVL */ # include <rubysig.h> static int thread_accept(struct accept_args *a, int force_nonblock) { int rv; @@ -101,10 +104,10 @@ TRAP_BEG; rv = (int)xaccept(a); TRAP_END; return rv; } -#endif /* ! HAVE_RB_THREAD_BLOCKING_REGION */ +#endif /* ! KGIO_HAVE_THREAD_CALL_WITHOUT_GVL */ static void prepare_accept(struct accept_args *a, VALUE self, int argc, const VALUE *argv) { a->fd = my_fileno(self);