refresh (create temporary patch)

diff --git a/meta b/meta
index e0f007c6c6362d7dd0ae3ae3b7206601f555d268..89f4bd26d4336c0ded17889c4f5a8f08d63fb6d0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 3cf6e003892d09bcd0723d43322e0d704f53904f
-Head: 36241f2ee01353749ffbde97e38faa9893ca6a25
+Previous: 017d3cf300947dc8fbe0256511e2d9d484b69f5c
+Head: b3a08fb442f1734c2e58d2dee2e3034bb9370c85
 Applied:
   dbg-fork: 36241f2ee01353749ffbde97e38faa9893ca6a25
+  refresh-temp: b3a08fb442f1734c2e58d2dee2e3034bb9370c85
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..fbcbc86
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,90 @@
+Bottom: 24c419a565e8be47500329bc1ba94c160d8d19e1
+Top:    5af5ac17fbea4057817c2bc894127f91eade6ffd
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-22 15:40:43 -0700
+
+Refresh of dbg-fork
+
+---
+
+diff --git a/src/preload.c b/src/preload.c
+index d0fead2..bfa719b 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -510,30 +510,24 @@ 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);
+       real.fcntl(sfd, F_SETFL, 0);
+-      printf("fork_active - recv\n");
+       ret = real.recv(sfd, &msg, sizeof msg, MSG_PEEK);
+-      printf("fork_active - recv %d\n", ret);
+       real.fcntl(sfd, F_SETFL, flags);
+       if ((ret != sizeof msg) || msg)
+               goto err1;
+ 
+       len = sizeof addr;
+       ret = real.getpeername(sfd, (struct sockaddr *) &addr, &len);
+-      printf("fork_active - getpeername %d\n", ret);
+       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;
+@@ -565,12 +559,10 @@ static void fork_passive(int socket)
+       socklen_t len;
+       uint32_t msg;
+ 
+-      printf("fork_passive\n");
+       sfd = fd_getd(socket);
+ 
+       len = sizeof sin6;
+       ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
+-      printf("fork_passive - getsockname %d\n", ret);
+       if (ret)
+               goto out;
+       sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
+@@ -583,7 +575,6 @@ 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) {
+@@ -596,24 +587,19 @@ static void fork_passive(int socket)
+ 
+       sem_wait(sem);
+       ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);
+-      printf("fork_passive bind %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       ret = rlisten(lfd, 1);
+-      printf("fork_passive listen %d\n", ret);
+       if (ret)
+               goto lclose;
+ 
+       msg = 0;
+       len = real.write(sfd, &msg, sizeof msg);
+-      printf("fork_passive write %d\n", len);
+       if (len != sizeof msg)
+               goto lclose;
+-      printf("fork_passive - raccept\n");
+ 
+       dfd = raccept(lfd, NULL, NULL);
+-      printf("fork_passive accept %d\n", dfd);
+       if (dfd < 0) {
+               ret  = dfd;
+               goto lclose;