pop (CONFLICT)

diff --git a/meta b/meta
index ae081e30b1dbc934fd3c4f6fa1c58e2c3905f2da..30e8531e381036b0e00abe9a6af1b56beb36512a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: a12d16bf06b82e18751003a8a7ae8edcaf2737ab
+Previous: 02c5706ede6ced0cc97a49eb20b09c15d9887aac
 Head: df43798c264d5eab9112dc36c3f89116d4cb6307
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
+  rs-delay: df43798c264d5eab9112dc36c3f89116d4cb6307
 Unapplied:
-  rs-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
   rs-async-nonblock: 992a8c5abcb0199fd6214fd31b6695573ccb5bf5
   preload: 5dfe7abc07064485c5100e04e5412279244c2bc3

diff --git a/patches/rs-delay b/patches/rs-delay
index e21a1f3660471c6bb078cd15236f72bfcc466169..8013689380d03479d2b06c252551346ccc9bea0f 100644 (file)
--- a/patches/rs-delay
+++ b/patches/rs-delay
@@ -1,5 +1,5 @@
-Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    1e3526d39b2591bb10a08bfed2622f05f82b1bd8
+Bottom: 8cf2ab30dd18c0af94f11796a7f62c7abdbec612
+Top:    8cf2ab30dd18c0af94f11796a7f62c7abdbec612
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:33:13 -0700
 
@@ -18,78 +18,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 8aa089d..7f39b29 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -56,8 +56,8 @@ static int test_size[] = {
- static int use_rs = 1;
- static int use_async;
- static int verify;
--static int flags;
--static int no_delay;
-+static int flags = MSG_DONTWAIT;
-+static int no_delay = 1;
- static int custom;
- static int iterations = 1;
- static int transfer_size = 1000;
-@@ -151,8 +151,6 @@ static void init_latency_test(int size)
- {
-       size_str(test_name, size);
-       sprintf(test_name, "%s_lat", test_name);
--      no_delay = 1;
--      flags |= MSG_DONTWAIT;
-       transfer_count = 1;
-       transfer_size = size;
-       iterations = size_to_count(transfer_size);
-@@ -162,8 +160,6 @@ static void init_bandwidth_test(int size)
- {
-       size_str(test_name, size);
-       sprintf(test_name, "%s_bw", test_name);
--      no_delay = 1;
--      flags |= MSG_DONTWAIT;
-       iterations = 1;
-       transfer_size = size;
-       transfer_count = size_to_count(transfer_size);
-@@ -490,6 +486,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;
-                       no_delay = 1;
-@@ -505,6 +505,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;
-                       no_delay = 1;
-@@ -559,6 +562,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
+