From cc3d768af9ac3346e3f99d8855adb009044bca76 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 16 May 2012 15:13:50 -0700 Subject: [PATCH] refresh --- meta | 7 +++-- patches/refresh-temp | 56 ---------------------------------------- patches/rstream-spinpoll | 53 ++++++++++--------------------------- 3 files changed, 16 insertions(+), 100 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 2ef15ac6..33ae6d83 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: 0598198945bd238986933a5f4fbbda500fd0a33b -Head: c2417e66b3c398d37b81998b3f4f1159322ef23e +Previous: 55532c49514967bee50256ed7e2a92135bf6463c +Head: a7f657e418c1ba35ba61550f67f6bf7bb1352575 Applied: rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9 rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56 rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5 - rstream-spinpoll: 0b862b1f59c6b09d9691d058354ee7baff7e5831 - refresh-temp: c2417e66b3c398d37b81998b3f4f1159322ef23e + rstream-spinpoll: a7f657e418c1ba35ba61550f67f6bf7bb1352575 Unapplied: comp_locks: b89aab130b4619806557e11e6b9c10964f00743f preload: 5dfe7abc07064485c5100e04e5412279244c2bc3 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index a1b48910..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,56 +0,0 @@ -Bottom: e2131f7e51447fe3fd85c9a62239f937dac571b5 -Top: 9bd029a43201d8d7586d4167218571a9c818e2d0 -Author: Sean Hefty -Date: 2012-05-16 15:13:49 -0700 - -Refresh of rstream-spinpoll - ---- - -diff --git a/examples/rstream.c b/examples/rstream.c -index 27a6aeb..75e5246 100644 ---- a/examples/rstream.c -+++ b/examples/rstream.c -@@ -55,7 +55,6 @@ static int test_size[] = { - - static int use_rs = 1; - static int use_async; --static int poll_timeout = -1; - static int verify; - static int flags = MSG_DONTWAIT; - static int no_delay = 1; -@@ -502,6 +501,7 @@ static int set_test_opt(char *optarg) - break; - case 'a': - use_async = 1; -+ flags |= MSG_DONTWAIT; - break; - case 'b': - flags &= ~MSG_DONTWAIT; -@@ -511,9 +511,6 @@ static int set_test_opt(char *optarg) - flags |= MSG_DONTWAIT; - no_delay = 1; - break; -- case 'p': -- poll_timeout = 0; -- break; - case 'v': - verify = 1; - break; -@@ -531,8 +528,6 @@ static int set_test_opt(char *optarg) - } else if (!strncasecmp("nonblock", optarg, 8)) { - flags |= MSG_DONTWAIT; - no_delay = 1; -- } else if (!strncasecmp("poll", optarg, 4)) { -- poll_timeout = 0; - } else if (!strncasecmp("verify", optarg, 6)) { - verify = 1; - } else { -@@ -586,7 +581,6 @@ int main(int argc, char **argv) - printf("\t a|async - asynchronous operation (use poll)\n"); - printf("\t b|blocking - use blocking calls\n"); - printf("\t n|nonblocking - use nonblocking calls\n"); -- printf("\t p|poll - poll on asynchronous operations\n"); - printf("\t v|verify - verify data\n"); - exit(1); - } diff --git a/patches/rstream-spinpoll b/patches/rstream-spinpoll index 2039ae30..13f66526 100644 --- a/patches/rstream-spinpoll +++ b/patches/rstream-spinpoll @@ -1,5 +1,5 @@ Bottom: fb3f150e6146757e6bdb884182c4b19457bd6b6b -Top: e2131f7e51447fe3fd85c9a62239f937dac571b5 +Top: 9bd029a43201d8d7586d4167218571a9c818e2d0 Author: Sean Hefty Date: 2012-05-16 11:26:33 -0700 @@ -14,18 +14,10 @@ Signed-off-by: Sean Hefty --- diff --git a/examples/rstream.c b/examples/rstream.c -index decb204..27a6aeb 100644 +index decb204..75e5246 100644 --- a/examples/rstream.c +++ b/examples/rstream.c -@@ -55,6 +55,7 @@ static int test_size[] = { - - static int use_rs = 1; - static int use_async; -+static int poll_timeout = -1; - static int verify; - static int flags = MSG_DONTWAIT; - static int no_delay = 1; -@@ -191,6 +192,17 @@ static int verify_buf(void *buf, int size) +@@ -191,6 +191,17 @@ static int verify_buf(void *buf, int size) return 0; } @@ -43,7 +35,7 @@ index decb204..27a6aeb 100644 static int send_xfer(int rs, int size) { struct pollfd fds; -@@ -206,7 +218,7 @@ static int send_xfer(int rs, int size) +@@ -206,7 +217,7 @@ static int send_xfer(int rs, int size) for (offset = 0; offset < size; ) { if (use_async) { @@ -52,7 +44,7 @@ index decb204..27a6aeb 100644 if (ret != 1) return ret; } -@@ -235,7 +247,7 @@ static int recv_xfer(int rs, int size) +@@ -235,7 +246,7 @@ static int recv_xfer(int rs, int size) for (offset = 0; offset < size; ) { if (use_async) { @@ -61,7 +53,7 @@ index decb204..27a6aeb 100644 if (ret != 1) return ret; } -@@ -380,7 +392,7 @@ static int server_connect(void) +@@ -380,7 +391,7 @@ static int server_connect(void) fds.fd = lrs; fds.events = POLLIN; @@ -70,7 +62,7 @@ index decb204..27a6aeb 100644 if (ret != 1) { perror("rpoll"); goto close; -@@ -424,21 +436,26 @@ static int client_connect(void) +@@ -424,21 +435,26 @@ static int client_connect(void) ret = rs_connect(rs, res->ai_addr, res->ai_addrlen); if (ret && (errno != EINPROGRESS)) { perror("rconnect"); @@ -102,33 +94,14 @@ index decb204..27a6aeb 100644 } static int run(void) -@@ -494,6 +511,9 @@ static int set_test_opt(char *optarg) - flags |= MSG_DONTWAIT; - no_delay = 1; +@@ -485,6 +501,7 @@ static int set_test_opt(char *optarg) break; -+ case 'p': -+ poll_timeout = 0; -+ break; - case 'v': - verify = 1; + case 'a': + use_async = 1; ++ flags |= MSG_DONTWAIT; break; -@@ -511,6 +531,8 @@ static int set_test_opt(char *optarg) - } else if (!strncasecmp("nonblock", optarg, 8)) { - flags |= MSG_DONTWAIT; - no_delay = 1; -+ } else if (!strncasecmp("poll", optarg, 4)) { -+ poll_timeout = 0; - } else if (!strncasecmp("verify", optarg, 6)) { - verify = 1; - } else { -@@ -564,6 +586,7 @@ int main(int argc, char **argv) - printf("\t a|async - asynchronous operation (use poll)\n"); - printf("\t b|blocking - use blocking calls\n"); - printf("\t n|nonblocking - use nonblocking calls\n"); -+ printf("\t p|poll - poll on asynchronous operations\n"); - printf("\t v|verify - verify data\n"); - exit(1); - } + case 'b': + flags &= ~MSG_DONTWAIT; diff --git a/man/rstream.1 b/man/rstream.1 index 58bd7e3..98f3d8e 100644 --- a/man/rstream.1 -- 2.41.0