refresh

diff --git a/meta b/meta
index f7485674279ba3eb0eee5f6287c0be7cf9da6c37..bfda2527ec33ca77c1b23abf8e30a0b79a9d5a69 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: e5d96825e2657893363b501e938eab56cdc68bb4
-Head: af7948ffbda18e8f46088e52b05b2750b1171de4
+Previous: b63ab1f3cddd7fc4f54550118625354a8abae84a
+Head: f653a3515ca7de04fc3e5759b961d85fc9335818
 Applied:
   real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2
   dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824
   fstat: 07e07a6ee41d57eb20b3b71b1d8098408fc1de03
-  dbg-out: c7a4fab9033f46361b1f637448d4af01e59cb6a6
-  refresh-temp: af7948ffbda18e8f46088e52b05b2750b1171de4
+  dbg-out: f653a3515ca7de04fc3e5759b961d85fc9335818
 Unapplied:
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/dbg-out b/patches/dbg-out
index 5ab030e79cdaa92ef8c654b0ca35345b0859c7cd..ae5cf3eac4c24a190409605f0a01f7ad5fbb3b4c 100644 (file)
--- a/patches/dbg-out
+++ b/patches/dbg-out
@@ -1,5 +1,5 @@
 Bottom: 8706747d8841cecefce6c394ef08bec016dd0348
-Top:    8706747d8841cecefce6c394ef08bec016dd0348
+Top:    d375a8c3b149a38d9c0e691a32801dcd2977c4e9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-07 11:08:30 -0700
 
@@ -8,4 +8,50 @@ support for debug prints
 
 ---
 
-
+diff --git a/src/preload.c b/src/preload.c
+index 53f8543..4ebcc85 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:
+@@ -968,12 +972,17 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
+ {
+       int fd, ret;
+ 
++      init_preload();
++      fprintf(fout, "fxstat64 socket %d\n", socket);
+       if (fd_get(socket, &fd) == fd_rsocket) {
+               ret = real.fxstat64(ver, socket, buf);
++              fprintf(fout, "fxstat64 - rsocket %d\n", ret);
+               if (!ret)
+                       buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
+       } else {
+               ret = real.fxstat64(ver, fd, buf);
++              fprintf(fout, "fxstat64 - normal %d\n", ret);
+       }
++      fflush(fout);
+       return ret;
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9712159..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: 8706747d8841cecefce6c394ef08bec016dd0348
-Top:    d375a8c3b149a38d9c0e691a32801dcd2977c4e9
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-07 14:06:00 -0700
-
-Refresh of dbg-out
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 53f8543..4ebcc85 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:
-@@ -968,12 +972,17 @@ int __fxstat64(int ver, int socket, struct stat64 *buf)
- {
-       int fd, ret;
- 
-+      init_preload();
-+      fprintf(fout, "fxstat64 socket %d\n", socket);
-       if (fd_get(socket, &fd) == fd_rsocket) {
-               ret = real.fxstat64(ver, socket, buf);
-+              fprintf(fout, "fxstat64 - rsocket %d\n", ret);
-               if (!ret)
-                       buf->st_mode = (buf->st_mode & ~S_IFMT) | __S_IFSOCK;
-       } else {
-               ret = real.fxstat64(ver, fd, buf);
-+              fprintf(fout, "fxstat64 - normal %d\n", ret);
-       }
-+      fflush(fout);
-       return ret;
- }