refresh

diff --git a/meta b/meta
index 77c2ca849f368b10bbf0d5d848561094bc108cee..b9ac2615fc7f9316f3bb0fcb7f58b738bd5ad333 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 294a1dc276cbc17a3c470c843c6c302fd3f0a1b8
-Head: e19e23dc48ca00cb6c3f4f8b4e951729f9c83083
+Previous: a53b69e6eded5f976b052572fca01692df7401e4
+Head: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
-  rs-delay: df43798c264d5eab9112dc36c3f89116d4cb6307
-  refresh-temp: e19e23dc48ca00cb6c3f4f8b4e951729f9c83083
+  rs-delay: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
 Unapplied:
   rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
   rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 55ffeba..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,80 +0,0 @@
-Bottom: 8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Top:    891a16cb25ad39db51200ed1eb3262b8f982b9bd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 15:55:55 -0700
-
-Refresh of rs-delay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index a313fdb..825c4de 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -56,7 +56,7 @@ static int test_size[] = {
- static int use_rs = 1;
- static int use_async;
- static int verify;
--static int flags;
-+static int flags = MSG_DONTWAIT;
- static int custom;
- static int iterations = 1;
- static int transfer_size = 1000;
-@@ -150,7 +150,6 @@ static void init_latency_test(int size)
- {
-       size_str(test_name, size);
-       sprintf(test_name, "%s_lat", test_name);
--      flags |= MSG_DONTWAIT;
-       transfer_count = 1;
-       transfer_size = size;
-       iterations = size_to_count(transfer_size);
-@@ -160,7 +159,6 @@ static void init_bandwidth_test(int size)
- {
-       size_str(test_name, size);
-       sprintf(test_name, "%s_bw", test_name);
--      flags |= MSG_DONTWAIT;
-       iterations = 1;
-       transfer_size = size;
-       transfer_count = size_to_count(transfer_size);
-@@ -485,6 +483,10 @@ static int set_test_opt(char *optarg)
-               case 'a':
-                       use_async = 1;
-                       break;
-+              case 'b':
-+                      flags &= ~MSG_DONTWAIT;
-+                      no_delay = 0;
-+                      break;
-               case 'n':
-                       flags |= MSG_DONTWAIT;
-                       break;
-@@ -499,6 +501,9 @@ static int set_test_opt(char *optarg)
-                       use_rs = 0;
-               } else if (!strncasecmp("async", optarg, 5)) {
-                       use_async = 1;
-+              } else if (!strncasecmp("block", optarg, 5)) {
-+                      flags &= ~MSG_DONTWAIT;
-+                      no_delay = 0;
-               } else if (!strncasecmp("nonblock", optarg, 8)) {
-                       flags |= MSG_DONTWAIT;
-               } else if (!strncasecmp("verify", optarg, 6)) {
-@@ -552,6 +557,7 @@ int main(int argc, char **argv)
-                       printf("\t[-T test_option]\n");
-                       printf("\t    s|sockets - use standard tcp/ip sockets\n");
-                       printf("\t    a|async - asynchronous operation\n");
-+                      printf("\t    b|blocking - use blocking calls\n");
-                       printf("\t    n|nonblocking - use nonblocking calls\n");
-                       printf("\t    v|verify - verify data\n");
-                       exit(1);
-diff --git a/man/rstream.1 b/man/rstream.1
-index 701db3a..58bd7e3 100644
---- a/man/rstream.1
-+++ b/man/rstream.1
-@@ -42,6 +42,8 @@ s | socket  - uses standard socket calls to transfer data
- .P
- a | async - uses asynchronous operation (e.g. select / poll)
- .P
-+b | blocking - uses blocking calls
-+.P
- n | nonblocking - uses non-blocking calls
- .P
- v | verify - verifies data transfers

diff --git a/patches/rs-delay b/patches/rs-delay
index 8013689380d03479d2b06c252551346ccc9bea0f..ef527f2f00f7bc75251167e786402496d8ee3769 100644 (file)
--- a/patches/rs-delay
+++ b/patches/rs-delay
@@ -1,5 +1,5 @@
 Bottom: 8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Top:    8cf2ab30dd18c0af94f11796a7f62c7abdbec612
+Top:    891a16cb25ad39db51200ed1eb3262b8f982b9bd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:33:13 -0700
 
@@ -18,4 +18,74 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/rstream.c b/examples/rstream.c
+index a313fdb..825c4de 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -56,7 +56,7 @@ static int test_size[] = {
+ static int use_rs = 1;
+ static int use_async;
+ static int verify;
+-static int flags;
++static int flags = MSG_DONTWAIT;
+ static int custom;
+ static int iterations = 1;
+ static int transfer_size = 1000;
+@@ -150,7 +150,6 @@ static void init_latency_test(int size)
+ {
+       size_str(test_name, size);
+       sprintf(test_name, "%s_lat", test_name);
+-      flags |= MSG_DONTWAIT;
+       transfer_count = 1;
+       transfer_size = size;
+       iterations = size_to_count(transfer_size);
+@@ -160,7 +159,6 @@ static void init_bandwidth_test(int size)
+ {
+       size_str(test_name, size);
+       sprintf(test_name, "%s_bw", test_name);
+-      flags |= MSG_DONTWAIT;
+       iterations = 1;
+       transfer_size = size;
+       transfer_count = size_to_count(transfer_size);
+@@ -485,6 +483,10 @@ static int set_test_opt(char *optarg)
+               case 'a':
+                       use_async = 1;
+                       break;
++              case 'b':
++                      flags &= ~MSG_DONTWAIT;
++                      no_delay = 0;
++                      break;
+               case 'n':
+                       flags |= MSG_DONTWAIT;
+                       break;
+@@ -499,6 +501,9 @@ static int set_test_opt(char *optarg)
+                       use_rs = 0;
+               } else if (!strncasecmp("async", optarg, 5)) {
+                       use_async = 1;
++              } else if (!strncasecmp("block", optarg, 5)) {
++                      flags &= ~MSG_DONTWAIT;
++                      no_delay = 0;
+               } else if (!strncasecmp("nonblock", optarg, 8)) {
+                       flags |= MSG_DONTWAIT;
+               } else if (!strncasecmp("verify", optarg, 6)) {
+@@ -552,6 +557,7 @@ int main(int argc, char **argv)
+                       printf("\t[-T test_option]\n");
+                       printf("\t    s|sockets - use standard tcp/ip sockets\n");
+                       printf("\t    a|async - asynchronous operation\n");
++                      printf("\t    b|blocking - use blocking calls\n");
+                       printf("\t    n|nonblocking - use nonblocking calls\n");
+                       printf("\t    v|verify - verify data\n");
+                       exit(1);
+diff --git a/man/rstream.1 b/man/rstream.1
+index 701db3a..58bd7e3 100644
+--- a/man/rstream.1
++++ b/man/rstream.1
+@@ -42,6 +42,8 @@ s | socket  - uses standard socket calls to transfer data
+ .P
+ a | async - uses asynchronous operation (e.g. select / poll)
+ .P
++b | blocking - uses blocking calls
++.P
+ n | nonblocking - uses non-blocking calls
+ .P
+ v | verify - verifies data transfers