refresh

diff --git a/meta b/meta
index d302df2e79f188af83247c027369064370300401..51159ec43faaaa222cd22bc7765e4f74b2ef350b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 66db51a19317313e78619bc0410e7ee017ca0fca
-Head: dc869d35b401e6bb2ca266ed3a7c8ac6d3a44842
+Previous: 25ab7fba87b3c814c3d50bf3bc0c06ca42ab7cf5
+Head: 0771c59dbf02c9c6170f8fb47c7d656e5e850006
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: 1df5d0ba001a0777074e6ab8ca215762b9431b53
   fstat: 05f560a29b84296921b236dcd1fb65b73b6e6280
-  dbg-out: acb08a1908f9846e7414f74885070305b7caa17e
-  refresh-temp: dc869d35b401e6bb2ca266ed3a7c8ac6d3a44842
+  dbg-out: 0771c59dbf02c9c6170f8fb47c7d656e5e850006
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 7ec472d9024d538c917457021181ecca7f984956..3a370d60e40958f11ff678f9048fd60eb0a6d546 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: a70e486d7fb3d18adace33aea325353d847f6b41
-Top:    a70e486d7fb3d18adace33aea325353d847f6b41
+Top:    eac016fea8796703d0b5f91538d93aaa3dbcd3ac
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 11:08:30 -0700
 
@@ -8,4 +8,40 @@ support for debug prints
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index b9c32e6..37b23c5 100644
+--- a/src/preload.c
++++ b/src/preload.c
+@@ -48,6 +48,7 @@
+ #include <netinet/tcp.h>
+ #include <unistd.h>
+ #include <semaphore.h>
++#include <stdio.h>
+ 
+ #include <rdma/rdma_cma.h>
+ #include <rdma/rdma_verbs.h>
+@@ -98,6 +99,8 @@ static int rq_size;
+ static int sq_inline;
+ static int fork_support;
+ 
++static FILE fout;
++
+ enum fd_type {
+       fd_normal,
+       fd_rsocket,
+@@ -286,6 +289,7 @@ static void init_preload(void)
+       rs.getsockopt = dlsym(RTLD_DEFAULT, "rgetsockopt");
+       rs.fcntl = dlsym(RTLD_DEFAULT, "rfcntl");
+ 
++      fout = fopen("rs-out.txt", "w+");
+       getenv_options();
+       init = 1;
+ out:
+@@ -967,6 +971,7 @@ int fstat(int socket, struct stat *buf)
+ {
+       int fd, ret;
+ 
++      fprintf(fout, "fstat");
+       if (fd_get(socket, &fd) == fd_rsocket) {
+               ret = real.fstat(socket, buf);
+               if (!ret)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 23dba76..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,46 +0,0 @@
-Bottom: a70e486d7fb3d18adace33aea325353d847f6b41
-Top:    eac016fea8796703d0b5f91538d93aaa3dbcd3ac
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 11:10:29 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index b9c32e6..37b23c5 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -48,6 +48,7 @@
- #include <netinet/tcp.h>
- #include <unistd.h>
- #include <semaphore.h>
-+#include <stdio.h>
- 
- #include <rdma/rdma_cma.h>
- #include <rdma/rdma_verbs.h>
-@@ -98,6 +99,8 @@ static int rq_size;
- static int sq_inline;
- static int fork_support;
- 
-+static FILE fout;
-+
- enum fd_type {
-       fd_normal,
-       fd_rsocket,
-@@ -286,6 +289,7 @@ static void init_preload(void)
-       rs.getsockopt = dlsym(RTLD_DEFAULT, "rgetsockopt");
-       rs.fcntl = dlsym(RTLD_DEFAULT, "rfcntl");
- 
-+      fout = fopen("rs-out.txt", "w+");
-       getenv_options();
-       init = 1;
- out:
-@@ -967,6 +971,7 @@ int fstat(int socket, struct stat *buf)
- {
-       int fd, ret;
- 
-+      fprintf(fout, "fstat");
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fstat(socket, buf);
-               if (!ret)