refresh

diff --git a/meta b/meta
index ca8dd7b1a34a41de0e004299821cb07ef85d808b..e0f007c6c6362d7dd0ae3ae3b7206601f555d268 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 472694245cfea39d893327127520d1dc8949bf35
-Head: 1679192b10c3e53a919cd3f865f3836b05777291
+Previous: 3cf6e003892d09bcd0723d43322e0d704f53904f
+Head: 36241f2ee01353749ffbde97e38faa9893ca6a25
 Applied:
-  dbg-fork: 3967a69df87df87492e83642404699c8487a5295
-  refresh-temp: 1679192b10c3e53a919cd3f865f3836b05777291
+  dbg-fork: 36241f2ee01353749ffbde97e38faa9893ca6a25
 Unapplied:
   af_ib: 2e4bfa467343c57c68616c1922c01765df3ed1db
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/dbg-fork b/patches/dbg-fork
index 33177fc700a901795b5cc484c77efff1e793b379..86790b1a60728df7b402313549cc312bc3131015 100644 (file)
--- a/patches/dbg-fork
+++ b/patches/dbg-fork
@@ -1,5 +1,5 @@
 Bottom: 30191aa638f3f574e67a71c82fa7771bcc620c52
-Top:    897cee0b17f17050fe3667cbaf7c6d9d3f66ab9d
+Top:    24c419a565e8be47500329bc1ba94c160d8d19e1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-21 13:49:59 -0700
 
@@ -9,7 +9,7 @@ debug fork issue
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 0645f6d..d1d8b06 100644
+index 0645f6d..d0fead2 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -34,6 +34,7 @@
@@ -80,7 +80,7 @@ index 0645f6d..d1d8b06 100644
        ret = rconnect(dfd, (struct sockaddr *) &addr, len);
        if (ret)
                goto err2;
-@@ -551,6 +565,7 @@ static void fork_passive(int socket)
+@@ -551,21 +565,25 @@ static void fork_passive(int socket)
        socklen_t len;
        uint32_t msg;
  
@@ -88,7 +88,17 @@ index 0645f6d..d1d8b06 100644
        sfd = fd_getd(socket);
  
        len = sizeof sin6;
-@@ -566,6 +581,7 @@ static void fork_passive(int socket)
+       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;
+       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
+ 
++      sem_unlink("/rsocket_fork");
+       sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR,
+                      S_IRWXU | S_IRWXG, 1);
+       if (sem == SEM_FAILED) {
                ret = -1;
                goto out;
        }
@@ -96,7 +106,7 @@ index 0645f6d..d1d8b06 100644
  
        lfd = rsocket(sin6.sin6_family, SOCK_STREAM, 0);
        if (lfd < 0) {
-@@ -578,19 +594,24 @@ static void fork_passive(int socket)
+@@ -578,19 +596,24 @@ static void fork_passive(int socket)
  
        sem_wait(sem);
        ret = rbind(lfd, (struct sockaddr *) &sin6, sizeof sin6);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 86f9390..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,27 +0,0 @@
-Bottom: 897cee0b17f17050fe3667cbaf7c6d9d3f66ab9d
-Top:    24c419a565e8be47500329bc1ba94c160d8d19e1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-22 15:38:45 -0700
-
-Refresh of dbg-fork
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index d1d8b06..d0fead2 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -570,11 +570,13 @@ static void fork_passive(int 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;
-       memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
- 
-+      sem_unlink("/rsocket_fork");
-       sem = sem_open("/rsocket_fork", O_CREAT | O_RDWR,
-                      S_IRWXU | S_IRWXG, 1);
-       if (sem == SEM_FAILED) {