refresh

diff --git a/meta b/meta
index 52f796658342a405d3cf646ba22a3212f5763504..b8c6a33fd0b725f4a72194b2d6f12fe108f0aed5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a9385f7815f769b7067c977902acc62f3793377e
-Head: de41f9273be7dfa173e802fee50020f0560f4d9b
+Previous: 71bdb63f05b299b03292d540e9145de289d66ae7
+Head: 1b132fad3d5b0f0c0a4dba2176e9c0792b42e633
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  dbg: 950688ac74f7073848eb98469eb60ff4b53c3d82
-  refresh-temp: de41f9273be7dfa173e802fee50020f0560f4d9b
+  dbg: 1b132fad3d5b0f0c0a4dba2176e9c0792b42e633
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index fb06838e2a92beba57e92d569403791761005595..5c71511b416914f5021545916c794005501e1912 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    8754908f54691ebf8eb338a5cf23c230a90d34d4
+Top:    6a80dbc9a9422453e6bcd2724cd614a7768cb5e7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -49,7 +49,7 @@ index 5280620..54b804e 100755
        if (cma_dev_cnt) {
                pthread_mutex_unlock(&mut);
 diff --git a/src/preload.c b/src/preload.c
-index 52eaf1a..6f8e4f8 100644
+index 52eaf1a..bc95da8 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -113,7 +113,7 @@ index 52eaf1a..6f8e4f8 100644
                ret = (type == fd_rsocket) ? raccept(fd, addr, addrlen) :
                                             real.accept(fd, addr, addrlen);
 +              printf("accept %d, new index %d new socket %d err %s\n",
-+                      socket, index, ret, strerr(errno));
++                      socket, index, ret, strerror(errno));
                if (ret < 0) {
                        fd_close(index, &fd);
                        return ret;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fb1d6f5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8754908f54691ebf8eb338a5cf23c230a90d34d4
-Top:    6a80dbc9a9422453e6bcd2724cd614a7768cb5e7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-25 12:02:40 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 6f8e4f8..bc95da8 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -438,7 +438,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-               ret = (type == fd_rsocket) ? raccept(fd, addr, addrlen) :
-                                            real.accept(fd, addr, addrlen);
-               printf("accept %d, new index %d new socket %d err %s\n",
--                      socket, index, ret, strerr(errno));
-+                      socket, index, ret, strerror(errno));
-               if (ret < 0) {
-                       fd_close(index, &fd);
-                       return ret;