refresh

diff --git a/meta b/meta
index 2b19b01b6dfb0e6ddefa433cfe2201d511c835ef..1709cd785dd52155404619635075db6a2ae05898 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c8a20e3ae15bc9f6068f3b448012caa008d6d013
-Head: 79f3a57fb791dfe250828a969cfe5cc86a24a49a
+Previous: 3efad021feb4a5f4ca73c434f30b2601e0f70d56
+Head: 12cc7c21255592d07188cd12ff7c79b485d763e2
 Applied:
-  dbg-fork: 73a673f1bcdab2cee96fde1274b1ac742924b1a7
-  refresh-temp: 79f3a57fb791dfe250828a969cfe5cc86a24a49a
+  dbg-fork: 12cc7c21255592d07188cd12ff7c79b485d763e2
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/dbg-fork b/patches/dbg-fork
index e7466c89a2a44620088f7ddbff57551a07da7fbd..1eac78d0b7e7efd7b047efab33e940131b61455a 100644 (file)
--- a/patches/dbg-fork
+++ b/patches/dbg-fork
@@ -1,5 +1,5 @@
 Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    36fe9752394406c04c3d8f13fe21a0a3fdade499
+Top:    a84f3a159dd9126f12ef6854a797b9e0dcdbf321
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-21 13:49:59 -0700
 
@@ -8,6 +8,25 @@ debug fork issue
 
 ---
 
+diff --git a/src/preload.c b/src/preload.c
+index 0645f6d..cdca9df 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -413,11 +413,13 @@ int socket(int domain, int type, int protocol)
+               return index;
+ 
+       recursive = 1;
+-      ret = rsocket(domain, type, protocol);
++//    ret = rsocket(domain, type, protocol);
++goto realsock;
+       recursive = 0;
+       if (ret >= 0) {
+               if (fork_support) {
+                       rclose(ret);
++realsock:
+                       ret = real.socket(domain, type, protocol);
+                       if (ret < 0)
+                               return ret;
 diff --git a/src/rsocket.c b/src/rsocket.c
 index 4c4821b..52476a2 100644
 --- a/src/rsocket.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b2404cb..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,28 +0,0 @@
-Bottom: 36fe9752394406c04c3d8f13fe21a0a3fdade499
-Top:    a84f3a159dd9126f12ef6854a797b9e0dcdbf321
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-22 14:18:02 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..cdca9df 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -413,11 +413,13 @@ int socket(int domain, int type, int protocol)
-               return index;
- 
-       recursive = 1;
--      ret = rsocket(domain, type, protocol);
-+//    ret = rsocket(domain, type, protocol);
-+goto realsock;
-       recursive = 0;
-       if (ret >= 0) {
-               if (fork_support) {
-                       rclose(ret);
-+realsock:
-                       ret = real.socket(domain, type, protocol);
-                       if (ret < 0)
-                               return ret;