ruby-dev

こんにちは、なかむら(う)です。

In message "[ruby-dev:35448] Re: [Bug:trunk] Thread#kill cannot break BLOCKING_REGION() on windows"
    on Jul.12,2008 04:32:40, <[email protected]> wrote:
> 思うに、socket.soからrb_thread_blocking_region()を呼び出すよ
> り、このパッチのように、io.cでやってるのと同様、ブロックしう
> る関数の呼び出しの前に読み書き可能のチェックを行うべきではな
> いでしょうか。

いろいろ考えるに、sendやrecvはいずれにせよブロックする可能性
があるのでrb_thread_blocking_region()でくくっておく必要はある
のではないかと考え直しました。
それはそれとして事前に読み書き可能のチェックを行うのには意味
はあると思うので、そういった点を全体に適用したパッチを作成し
ました。

commitしちゃいたいのですがどうでしょうか?

Index: ext/socket/socket.c
===================================================================
--- ext/socket/socket.c	(revision 18067)
+++ ext/socket/socket.c	(working copy)
@@ -551,7 +551,8 @@ bsock_send(int argc, VALUE *argv, VALUE 
     GetOpenFile(sock, fptr);
     arg.fd = fptr->fd;
     arg.flags = NUM2INT(flags);
-    while ((n = (int)BLOCKING_REGION(func, &arg)) < 0) {
+    while (rb_thread_fd_writable(arg.fd),
+	   (n = (int)BLOCKING_REGION(func, &arg)) < 0) {
 	if (rb_io_wait_writable(arg.fd)) {
 	    continue;
 	}
@@ -640,6 +641,7 @@ s_recvfrom(VALUE sock, int argc, VALUE *
     RBASIC(str)->klass = 0;
 
     while (rb_io_check_closed(fptr),
+	   rb_thread_wait_fd(arg.fd),
 	   (slen = BLOCKING_REGION(recvfrom_blocking, &arg)) < 0) {
 	if (RBASIC(str)->klass || RSTRING_LEN(str) != buflen) {
 	    rb_raise(rb_eRuntimeError, "buffer string modified");
@@ -1140,19 +1142,17 @@ struct connect_arg {
     socklen_t len;
 };
 
-static VALUE
-connect_blocking(void *data)
+static int
+connect0(struct connect_arg *arg)
 {
-    struct connect_arg *arg = data;
-    return (VALUE)connect(arg->fd, arg->sockaddr, arg->len);
+    return connect(arg->fd, arg->sockaddr, arg->len);
 }
 
 #if defined(SOCKS) && !defined(SOCKS5)
-static VALUE
-socks_connect_blocking(void *data)
+static int
+socks_connect0(struct connect_arg *arg)
 {
-    struct connect_arg *arg = data;
-    return (VALUE)Rconnect(arg->fd, arg->sockaddr, arg->len);
+    return Rconnect(arg->fd, arg->sockaddr, arg->len);
 }
 #endif
 
@@ -1160,7 +1160,7 @@ static int
 ruby_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 {
     int status;
-    rb_blocking_function_t *func = connect_blocking;
+    int (*func)(struct connect_arg *) = connect0;
     struct connect_arg arg;
 #if WAIT_IN_PROGRESS > 0
     int wait_in_progress = -1;
@@ -1172,10 +1172,11 @@ ruby_connect(int fd, const struct sockad
     arg.sockaddr = sockaddr;
     arg.len = len;
 #if defined(SOCKS) && !defined(SOCKS5)
-    if (socks) func = socks_connect_blocking;
+    if (socks) func = socks_connect0;
 #endif
     for (;;) {
-	status = (int)BLOCKING_REGION(func, &arg);
+	rb_thread_fd_writable(fd);
+	status = func(&arg);
 	if (status < 0) {
 	    switch (errno) {
 	      case EAGAIN:
@@ -1525,32 +1526,16 @@ s_accept_nonblock(VALUE klass, rb_io_t *
     return init_sock(rb_obj_alloc(klass), fd2);
 }
 
-struct accept_arg {
-    int fd;
-    struct sockaddr *sockaddr;
-    socklen_t *len;
-};
-
-static VALUE
-accept_blocking(void *data)
-{
-    struct accept_arg *arg = data;
-    return (VALUE)accept(arg->fd, arg->sockaddr, arg->len);
-}
-
 static VALUE
 s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 {
     int fd2;
     int retry = 0;
-    struct accept_arg arg;
 
     rb_secure(3);
-    arg.fd = fd;
-    arg.sockaddr = sockaddr;
-    arg.len = len;
   retry:
-    fd2 = (int)BLOCKING_REGION(accept_blocking, &arg);
+    rb_thread_wait_fd(fd);
+    fd2 = accept(fd, sockaddr, len);
     if (fd2 < 0) {
 	switch (errno) {
 	  case EMFILE:
@@ -1852,6 +1837,7 @@ udp_send(int argc, VALUE *argv, VALUE so
       retry:
 	arg.to = res->ai_addr;
 	arg.tolen = res->ai_addrlen;
+	rb_thread_fd_writable(arg.fd);
 	n = (int)BLOCKING_REGION(sendto_blocking, &arg);
 	if (n >= 0) {
 	    freeaddrinfo(res0);
@@ -2036,6 +2022,7 @@ unix_send_io(VALUE sock, VALUE val)
 #endif
 
     arg.fd = fptr->fd;
+    rb_thread_fd_writable(arg.fd);
     if ((int)BLOCKING_REGION(sendmsg_blocking, &arg) == -1)
 	rb_sys_fail("sendmsg(2)");
 
@@ -2102,6 +2089,7 @@ unix_recv_io(int argc, VALUE *argv, VALU
 #endif
 
     arg.fd = fptr->fd;
+    rb_thread_wait_fd(arg.fd);
     if ((int)BLOCKING_REGION(recvmsg_blocking, &arg) == -1)
 	rb_sys_fail("recvmsg(2)");
 

それでは。
-- 
U.Nakamura <[email protected]>

Thread

Prev Next

In This Thread

Prev Next

[#35290] WeakRef#inspect について — keiju@... (Keiju ISHITSUKA)

[#35308] [Ruby 1.8 - Bug #214] (Open) $0に長い文字列を入れるとpsの出力に環境変数らしきものが出てくる — takeru sasaki <redmine@...>

[#35318] rb_during_gc — Masaki Suketa <masaki.suketa@...>

[#35333] [Ruby 1.8 - Bug #221] (Open) Net::SMTPでSMTPのHELO/EHLOにデフォルトで不正なホスト名を使用 — Anonymous <redmine@...>

[#35350] Re: [ruby-core:17491] [Ruby 1.8.7 - Bug #213] (Open) Different ERB behavior across versions — Urabe Shyouhei <shyouhei@...>

[#35355] リリース前ToDoリスト — Yukihiro Matsumoto <matz@...>

[#35369] fiber もどき for 1.8.x — "IWAMURO Motonori" <deenheart+ruby@...>

[#35372] patch for ruby-core:17472 — wanabe <s.wanabe@...>

[#35375] Re: [ruby-cvs:25121] Ruby:r17902 (ruby_1_8_6): * re.c (rb_reg_search): need to free allocated buffer in re_register. [ruby-core:17518] — Urabe Shyouhei <shyouhei@...>

[#35379] [Feature:1.9] rb_scan_args() for keyword arguments — Nobuyoshi Nakada <nobu@...>

[#35389] Re: [ruby-cvs:25164] Ruby:r17945 (trunk, ruby_1_8): * string.c (rb_str_succ): limit carrying in an alphanumeric region if — Yukihiro Matsumoto <matz@...>

[#35390] Re: [ruby-cvs:25170] Ruby:r17951 (trunk): * dir.c (Next): use rb_enc_precise_mbclen. — Tanaka Akira <akr@...>

[#35392] [Bug: 1.9] Block level with binding — SASADA Koichi <ko1@...>

[#35393] Ruby 1.9.1に含まれる機能について — "Yugui (Yuki Sonoda)" <yugui@...>

[#35395] Re: Ruby:r17955 (trunk): * lib/debug.rb, lib/profile.rb: fix to use RubyVM. — Kazuhiro NISHIYAMA <zn@...>

[#35396] cc always picks ruby/ruby.h on OS X — "Akinori MUSHA" <knu@...>

[#35400] [Ruby 1.9 - Bug #245] (Open) IPAddr#to_range raise ArgumentError — okkez _ <redmine@...>

[#35404] ruby_1_8_6/ruby_1_8_7ブランチのメンテナンスポリシーについて — "Shugo Maeda" <shugo@...>

[#35409] [Ruby 1.9 - Bug #250] (Open) tr で 全角数字が変換されません。 — Anonymous <redmine@...>

[#35410] [Ruby 1.9 - Bug #250] (Closed) tr で 全角数字が変換されません。 — Yui NARUSE <redmine@...>

[#35414] [Bug:1.9] $? is not thread scope — Tanaka Akira <akr@...>

[#35420] Re: [ruby-cvs:25212] Ruby:r17993 (trunk): * test/ruby/envutil.rb (assert_normal_exit): finish writing script — Tanaka Akira <akr@...>

[#35426] cgiのテストについて — Fujioka <fuj@...>

[#35441] Re: [ruby-core:17623] Re: We'll release 1.8.6/1.8.7 this Friday — Urabe Shyouhei <shyouhei@...>

[#35444] [Ruby 1.9 - Feature #17] (Closed) deadlock detection for 1.9 — Yusuke Endoh <redmine@...>

[#35446] [Bug:trunk] Thread#kill cannot break BLOCKING_REGION() on windows — "U.Nakamura" <usa@...>

[#35450] [BUG] cfp consistency error in Win32OLE — Masaki Suketa <masaki.suketa@...>

[#35458] make profiler for gc — authorNari <authornari@...>

[#35466] [Ruby 1.8 - Bug #269] (Open) OptionParser#environment requires shellwords — Takashi Tamura <redmine@...>

[#35471] [Bug: 1.9] lazy timer thraed creation — SASADA Koichi <ko1@...>

[#35480] 1.9.1 featureと1.9.0-3リリースプラン — "Yugui (Yuki Sonoda)" <yugui@...>

[#35481] [Ruby 1.9 - Bug #272] (Open) test_chdir failed when Dir.tmpdir is symlink — Kazuhiro NISHIYAMA <redmine@...>

[#35483] pack('i')の挙動...はたして何が期待されているのか — Urabe Shyouhei <shyouhei@...>

[#35484] Re: [ruby-core:17739] [Ruby 1.9 - Bug #256] (Open) defined?(Gem::RubyGemsVersion) behaves strange — wanabe <s.wanabe@...>

[#35489] [Ruby 1.8 - Bug #274] (Open) typo in net/smtp — Masao Takaku <redmine@...>

[#35533] [Bug:1.9] trap("INT", "p 1") causes ArgumentError — Tanaka Akira <akr@...>

[#35542] [Bug:1.9] sleep and Thread#run — Tanaka Akira <akr@...>

[#35545] Test::Unit -> miniunit — Kouhei Sutou <kou@...>

[#35554] [Ruby 1.9 - Bug #6] sprintf() of %f on Windows(MSVCRT) — Usaku NAKAMURA <redmine@...>

[#35555] [Ruby 1.9 - Bug #282] (Open) failure of test_asctime(TestTime) on mswin32 — Usaku NAKAMURA <redmine@...>

[#35566] rdoc defines Hash#method_missing — "Yusuke ENDOH" <mame@...>

[#35578] [Bug:1.9] context switch may occur during freeing io — "Yusuke ENDOH" <mame@...>

[#35596] ruby1.9 -n/-p and END{} — Nobuhiro IMAI <nov@...>

[#35597] [request]C APIの拡張 — "Goro Fuji" <g.psy.va@...>

[#35599] Readline::HISTORYの特異メソッドのrdocの書き方について — Takao Kouji <[email protected]>

[#35605] Generator/Fiber (Re: Re: fiber もどき for 1.8.x) — "IWAMURO Motonori" <deenheart+ruby@...>

[#35610] SEGV by STDIN.gets(0,0) — Tanaka Akira <akr@...>

[#35615] more descriptive aliases of rb_str_new[2-5] (Re: [request]C APIの拡張) — Nobuyoshi Nakada <nobu@...>

[#35617] rb_filesystem_encoding on Unix — Tanaka Akira <akr@...>

[#35620] non-locale filename encoding — Tanaka Akira <akr@...>

[#35633] [Bug:1.9] File.grpowned?のテスト — Kazuhiro NISHIYAMA <zn@...>

[#35636] [Ruby 1.9 - Bug #354] (Open) Test failure test/ruby/test_transcode.rb — Martin Dürst <redmine@...>

[#35637] [Ruby 1.9 - Bug #355] (Open) ext/opensslのmakeが通らない — Anonymous <redmine@...>

[#35638] [Ruby 1.9 - Bug #356] (Open) test_flush(TestIONonblock): Errno::EBADF: Bad file descriptor — Kazuhiro NISHIYAMA <redmine@...>

[#35640] [Ruby 1.9 - Bug #354] (Assigned) Test failure test/ruby/test_transcode.rb — Yui NARUSE <redmine@...>

[#35641] [Ruby 1.9 - Bug #354] Test failure test/ruby/test_transcode.rb — Yui NARUSE <redmine@...>

[#35646] [Bug:1.9] Rinda has a race condition — "Yusuke ENDOH" <mame@...>

[#35647] [bug] cygwin: Windows styleのload pathが無効 — Nobuyoshi Nakada <nobu@...>

[#35648] [Bug:1.9] MingwでIO#dupがブロックする — wanabe <s.wanabe@...>

[#35649] PENDINGS.rb (Was: Re: [Ruby 1.9 - Bug #354] (Assigned) Test failure test/ruby/test_transcode.rb) — "Yusuke ENDOH" <mame@...>

[#35655] [Ruby 1.9 - Bug #354] (Closed) Test failure test/ruby/test_transcode.rb — Martin Dürst <redmine@...>

[#35657] [Ruby 1.9 - Bug #356] test_flush(TestIONonblock): Errno::EBADF: Bad file descriptor — Kazuhiro NISHIYAMA <redmine@...>

[#35666] [Ruby 1.8 - Bug #367] (Open) ruby_1_8のrssで3E — Kazuhiro NISHIYAMA <redmine@...>

[#35669] [Ruby 1.9 - Bug #368] (Open) 境界における Math.atanh 等の動作 — Yui NARUSE <redmine@...>

[#35673] fail to compile extension library in Cygwin (trunk r18249) — Masaki Suketa <masaki.suketa@...>

[#35680] char_casecmp in dir.c — Tanaka Akira <akr@...>

[#35681] [Ruby 1.9 - Bug #369] (Open) Ruby 1.9.0-3で R — Akira Matsuda <redmine@...>

[#35682] [Ruby 1.9 - Bug #369] Ruby 1.9.0-3で R — Akira Matsuda <redmine@...>

[#35683] [Ruby 1.8 - Bug #367] (Closed) ruby_1_8のrssで3E — Kouhei Sutou <redmine@...>

[#35684] [Ruby 1.9 - Bug #369] Ruby 1.9.0-3で R — Akira Matsuda <redmine@...>

[#35685] encoding of Dir#path — Tanaka Akira <akr@...>

[#35704] str.encode("utf-32le", :invalid=>:replace) — Tanaka Akira <akr@...>

[#35705] "\x80".force_encoding("utf-8").encode("utf-32be",:invalid=>:replace) — Tanaka Akira <akr@...>

[#35706] rdoc コマンドで定数の説明を処理できない — Takao Kouji <[email protected]>

[ruby-dev:35511] Re: [Bug:trunk] Thread#kill cannot break BLOCKING_REGION() on windows

Thread

In This Thread

[#35409] [Ruby 1.9 - Bug #250] (Open) tr で全角数字が変換されません。 — Anonymous <redmine@...>

[#35410] [Ruby 1.9 - Bug #250] (Closed) tr で全角数字が変換されません。 — Yui NARUSE <redmine@...>