ruby-list

小松です。

In the message of [ruby-list:23521] Re: Ruby 1.4.5
    on 2000/6/26 20:19:43 Katsuyuki Komatsu <komatsu@sarion.co.jp> wrote:

|    select()がWSAENOTSOCKのエラーになった場合、ソケット以外のハンドル
|    のみ読み込み可/書き込み可とみなす
|
|といったインプリメントに変える必要があります。

こんな感じです。
1.5.4も同様です。

Mon Jun 26 22:20:03 2000  Katsuyuki Komatsu  <komatsu@sarion.co.jp>

	* win32/win32.c (is_socket, extract_file_fd): New function.

	* win32/win32.c (myfdopen): use is_socket().

	* win32/win32.c (myselect): return non socket files immediately
	  if file and socket handles are mixed.

diff -ru1p ruby-1.4.5.dist/win32/win32.c ruby-1.4.5/win32/win32.c
--- ruby-1.4.5.dist/win32/win32.c	Fri Feb 18 15:58:58 2000
+++ ruby-1.4.5/win32/win32.c	Mon Jun 26 22:20:03 2000
@@ -1591,4 +1591,4 @@ my_open_osfhandle(long osfhandle, int fl
 
-FILE *
-myfdopen (int fd, const char *mode)
+static int
+is_socket(SOCKET fd)
 {
@@ -1597,9 +1597,5 @@ myfdopen (int fd, const char *mode)
     int retval;
-    int fh;
-    extern int errno;
 
-    //fprintf(stderr, "myfdopen()\n");
-
-	optlen = sizeof(sockbuf);
-    retval = getsockopt((SOCKET)fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
+    optlen = sizeof(sockbuf);
+    retval = getsockopt(fd, SOL_SOCKET, SO_TYPE, sockbuf, &optlen);
     if (retval == SOCKET_ERROR) {
@@ -1609,3 +1605,3 @@ myfdopen (int fd, const char *mode)
 	if (iRet == WSAENOTSOCK || iRet == WSANOTINITIALISED)
-	    return (_fdopen(fd, mode));
+	    return FALSE;
     }
@@ -1616,4 +1612,17 @@ myfdopen (int fd, const char *mode)
 
+    return TRUE;
+}
+
+FILE *
+myfdopen (int fd, const char *mode)
+{
+    if (is_socket((SOCKET)fd)) {
+	int fh;
+
 	fh = my_open_osfhandle((SOCKET)fd, O_RDWR|O_BINARY);
-    return _fdopen(fh, mode);		// return file pointer
+	return _fdopen(fh, mode);		// return file pointer
+    }
+    else {
+	return (_fdopen(fd, mode));
+    }
 }
@@ -1759,2 +1768,32 @@ static int NtSocketsInitialized = 0;
 
+static int
+extract_file_fd(fd_set *set, fd_set *fileset)
+{
+    int idx;
+
+    fileset->fd_count = 0;
+    if (!set)
+	return 0;
+    for (idx = 0; idx < set->fd_count; idx++) {
+	SOCKET fd = set->fd_array[idx];
+
+	if (!is_socket(fd)) {
+	    int i;
+
+	    for (i = 0; i < fileset->fd_count; i++) {
+		if (fileset->fd_array[i] == fd) {
+		    break;
+		}
+	    }
+	    if (i == fileset->fd_count) {
+		if (fileset->fd_count < FD_SETSIZE) {
+		    fileset->fd_array[i] = fd;
+		    fileset->fd_count++;
+		}
+	    }
+	}
+    }
+    return fileset->fd_count;
+}
+
 long 
@@ -1764,2 +1803,6 @@ myselect (int nfds, fd_set *rd, fd_set *
     long r;
+    fd_set file_rd;
+    fd_set file_wr;
+    int file_nfds;
+
     if (!NtSocketsInitialized++) {
@@ -1771,2 +1814,12 @@ myselect (int nfds, fd_set *rd, fd_set *
     }
+    file_nfds = extract_file_fd(rd, &file_rd);
+    file_nfds += extract_file_fd(wr, &file_wr);
+    if (file_nfds)
+    {
+	// assume normal files are always readable/writable
+	// fake read/write fd_set and return value
+	if (rd) *rd = file_rd;
+	if (wr) *wr = file_wr;
+	return file_nfds;
+    }
     if ((r = select (nfds, rd, wr, ex, timeout)) == SOCKET_ERROR) {
@@ -1776,18 +1829,2 @@ myselect (int nfds, fd_set *rd, fd_set *
 	    errno = EINTR;
-	    break;
-	case WSAENOTSOCK:
-	    // assume normal files are always readable/writable
-	    // fake read/write fd_set and return value
-	    r = 0;
-	    if (rd) r += rd->fd_count;
-	    if (wr) r += wr->fd_count;
-	    if (ex && ex->fd_count > 0) {
-		// exceptional condition never happen for normal files
-		if (r > 0)
-		    ex->fd_count = 0;
-		else {
-		    errno = EBADF;
-		    r = SOCKET_ERROR;
-		}
-	    }
 	    break;

--
小松克行 / Katsuyuki Komatsu <komatsu@sarion.co.jp>

Thread

Prev Next

In This Thread

Prev Next

[#23023] 社名変更のご挨拶 — matz@... (Yukihiro Matsumoto)

[#23024] net/ 1.1.20 — Minero Aoki <aamine@...>

[#23026] ruby compile/ruby-gtk — Taiji.Can@...

[#23031] description on fork and Process.fork — kjana@... (YANAGAWA Kazuhisa)

[#23032] Racc Array#filter -> collect! — Toshiro Kuwabara <toshirok@...3.so-net.ne.jp>

[#23036] '==' causes TypeError — NISHIKAWA <nyasu@...3web.ne.jp>

[#23037] media watch 2000.05.29 — Noritsugu Nakamura <nnakamur@...>

[#23052] UTF-8 on print method — kenn@...

[#23056] JLA Doc-CD アンケートのお願い — Hisaaki Shibata <shibata@...1.netspace.or.jp>

[#23061] rfc822.rb parse error — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#23079] Re: [ruby-talk:03129] Re: my wish list for Ruby - dRuby — Masatoshi SEKI <m_seki@...>

[#23085] about : ruby-mode.el — Masahiro Kawata <kawata@...>

[#23088] 文字列置換 — Takayuki Tanaka <tanaka@...>

[#23095] setup.rb testrun — rubikitch <rubikitch@...>

[#23096] http.rb will change — Minero Aoki <aamine@...>

[#23115] rd2ewb — gotoken@... (GOTO Kentaro)

[#23116] making Array — OZAWA Sakuro <crouton@...>

[#23125] メソッドの中の動きを変える — Masahiro Kawata <kawata@...>

[#23140] Apollo 0.601 — Kazuhiro Yoshida <moriq.kazuhiro@...>

[#23141] Re: [ruby-math:00302]: Float#ceil, Float#floor, Float#round — "Shigeo Kobayashi" <shigeo@...>

[#23156] ports — Wakou Aoyama <wakou@...>

[#23161] RDtool trouble. — rubikitch <rubikitch@...>

[#23168] media watch 2000.06.08 — Noritsugu Nakamura <nnakamur@...>

[#23169] Kconv::guess(str) — NAWATE Masahiko <agul@...>

[#23171] Re: Kconv::guess(str) — NAWATE Masahiko <agul@...>

[#23177] Re: Kconv::guess(str) — NAWATE Masahiko <agul@...>

[#23185] commonly used notation — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#23190] pstore — Masatoshi SEKI <m_seki@...>

[#23191] pstorewc — Masatoshi SEKI <m_seki@...>

[#23197] self の振る舞いを書き換えたいです — Kenya Ogata <k_ogata@...>

[#23214] Access serial port (cygwin32) — Hagemu Higuchi <hahiguc@...11.odn.ne.jp>

[#23222] readablity of RD — TAKAHASHI Masayoshi <maki@...>

[#23230] Usage of system function — Hagemu Higuchi <hahiguc@...11.odn.ne.jp>

[#23235] nkf MIME space handling — "Kikutani, Makoto" <kikutani@...>

[#23259] libpng wrapper library — "DATE Ken" <ge6537@...>

[#23274] encoding of files from cvsweb — TAKAHASHI Masayoshi <maki@...>

[#23277] net/smtp.rb extra lines ? — "Kikutani, Makoto" <kikutani@...>

[#23284] Ruby/zlib — Ueno Katsuhiro <unnie@...>

[#23303] RDlabel bug — rubikitch <rubikitch@...>

[#23305] xmarshal.rb — Masatoshi SEKI <m_seki@...>

[#23308] "make test" error on MacLinux — Ryutaro Matsushita <ryutaro@...>

[#23311] UTF-8 in RubyBook — "Kikutani, Makoto" <kikutani@...>

[#23356] rd2texi-lib.rb 最新版？ — Noritsugu Nakamura <nnakamur@...>

[#23357] media watch 2000.06.17 — Noritsugu Nakamura <nnakamur@...>

[#23359] ASP — Yoshinori Tahara <platypus@...1.mbn.or.jp>

[#23368] Message Digest (MD5) Function — Hagemu Higuchi <hahiguc@...11.odn.ne.jp>

[#23372] (GMT+0500) — "Kikutani, Makoto" <kikutani@...>

[#23384] oracle on UnixWare — 市村 光康 <ichimura@...>

[#23385] DBMS and ruby CGI — toyofuku@...

[#23401] Re: Message Digest (MD5) Function — Hagemu Higuchi <hahiguc@...11.odn.ne.jp>

[#23410] Re: DBMS and ruby CGI — "Kahori Takeuchi" <EB89012@...>

[#23411] dump a single object — Hideto ISHIBASHI <hideto-i@...4u.or.jp>

[#23416] ruby <--> java <--> C++ — Noritsugu Nakamura <nnakamur@...>

[#23422] catch/throw — NAWATE Masahiko <agul@...>

[#23428] Re: catch/throw — NAWATE Masahiko <agul@...>

[#23452] ftp.rb で resume — "Uechi Yasumasa" <uechi@...>

[#23454] MHC in RAA — Yoshinari Nomura <nom@...>

[#23475] about cgi.textarea() — goto@...

[#23477] Re: DBMS and ruby CGI — toyofuku@...

[#23485] Ruby 1.4.5 — matz@... (Yukihiro Matsumoto)

[#23497] cgi.rb でエレメントの削除可能？ — Noritsugu Nakamura <nnakamur@...>

[#23500] Ruby/zlib — Ueno Katsuhiro <unnie@...>

[#23501] Ruby 1.4.5 repacked — matz@...

[#23504] 拡張ライブラリの作り方 — Akimichi Tatsukawa <akimichi@...>

[#23508] about cgi.rb — goto@...

[#23509] Dimension of array — agul@...

[#23519] media watch 2000.06.24 — Noritsugu Nakamura <nnakamur@...>

[#23520] pty on 48 — Noritsugu Nakamura <nnakamur@...>

[#23533] Solaris から Linux への変更 — Yoshihiro Nakahara <yoshihiro@...>

[#23537] Ruby Language reference manual version — MATUDA Hazime <matsuda@...>

[#23539] [Q] unix のコマンドとのデータ受け渡し方法 — Sakae Kobayashi <sakae@...>

[#23550] protocol.rb http.rb 1.1.24 — Minero Aoki <aamine@...>

[#23555] insert_table(postgres) — Noboru Saitou <noborus@...>

[#23558] ruby-1.4.5 GNUmakefile — IWATSUKI Hiroyuki <don@...>

[#23574] ruby-list was crashed; restored — matz@... (Yukihiro Matsumoto)

[#23589] optparse / racc — TAKAHASHI Masayoshi <maki@...>

[#23608] about array::pack — goto@...

[#23629] 1.4/ruby-1.4.5.tar.gz — Yasuhiro Fukuma <yasuf@...>

[ruby-list:23522] Re: Ruby 1.4.5

Thread

[#23384] oracle on UnixWare — 市村光康 <ichimura@...>