From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 22 Aug 2012 22:36:51 +0000 (-0700)
Subject: refresh
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d356411a16ce6e4c777025702fc6198597b383d2;p=~shefty%2Flibrdmacm.git

refresh
---

diff --git a/meta b/meta
index e2823d44..a58a7e6a 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 4085595fc5d9e7ab61196fa601c3ded11a997062
-Head: 8b6189584b1b40f5a40d1c104590bc63eb18e0a3
+Previous: ba923b17c729d7e274a460ca98768c433204696b
+Head: 3967a69df87df87492e83642404699c8487a5295
 Applied:
-  dbg-fork: 768a0ea91022afb5a3189760936ddb5a39deecd9
-  refresh-temp: 8b6189584b1b40f5a40d1c104590bc63eb18e0a3
+  dbg-fork: 3967a69df87df87492e83642404699c8487a5295
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
diff --git a/patches/dbg-fork b/patches/dbg-fork
index d592fb6f..33177fc7 100644
--- a/patches/dbg-fork
+++ b/patches/dbg-fork
@@ -1,5 +1,5 @@
 Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    3ff660268308f81ffa10068086e46e1eb0d84b77
+Top:    897cee0b17f17050fe3667cbaf7c6d9d3f66ab9d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-21 13:49:59 -0700
 
@@ -9,7 +9,7 @@ debug fork issue
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..fba0281 100644
+index 0645f6d..d1d8b06 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -34,6 +34,7 @@
@@ -29,12 +29,17 @@ index 0645f6d..fba0281 100644
  	if (var)
  		fork_support = atoi(var);
  }
-@@ -413,11 +414,14 @@ int socket(int domain, int type, int protocol)
+@@ -412,12 +413,19 @@ int socket(int domain, int type, int protocol)
+ 	if (index < 0)
  		return index;
  
++	if ((domain == PF_INET || domain == PF_INET6) &&
++	    (type == SOCK_STREAM) && (!protocol || protocol == IPPROTO_TCP) && fork_support) {
++		printf("skipping rsocket call\n");
++		goto realsock;
++	}
++
  	recursive = 1;
-+printf("skipping rsocket call\n");
-+goto realsock;
  	ret = rsocket(domain, type, protocol);
  	recursive = 0;
  	if (ret >= 0) {
@@ -44,7 +49,7 @@ index 0645f6d..fba0281 100644
  			ret = real.socket(domain, type, protocol);
  			if (ret < 0)
  				return ret;
-@@ -502,24 +506,30 @@ static void fork_active(int socket)
+@@ -502,24 +510,30 @@ static void fork_active(int socket)
  	uint32_t msg;
  	long flags;
  
@@ -75,7 +80,7 @@ index 0645f6d..fba0281 100644
  	ret = rconnect(dfd, (struct sockaddr *) &addr, len);
  	if (ret)
  		goto err2;
-@@ -551,6 +561,7 @@ static void fork_passive(int socket)
+@@ -551,6 +565,7 @@ static void fork_passive(int socket)
  	socklen_t len;
  	uint32_t msg;
  
@@ -83,7 +88,7 @@ index 0645f6d..fba0281 100644
  	sfd = fd_getd(socket);
  
  	len = sizeof sin6;
-@@ -566,6 +577,7 @@ static void fork_passive(int socket)
+@@ -566,6 +581,7 @@ static void fork_passive(int socket)
  		ret = -1;
  		goto out;
  	}
@@ -91,7 +96,7 @@ index 0645f6d..fba0281 100644
  
  	lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
  	if (lfd < 0) {
-@@ -578,19 +590,24 @@ static void fork_passive(int socket)
+@@ -578,19 +594,24 @@ static void fork_passive(int socket)
  
  	sem_wait(sem);
  	ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 69640f45..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 3ff660268308f81ffa10068086e46e1eb0d84b77
-Top:    897cee0b17f17050fe3667cbaf7c6d9d3f66ab9d
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-22 15:36:51 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index fba0281..d1d8b06 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -413,9 +413,13 @@ int socket(int domain, int type, int protocol)
- 	if (index < 0)
- 		return index;
- 
-+	if ((domain == PF_INET || domain == PF_INET6) &&
-+	    (type == SOCK_STREAM) && (!protocol || protocol == IPPROTO_TCP) && fork_support) {
-+		printf("skipping rsocket call\n");
-+		goto realsock;
-+	}
-+
- 	recursive = 1;
--printf("skipping rsocket call\n");
--goto realsock;
- 	ret = rsocket(domain, type, protocol);
- 	recursive = 0;
- 	if (ret >= 0) {