From eba70e2e28f51678b65103a68f4d92fb71aa9f2f Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 16 May 2012 11:59:05 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index d5cc7f51..60062e3b 100644 --- a/meta +++ b/meta @@ -1,12 +1,13 @@ Version: 1 -Previous: 74515c7284c913723122d1326d19bc6b1b4aa145 -Head: 58bbcd14e382aefddb02772cd116d5903e01ecb4 +Previous: f750a96da90c4a5690f348b699487fe4505243cc +Head: b4452399db19d4d631b9882a1d82cc3f92f75c00 Applied: rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9 rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56 rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5 rstream-spinpoll: 58bbcd14e382aefddb02772cd116d5903e01ecb4 + refresh-temp: b4452399db19d4d631b9882a1d82cc3f92f75c00 Unapplied: comp_locks: b89aab130b4619806557e11e6b9c10964f00743f preload: 5dfe7abc07064485c5100e04e5412279244c2bc3 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..0c40cb71 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,44 @@ +Bottom: ed3c9123d122743be28892d7fce45407ab240329 +Top: e2131f7e51447fe3fd85c9a62239f937dac571b5 +Author: Sean Hefty +Date: 2012-05-16 11:59:05 -0700 + +Refresh of rstream-spinpoll + +--- + +diff --git a/examples/rstream.c b/examples/rstream.c +index b7c33f6..27a6aeb 100644 +--- a/examples/rstream.c ++++ b/examples/rstream.c +@@ -197,7 +197,7 @@ static int do_poll(struct pollfd *fds) + int ret; + + do { +- ret = rs_poll(&fds, 1, poll_timeout); ++ ret = rs_poll(fds, 1, poll_timeout); + } while (ret < 0 && (errno == EAGAIN || errno == EWOULDBLOCK)); + + return ret; +@@ -586,7 +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 p|poll - poll on asynchronous operations\n"); + printf("\t v|verify - verify data\n"); + exit(1); + } +diff --git a/man/rstream.1 b/man/rstream.1 +index 58bd7e3..98f3d8e 100644 +--- a/man/rstream.1 ++++ b/man/rstream.1 +@@ -46,6 +46,8 @@ b | blocking - uses blocking calls + .P + n | nonblocking - uses non-blocking calls + .P ++p | poll - poll on asynchronous operations until complete ++.P + v | verify - verifies data transfers + .SH "NOTES" + Basic usage is to start rstream on a server system, then run -- 2.41.0