From: Sean Hefty Date: Wed, 18 Jul 2012 18:39:57 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5fac6f1f702a12b5717bb478796b510250346c42;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index ff5579cc..ccc43c32 100644 --- a/meta +++ b/meta @@ -1,11 +1,12 @@ Version: 1 -Previous: 21ed95fa00ca80242438086dbcd46bdf8cc3e239 -Head: d83b75e1606c7a388cfdf09dea9dd7cc08a3bce0 +Previous: 55d6ca0bd599dfd5fec73ab9393e3684241f233a +Head: 1228264b5c2820131e6f5d2c623ac792eb0b35f3 Applied: transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6 fork: c3882ddaea14673b5b3b3322459209c02f4083bf rstream-fork: ecd866920791883b70e9ed0f963bda63336664bc dbg: d83b75e1606c7a388cfdf09dea9dd7cc08a3bce0 + refresh-temp: 1228264b5c2820131e6f5d2c623ac792eb0b35f3 Unapplied: waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..8bf80b14 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,29 @@ +Bottom: bf048d50734809a4f00efa630a5b8d1d2b1ac8c4 +Top: 9dd3afd153571ff1b3b3d2bcea15c8ab559d77dd +Author: Sean Hefty +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, ¶m, 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);