From: <ni...@us...> - 2009-06-05 19:53:09
|
Revision: 1324 http://levent.svn.sourceforge.net/levent/?rev=1324&view=rev Author: nickm Date: 2009-06-05 19:52:13 +0000 (Fri, 05 Jun 2009) Log Message: ----------- Replace some read/write instances with send/recv to work properly on win32. Modified Paths: -------------- trunk/libevent/ChangeLog trunk/libevent/test/bench.c trunk/libevent/test/bench_cascade.c trunk/libevent/test/regress_et.c trunk/libevent/test/test-eof.c trunk/libevent/test/test-weof.c Modified: trunk/libevent/ChangeLog =================================================================== --- trunk/libevent/ChangeLog 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/ChangeLog 2009-06-05 19:52:13 UTC (rev 1324) @@ -34,6 +34,8 @@ o Fix a memory error when freeing a thread-enabled event base with registered events. (Spotted by Joachim Bauch.) o Try to contain degree of failure when running on a win32 version so heavily firewalled that we can't fake a socketpair. o Activate fd events in a pseudorandom order with O(N) backends, so that we don't systematically favor low fds (select) or earlier-added fds (poll, win32). + o Replace some read()/write() instances with send()/recv() to work properly + on win32. Changes in 2.0.1-alpha: Modified: trunk/libevent/test/bench.c =================================================================== --- trunk/libevent/test/bench.c 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/test/bench.c 2009-06-05 19:52:13 UTC (rev 1324) @@ -70,11 +70,11 @@ long idx = (long) arg, widx = idx + 1; u_char ch; - count += read(fd, &ch, sizeof(ch)); + count += recv(fd, &ch, sizeof(ch), 0); if (writes) { if (widx >= num_pipes) widx -= num_pipes; - write(pipes[2 * widx + 1], "e", 1); + send(pipes[2 * widx + 1], "e", 1, 0); writes--; fired++; } @@ -99,7 +99,7 @@ space = num_pipes / num_active; space = space * 2; for (i = 0; i < num_active; i++, fired++) - write(pipes[i * space + 1], "e", 1); + send(pipes[i * space + 1], "e", 1, 0); count = 0; writes = num_writes; Modified: trunk/libevent/test/bench_cascade.c =================================================================== --- trunk/libevent/test/bench_cascade.c 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/test/bench_cascade.c 2009-06-05 19:52:13 UTC (rev 1324) @@ -66,9 +66,9 @@ char ch; long idx = (long) arg; - read(fd, &ch, sizeof(ch)); + recv(fd, &ch, sizeof(ch), 0); if (idx >= 0) - write(idx, "e", 1); + send(idx, "e", 1, 0); fired++; } @@ -109,7 +109,7 @@ fired = 0; /* kick everything off with a single write */ - write(pipes[1], "e", 1); + send(pipes[1], "e", 1, 0); event_dispatch(); Modified: trunk/libevent/test/regress_et.c =================================================================== --- trunk/libevent/test/regress_et.c 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/test/regress_et.c 2009-06-05 19:52:13 UTC (rev 1324) @@ -55,7 +55,7 @@ char buf; int len; - len = read(fd, &buf, sizeof(buf)); + len = recv(fd, &buf, sizeof(buf), 0); /*printf("%s: %s %d%s\n", __func__, event & EV_ET ? "etread" : "read", len, len ? "" : " - means EOF"); @@ -95,7 +95,7 @@ called = was_et = 0; - write(pair[0], test, strlen(test)+1); + send(pair[0], test, strlen(test)+1, 0); shutdown(pair[0], SHUT_WR); /* Initalize the event library */ Modified: trunk/libevent/test/test-eof.c =================================================================== --- trunk/libevent/test/test-eof.c 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/test/test-eof.c 2009-06-05 19:52:13 UTC (rev 1324) @@ -35,7 +35,7 @@ char buf[256]; int len; - len = read(fd, buf, sizeof(buf)); + len = recv(fd, buf, sizeof(buf), 0); printf("%s: read %d%s\n", __func__, len, len ? "" : " - means EOF"); @@ -64,7 +64,7 @@ return (1); - write(pair[0], test, strlen(test)+1); + send(pair[0], test, strlen(test)+1, 0); shutdown(pair[0], SHUT_WR); /* Initalize the event library */ Modified: trunk/libevent/test/test-weof.c =================================================================== --- trunk/libevent/test/test-weof.c 2009-06-04 05:29:04 UTC (rev 1323) +++ trunk/libevent/test/test-weof.c 2009-06-05 19:52:13 UTC (rev 1324) @@ -39,7 +39,7 @@ const char *test = "test string"; int len; - len = write(fd, test, strlen(test) + 1); + len = send(fd, test, strlen(test) + 1, 0); printf("%s: write %d%s\n", __func__, len, len ? "" : " - means EOF"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |