refresh

diff --git a/meta b/meta
index 60062e3beb1fd4a1c0b386bd06d8aa95fbeffd0b..2cdf20a99274ce07610f7cead67705e3a539c098 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: f750a96da90c4a5690f348b699487fe4505243cc
-Head: b4452399db19d4d631b9882a1d82cc3f92f75c00
+Previous: 45eedbf501f867506126cab7f0d01932a1673019
+Head: 0b862b1f59c6b09d9691d058354ee7baff7e5831
 Applied:
   rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rstream-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rstream-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
-  rstream-spinpoll: 58bbcd14e382aefddb02772cd116d5903e01ecb4
-  refresh-temp: b4452399db19d4d631b9882a1d82cc3f92f75c00
+  rstream-spinpoll: 0b862b1f59c6b09d9691d058354ee7baff7e5831
 Unapplied:
   comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0c40cb7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,44 +0,0 @@
-Bottom: ed3c9123d122743be28892d7fce45407ab240329
-Top:    e2131f7e51447fe3fd85c9a62239f937dac571b5
-Author: Sean Hefty <sean.hefty@intel.com>
-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

diff --git a/patches/rstream-spinpoll b/patches/rstream-spinpoll
index 50ae7edce100332351e80445ace0d5e439aeb19a..2039ae303ad658d42ef3cd7fba88f46101cabbbd 100644 (file)
--- a/patches/rstream-spinpoll
+++ b/patches/rstream-spinpoll
@@ -1,5 +1,5 @@
 Bottom: fb3f150e6146757e6bdb884182c4b19457bd6b6b
-Top:    ed3c9123d122743be28892d7fce45407ab240329
+Top:    e2131f7e51447fe3fd85c9a62239f937dac571b5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 11:26:33 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index decb204..b7c33f6 100644
+index decb204..27a6aeb 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -55,6 +55,7 @@ static int test_size[] = {
@@ -34,7 +34,7 @@ index decb204..b7c33f6 100644
 +      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;
@@ -125,7 +125,20 @@ index decb204..b7c33f6 100644
                        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