refresh

diff --git a/meta b/meta
index 73bf12e5d85758e78a29290c8f92688c9f73e8ea..4382d8cdbf4159c7d99bf26fe82d58cb228beeeb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 2be5f1a59622f1ca78c01bde93d021e0f102cb4f
-Head: 212450909cc73b309c45f64e4439cb769b427b74
+Previous: 6ff04e3888760c979e4bfac5f0fa92d20d452915
+Head: 93074ae941ec0afc77c41b9840058dd4a128b262
 Applied:
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6
   fork: 186a9caab5e2bbfd189e5fb2679ce35e63cd40ce
   rstream-fork: 7410b462c4f733276a83dedda753dcd34677fb23
-  dbg: 68aec9c7b217177e25e839113078362f261d4178
-  refresh-temp: 212450909cc73b309c45f64e4439cb769b427b74
+  dbg: 93074ae941ec0afc77c41b9840058dd4a128b262
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index 8931be0e6bb97650793c38c83866f450d30eb8d4..bd378823bc4aa48ae3499a60cb7c7daa1c9ba5e6 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: db6f379646ca0fae747ef5cd04b50c3952350431
-Top:    03db0fc9f2cb988f6b56ccc07b7f9522e9f73c2f
+Top:    f01035aaf2318888602d8db4ba44878cf14d21ca
 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 7be40f6..c83da39 100644
+index 7be40f6..576d7dd 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -27,7 +27,7 @@ index 7be40f6..c83da39 100644
 +      printf("connect_fork\n");
        fd = fd_getd(socket);
        ret = real.connect(fd, addr, addrlen);
-+      printf("connect_fork - real connect %d\n", ret);
++      printf("connect_fork - real connect %d %s\n", ret, strerror(errno));
        if (ret)
                return ret;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 92539d7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 03db0fc9f2cb988f6b56ccc07b7f9522e9f73c2f
-Top:    f01035aaf2318888602d8db4ba44878cf14d21ca
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-18 10:34:02 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index c83da39..576d7dd 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -470,7 +470,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-       printf("connect_fork\n");
-       fd = fd_getd(socket);
-       ret = real.connect(fd, addr, addrlen);
--      printf("connect_fork - real connect %d\n", ret);
-+      printf("connect_fork - real connect %d %s\n", ret, strerror(errno));
-       if (ret)
-               return ret;