From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 18 Jul 2012 00:26:24 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7a2c876dc76a4a09945e2a52deed227d73261c19;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index 1e7bee69..acf2ff87 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 68d86d20f1081a0fdbd509ce754266d47ceebd31
-Head: 458b5b28ee499150480de42cc848ce119c208967
+Previous: 612c7e608bc5184622b1b44f5c8b9328db9202ba
+Head: 9f5d60f8ea3e5eee69fc66b0c167b693242a0f4b
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: c86c2d8e7d556ae2d94b3181939473a50337e550
-  rstream-fork: f5a174fea7912e389c7fec5db64e4e39a78573a2
-  refresh-temp: 458b5b28ee499150480de42cc848ce119c208967
+  rstream-fork: 9f5d60f8ea3e5eee69fc66b0c167b693242a0f4b
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index b6781356..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,45 +0,0 @@
-Bottom: 2204d8d10b55cf98a31f8770863429936247a266
-Top:    a625ed79a630be511a10aa72ac56ee50cd156f44
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-17 17:26:24 -0700
-
-Refresh of rstream-fork
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 70bd252..8595657 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -467,7 +467,6 @@ static int server_connect(void)
- 
- 	if (use_fork)
- 		fork_pid = fork();
--
- 	if (!fork_pid)
- 		set_options(rs);
- 	return ret;
-@@ -558,10 +557,11 @@ static int run(void)
- 			init_latency_test(test_size[i].size);
- 			run_test();
- 		}
--		rs_shutdown(rs, SHUT_RDWR);
-+		if (!fork_pid)
-+			rs_shutdown(rs, SHUT_RDWR);
- 		rs_close(rs);
- 
--		if (use_fork && !fork_pid)
-+		if (!dst_addr && use_fork && !fork_pid)
- 			goto free;
- 
- 		optimization = opt_bandwidth;
-@@ -583,7 +583,8 @@ static int run(void)
- 			ret = run_test();
- 	}
- 
--	rs_shutdown(rs, SHUT_RDWR);
-+	if (!fork_pid)
-+		rs_shutdown(rs, SHUT_RDWR);
- 	rs_close(rs);
- free:
- 	free(buf);
diff --git a/patches/rstream-fork b/patches/rstream-fork
index 2b5481b9..bff45ae9 100644
--- a/patches/rstream-fork
+++ b/patches/rstream-fork
@@ -1,5 +1,5 @@
 Bottom: 079d7bbe6129342c62546a42ccf45af677b9160f
-Top:    2204d8d10b55cf98a31f8770863429936247a266
+Top:    a625ed79a630be511a10aa72ac56ee50cd156f44
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-17 15:32:54 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 48e2771..70bd252 100644
+index 48e2771..8595657 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -84,6 +84,8 @@ static int verify;
@@ -23,20 +23,19 @@ index 48e2771..70bd252 100644
  static enum rs_optimization optimization;
  static int size_option;
  static int iterations = 1;
-@@ -463,7 +465,11 @@ static int server_connect(void)
+@@ -463,7 +465,10 @@ static int server_connect(void)
  		perror("raccept");
  	}
  
 -	set_options(rs);
 +	if (use_fork)
 +		fork_pid = fork();
-+
 +	if (!fork_pid)
 +		set_options(rs);
  	return ret;
  }
  
-@@ -546,7 +552,7 @@ static int run(void)
+@@ -546,20 +551,24 @@ static int run(void)
  		if (ret)
  			goto free;
  
@@ -45,11 +44,14 @@ index 48e2771..70bd252 100644
  			if (test_size[i].option > size_option)
  				continue;
  			init_latency_test(test_size[i].size);
-@@ -555,11 +561,14 @@ static int run(void)
- 		rs_shutdown(rs, SHUT_RDWR);
+ 			run_test();
+ 		}
+-		rs_shutdown(rs, SHUT_RDWR);
++		if (!fork_pid)
++			rs_shutdown(rs, SHUT_RDWR);
  		rs_close(rs);
  
-+		if (use_fork && !fork_pid)
++		if (!dst_addr && use_fork && !fork_pid)
 +			goto free;
 +
  		optimization = opt_bandwidth;
@@ -61,7 +63,7 @@ index 48e2771..70bd252 100644
  			if (test_size[i].option > size_option)
  				continue;
  			init_bandwidth_test(test_size[i].size);
-@@ -570,7 +579,8 @@ static int run(void)
+@@ -570,10 +579,12 @@ static int run(void)
  		if (ret)
  			goto free;
  
@@ -70,8 +72,13 @@ index 48e2771..70bd252 100644
 +			ret = run_test();
  	}
  
- 	rs_shutdown(rs, SHUT_RDWR);
-@@ -593,6 +603,10 @@ static int set_test_opt(char *optarg)
+-	rs_shutdown(rs, SHUT_RDWR);
++	if (!fork_pid)
++		rs_shutdown(rs, SHUT_RDWR);
+ 	rs_close(rs);
+ free:
+ 	free(buf);
+@@ -593,6 +604,10 @@ static int set_test_opt(char *optarg)
  		case 'b':
  			flags &= ~MSG_DONTWAIT;
  			break;
@@ -82,7 +89,7 @@ index 48e2771..70bd252 100644
  		case 'n':
  			flags |= MSG_DONTWAIT;
  			break;
-@@ -613,6 +627,9 @@ static int set_test_opt(char *optarg)
+@@ -613,6 +628,9 @@ static int set_test_opt(char *optarg)
  			flags |= MSG_DONTWAIT;
  		} else if (!strncasecmp("verify", optarg, 6)) {
  			verify = 1;
@@ -92,7 +99,7 @@ index 48e2771..70bd252 100644
  		} else {
  			return -1;
  		}
-@@ -671,6 +688,7 @@ int main(int argc, char **argv)
+@@ -671,6 +689,7 @@ int main(int argc, char **argv)
  			printf("\t    s|sockets - use standard tcp/ip sockets\n");
  			printf("\t    a|async - asynchronous operation (use poll)\n");
  			printf("\t    b|blocking - use blocking calls\n");