Version: 1
-Previous: f2e79c566d9e7764f67045da97a39503b5de9947
-Head: 41e05875fe0bbad066acf48c734a8dd77bf4029e
+Previous: 02a43ac728f0a87f1ae3db9125896027991158bb
+Head: 2f3d92fdd0c79f4825060433fd489995c1c83b80
Applied:
rs-locking: ec6a8efe211b0dc98548443c2e0d67e2c355351f
reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
- rstream-delay: 7982ed2a2c0448aecb61c15a44f7c7db5228dba7
- refresh-temp: 41e05875fe0bbad066acf48c734a8dd77bf4029e
+ rstream-delay: 2f3d92fdd0c79f4825060433fd489995c1c83b80
Unapplied:
comp_locks: b89aab130b4619806557e11e6b9c10964f00743f
preload: 5dfe7abc07064485c5100e04e5412279244c2bc3
+++ /dev/null
-Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top: 4824ade2aa44138cac7516403f6a7045fea3dbee
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-05-11 10:38:13 -0700
-
-Refresh of rstream-delay
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 8aa089d..a52a262 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -57,7 +57,7 @@ static int use_rs = 1;
- static int use_async;
- static int verify;
- static int flags;
--static int no_delay;
-+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);
Bottom: ea75b8334003947a7f09ba5f0efcec267b5143c1
-Top: ea75b8334003947a7f09ba5f0efcec267b5143c1
+Top: 4824ade2aa44138cac7516403f6a7045fea3dbee
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-05-11 10:33:13 -0700
---
-
+diff --git a/examples/rstream.c b/examples/rstream.c
+index 8aa089d..a52a262 100644
+--- a/examples/rstream.c
++++ b/examples/rstream.c
+@@ -57,7 +57,7 @@ static int use_rs = 1;
+ static int use_async;
+ static int verify;
+ static int flags;
+-static int no_delay;
++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);