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

refresh
---

diff --git a/meta b/meta
index ccc43c32..cd0d2594 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 55d6ca0bd599dfd5fec73ab9393e3684241f233a
-Head: 1228264b5c2820131e6f5d2c623ac792eb0b35f3
+Previous: 2ccc1dc6d3527c8a397b069a1f9869f948ebfdf7
+Head: da928dc34f7529cc9ab73fc325d566d4152e4437
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: c3882ddaea14673b5b3b3322459209c02f4083bf
   rstream-fork: ecd866920791883b70e9ed0f963bda63336664bc
-  dbg: d83b75e1606c7a388cfdf09dea9dd7cc08a3bce0
-  refresh-temp: 1228264b5c2820131e6f5d2c623ac792eb0b35f3
+  dbg: da928dc34f7529cc9ab73fc325d566d4152e4437
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
diff --git a/patches/dbg b/patches/dbg
index 13a07db6..224d9057 100644
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 7a6199c6bbfabb859c48c87ff027b3e8d1e4d6f1
-Top:    bf048d50734809a4f00efa630a5b8d1d2b1ac8c4
+Top:    9dd3afd153571ff1b3b3d2bcea15c8ab559d77dd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -9,7 +9,7 @@ debug fork
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index a1073d5..c38935a 100644
+index a1073d5..976e2e0 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -62,11 +62,10 @@ index a1073d5..c38935a 100644
  	len = sizeof sin6;
  	ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
  	if (ret)
-@@ -847,10 +856,13 @@ pid_t fork(void)
+@@ -847,26 +856,32 @@ pid_t fork(void)
  	memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
  	sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR, S_IRWXU, 1);
-+	sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
 +	printf("fork - sem_open\n");
  	if (sem == SEM_FAILED)
  		goto out;
@@ -76,8 +75,10 @@ index a1073d5..c38935a 100644
  	if (lfd < 0)
  		goto sclose;
  
-@@ -859,14 +871,17 @@ pid_t fork(void)
+ 	param = 1;
+ 	rsetsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, &param, sizeof param);
  
++	printf("fork - waiting for semaphore\n");
  	sem_wait(sem);
  	ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
 +	printf("fork - rbind %d\n", ret);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 8bf80b14..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: bf048d50734809a4f00efa630a5b8d1d2b1ac8c4
-Top:    9dd3afd153571ff1b3b3d2bcea15c8ab559d77dd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 11:39:57 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c38935a..976e2e0 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -856,7 +856,6 @@ pid_t fork(void)
- 	memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
- 
- 	sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR, S_IRWXU, 1);
--	sem = sem_open("/rsocket_fork", O_CREAT, 0644, 1);
- 	printf("fork - sem_open\n");
- 	if (sem == SEM_FAILED)
- 		goto out;
-@@ -869,6 +868,7 @@ pid_t fork(void)
- 	param = 1;
- 	rsetsockopt(lfd, SOL_SOCKET, SO_REUSEADDR, &param, sizeof param);
- 
-+	printf("fork - waiting for semaphore\n");
- 	sem_wait(sem);
- 	ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
- 	printf("fork - rbind %d\n", ret);