refresh

diff --git a/meta b/meta
index fd7c36f1737ccf354389bb73dc446fa35ebef00a..499a7e4575567f90174366b42ff6a890c489cc30 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 37117ddee788bbc287fc1253122b1278e3532b05
-Head: 40237d1d23665e1ed21ab1cac7fffbb8b7bfa34a
+Previous: 80f928bd4c1aa5a42265fc28e5d0a0299e9c4187
+Head: 39a0eb24e8fda68380d463afc169ec5ab7a6c097
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 3954e0217e42a05d30c8ad773cdc0d80529ab553
   rstream-fork: b948492c5ebb014507f66b5445ecd38ee52aaac9
-  dbg: 9b9f2bc3749341845f327c1f3f0504cc555bfdf4
-  refresh-temp: 40237d1d23665e1ed21ab1cac7fffbb8b7bfa34a
+  dbg: 39a0eb24e8fda68380d463afc169ec5ab7a6c097
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 4651c6a206fa57100ccf9fae34b090532034d2b8..73b6c371a4ba673251d09a19d0128fea175dcaef 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: d6e06fd7ea63f4932d2e0c8583d782d079a4712b
-Top:    0b1093b8b1d8801f65a89bc66e61c3772285861a
+Top:    be7ceaa2c6c1c13647d43a493a75f32e316e92ba
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -9,7 +9,7 @@ debug fork
 ---
 
 diff --git a/src/preload.c b/src/preload.c
-index 2c07cc2..09c23d9 100644
+index 2c07cc2..9ec75c3 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -62,8 +62,11 @@ index 2c07cc2..09c23d9 100644
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
        if (ret)
-@@ -848,26 +857,33 @@ pid_t fork(void)
+@@ -846,28 +855,36 @@ pid_t fork(void)
+       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);
 +      printf("fork - sem_open\n");
@@ -96,7 +99,7 @@ index 2c07cc2..09c23d9 100644
        if (dfd < 0)
                goto lclose;
  
-@@ -877,6 +893,7 @@ pid_t fork(void)
+@@ -877,6 +894,7 @@ pid_t fork(void)
  
        msg = 0;
        ret = real.write(sfd, &msg, sizeof msg);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f524ca2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 0b1093b8b1d8801f65a89bc66e61c3772285861a
-Top:    be7ceaa2c6c1c13647d43a493a75f32e316e92ba
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 12:00:21 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 09c23d9..9ec75c3 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -855,6 +855,7 @@ pid_t fork(void)
-       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);
-       printf("fork - sem_open\n");