Version: 1
-Previous: 6fb1cbe068f1c268ca48af101dcc7d62d56d757f
-Head: 6c0411cd98702699f66edf9d83eb0c8f127887f3
+Previous: 07e10b4a5cb0073a9944f1eb0730b87310c01db0
+Head: 9079801a64f2313e2d48a27b87b285d7a267a56a
Applied:
- dbg-fork: f7f2fc66d5cda4b70df376995a22b3ed4c4ac0de
- refresh-temp: 6c0411cd98702699f66edf9d83eb0c8f127887f3
+ dbg-fork: 9079801a64f2313e2d48a27b87b285d7a267a56a
Unapplied:
af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top: d21d7a185654b30280c213c38688f30ca0fabe87
+Top: 296e6cd8f1f1213e16e0d247ff92a700dc79ef41
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-08-21 13:49:59 -0700
---
diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..8889410 100644
+index 0645f6d..b5a67cb 100644
--- a/src/preload.c
+++ b/src/preload.c
-@@ -239,7 +239,7 @@ void getenv_options(void)
+@@ -34,6 +34,7 @@
+ #if HAVE_CONFIG_H
+ # include <config.h>
+ #endif /* HAVE_CONFIG_H */
++#include <stdio.h>
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -239,7 +240,7 @@ void getenv_options(void)
if (var)
sq_inline = atoi(var);
if (var)
fork_support = atoi(var);
}
-@@ -413,11 +413,13 @@ int socket(int domain, int type, int protocol)
+@@ -413,11 +414,14 @@ int socket(int domain, int type, int protocol)
return index;
recursive = 1;
++printf("skipping rsocket call\n");
+goto realsock;
ret = rsocket(domain, type, protocol);
recursive = 0;
ret = real.socket(domain, type, protocol);
if (ret < 0)
return ret;
+@@ -502,6 +506,7 @@ static void fork_active(int socket)
+ uint32_t msg;
+ long flags;
+
++ printf("fork_active\n");
+ sfd = fd_getd(socket);
+
+ flags = real.fcntl(sfd, F_GETFL);
+@@ -516,10 +521,12 @@ static void fork_active(int socket)
+ if (ret)
+ goto err1;
+
++ printf("fork_active - create rsocket\n");
+ dfd = rsocket(addr.ss_family, SOCK_STREAM, 0);
+ if (dfd < 0)
+ goto err1;
+
++ printf("fork_active - rconnect\n");
+ ret = rconnect(dfd, (struct sockaddr *) &addr, len);
+ if (ret)
+ goto err2;
+@@ -551,6 +558,7 @@ static void fork_passive(int socket)
+ socklen_t len;
+ uint32_t msg;
+
++ printf("fork_passive\n");
+ sfd = fd_getd(socket);
+
+ len = sizeof sin6;
+@@ -566,6 +574,7 @@ static void fork_passive(int socket)
+ ret = -1;
+ goto out;
+ }
++ printf("fork_passive - create rsocket\n");
+
+ lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
+ if (lfd < 0) {
+@@ -589,6 +598,7 @@ static void fork_passive(int socket)
+ len = real.write(sfd, &msg, sizeof msg);
+ if (len != sizeof msg)
+ goto lclose;
++ printf("fork_passive - raccept\n");
+
+ dfd = raccept(lfd, NULL, NULL);
+ if (dfd < 0) {
diff --git a/src/rsocket.c b/src/rsocket.c
index 4c4821b..52476a2 100644
--- a/src/rsocket.c
+++ /dev/null
-Bottom: d21d7a185654b30280c213c38688f30ca0fabe87
-Top: 296e6cd8f1f1213e16e0d247ff92a700dc79ef41
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-08-22 15:03:29 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 8889410..b5a67cb 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -34,6 +34,7 @@
- #if HAVE_CONFIG_H
- # include <config.h>
- #endif /* HAVE_CONFIG_H */
-+#include <stdio.h>
-
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -413,6 +414,7 @@ int socket(int domain, int type, int protocol)
- return index;
-
- recursive = 1;
-+printf("skipping rsocket call\n");
- goto realsock;
- ret = rsocket(domain, type, protocol);
- recursive = 0;
-@@ -504,6 +506,7 @@ static void fork_active(int socket)
- uint32_t msg;
- long flags;
-
-+ printf("fork_active\n");
- sfd = fd_getd(socket);
-
- flags = real.fcntl(sfd, F_GETFL);
-@@ -518,10 +521,12 @@ static void fork_active(int socket)
- if (ret)
- goto err1;
-
-+ printf("fork_active - create rsocket\n");
- dfd = rsocket(addr.ss_family, SOCK_STREAM, 0);
- if (dfd < 0)
- goto err1;
-
-+ printf("fork_active - rconnect\n");
- ret = rconnect(dfd, (struct sockaddr *) &addr, len);
- if (ret)
- goto err2;
-@@ -553,6 +558,7 @@ static void fork_passive(int socket)
- socklen_t len;
- uint32_t msg;
-
-+ printf("fork_passive\n");
- sfd = fd_getd(socket);
-
- len = sizeof sin6;
-@@ -568,6 +574,7 @@ static void fork_passive(int socket)
- ret = -1;
- goto out;
- }
-+ printf("fork_passive - create rsocket\n");
-
- lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
- if (lfd < 0) {
-@@ -591,6 +598,7 @@ static void fork_passive(int socket)
- len = real.write(sfd, &msg, sizeof msg);
- if (len != sizeof msg)
- goto lclose;
-+ printf("fork_passive - raccept\n");
-
- dfd = raccept(lfd, NULL, NULL);
- if (dfd < 0) {