From ea6d31789cd44f6acf25d211f2610374b5f2066c Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 16 May 2012 15:54:52 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 ++---
 patches/refresh-temp | 66 --------------------------------------------
 patches/rs-nodelay   | 60 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 61 insertions(+), 72 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 981afac2..238c350b 100644
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 1e46e8fe78bdd44675f0af329aa2dc8febb2aeb1
-Head: b6228a965c2e923a8688fb979a0395f5b01447c1
+Previous: 6853c8921ade671f2814d6fa8f9e62438c948834
+Head: b0bd56d129bc21e6683e742da4eaac5b7709067c
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
-  rs-nodelay: 3bd2bb6f9e9ee8c3ebd8ec3b618276ce40bdd66c
-  refresh-temp: b6228a965c2e923a8688fb979a0395f5b01447c1
+  rs-nodelay: b0bd56d129bc21e6683e742da4eaac5b7709067c
 Unapplied:
   rs-delay: 8f0437ec677c4752126de8667e093667dd681d56
   rs-async-opt: 0ee1dfc9ad50f07fd3708ebb04cb92e0fb2f41d5
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 18cf4958..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,66 +0,0 @@
-Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    8cf2ab30dd18c0af94f11796a7f62c7abdbec612
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-16 15:54:52 -0700
-
-Refresh of rs-nodelay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 8aa089d..a313fdb 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -57,7 +57,6 @@ static int use_rs = 1;
- static int use_async;
- static int verify;
- static int flags;
--static int no_delay;
- static int custom;
- static int iterations = 1;
- static int transfer_size = 1000;
-@@ -151,7 +150,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;
-@@ -162,7 +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;
-@@ -328,10 +325,8 @@ static void set_options(int rs)
- 			break;
- 	}
- 
--	if (no_delay) {
--		rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
--			      (void *) &no_delay, sizeof(no_delay));
--	}
-+	val = 1;
-+	rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
- 
- 	if (flags & MSG_DONTWAIT) {
- 		rs_fcntl(rs, F_SETFL, O_NONBLOCK);
-@@ -492,7 +487,6 @@ static int set_test_opt(char *optarg)
- 			break;
- 		case 'n':
- 			flags |= MSG_DONTWAIT;
--			no_delay = 1;
- 			break;
- 		case 'v':
- 			verify = 1;
-@@ -507,7 +501,6 @@ static int set_test_opt(char *optarg)
- 			use_async = 1;
- 		} else if (!strncasecmp("nonblock", optarg, 8)) {
- 			flags |= MSG_DONTWAIT;
--			no_delay = 1;
- 		} else if (!strncasecmp("verify", optarg, 6)) {
- 			verify = 1;
- 		} else {
diff --git a/patches/rs-nodelay b/patches/rs-nodelay
index 3d96890b..84090eb6 100644
--- a/patches/rs-nodelay
+++ b/patches/rs-nodelay
@@ -1,5 +1,5 @@
 Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top:    ea75b8334003947a7f09ba5f0efcec267b5143c1
+Top:    8cf2ab30dd18c0af94f11796a7f62c7abdbec612
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-16 15:16:40 -0700
 
@@ -16,4 +16,60 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 8aa089d..a313fdb 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -57,7 +57,6 @@ static int use_rs = 1;
+ static int use_async;
+ static int verify;
+ static int flags;
+-static int no_delay;
+ static int custom;
+ static int iterations = 1;
+ static int transfer_size = 1000;
+@@ -151,7 +150,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;
+@@ -162,7 +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;
+@@ -328,10 +325,8 @@ static void set_options(int rs)
+ 			break;
+ 	}
+ 
+-	if (no_delay) {
+-		rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY,
+-			      (void *) &no_delay, sizeof(no_delay));
+-	}
++	val = 1;
++	rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
+ 
+ 	if (flags & MSG_DONTWAIT) {
+ 		rs_fcntl(rs, F_SETFL, O_NONBLOCK);
+@@ -492,7 +487,6 @@ static int set_test_opt(char *optarg)
+ 			break;
+ 		case 'n':
+ 			flags |= MSG_DONTWAIT;
+-			no_delay = 1;
+ 			break;
+ 		case 'v':
+ 			verify = 1;
+@@ -507,7 +501,6 @@ static int set_test_opt(char *optarg)
+ 			use_async = 1;
+ 		} else if (!strncasecmp("nonblock", optarg, 8)) {
+ 			flags |= MSG_DONTWAIT;
+-			no_delay = 1;
+ 		} else if (!strncasecmp("verify", optarg, 6)) {
+ 			verify = 1;
+ 		} else {
-- 
2.41.0