refresh

diff --git a/meta b/meta
index 3d529d99fbbe2e52fca59c5fb1caacf63b122615..a0497f0ae208a7cddb7c8e25e46833e58e27d7ee 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 6c33be3bd25f858a00c0bc22c8440503993dd731
-Head: ad3d7818fff9415bd92f6644b78d13f7be3f2ae3
+Previous: e809601c230d049bf8854817163279f9abcb0402
+Head: d7eefeeab4adb9234aa20d659546d9454ee32f86
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
-  rs-delay: 49e4eb6354a6b75a966040a156a8441ee5b18ba3
-  refresh-temp: ad3d7818fff9415bd92f6644b78d13f7be3f2ae3
+  rs-delay: d7eefeeab4adb9234aa20d659546d9454ee32f86
 Unapplied:
   rs-async-opt: 53932f9c5925f54b15f98fe644d872d7ac4722a7
   rs-async-nonblock: a184890ccc7ad7f83a9f2c84643286c9efb2a75b

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 37db751..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 891a16cb25ad39db51200ed1eb3262b8f982b9bd
-Top:    7d9e5cc230e2810cf4b2e08f71e5100c4d4d5941
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 15:58:18 -0700
-
-Refresh of rs-delay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 825c4de..a214b1a 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -485,7 +485,6 @@ static int set_test_opt(char *optarg)
-                       break;
-               case 'b':
-                       flags &= ~MSG_DONTWAIT;
--                      no_delay = 0;
-                       break;
-               case 'n':
-                       flags |= MSG_DONTWAIT;
-@@ -503,7 +502,6 @@ static int set_test_opt(char *optarg)
-                       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)) {

diff --git a/patches/rs-delay b/patches/rs-delay
index ef527f2f00f7bc75251167e786402496d8ee3769..00b158a42e6367f3249d5e85fc3c3b5185cae74f 100644 (file)
--- a/patches/rs-delay
+++ b/patches/rs-delay
@@ -1,5 +1,5 @@
 Bottom: 8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Top:    891a16cb25ad39db51200ed1eb3262b8f982b9bd
+Top:    7d9e5cc230e2810cf4b2e08f71e5100c4d4d5941
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-11 10:33:13 -0700
 
@@ -19,7 +19,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index a313fdb..825c4de 100644
+index a313fdb..a214b1a 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -56,7 +56,7 @@ static int test_size[] = {
@@ -47,28 +47,26 @@ index a313fdb..825c4de 100644
        iterations = 1;
        transfer_size = size;
        transfer_count = size_to_count(transfer_size);
-@@ -485,6 +483,10 @@ static int set_test_opt(char *optarg)
+@@ -485,6 +483,9 @@ 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)
+@@ -499,6 +500,8 @@ 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)
+@@ -552,6 +555,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");