refresh

diff --git a/meta b/meta
index d1a38e57bdaa9ffa22116be7aec428e45141a03d..84f0f972364d7cee13130792717ea37a027272c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 62581a7ae4c9ef478bbf3c211c070a6e2c3b5325
-Head: 5eb2078811a75b43a0e4d8af193ce6b042c13b11
+Previous: fcbd6a8fe59e7860562b9da6b94960ed19f5a948
+Head: 950688ac74f7073848eb98469eb60ff4b53c3d82
 Applied:
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 3e52eb22f44eafaefa95c4674bc5665a94e15694
@@ -8,8 +8,7 @@ Applied:
   rstream-fork: a1d261650896286989c5197199da7729b3d61fa5
   init-getname: 7d988863b218d1b66e3739ec4b6f51acc72b2334
   rs-ftp: 28e0744eb89227fbeded485fbad64010b9edf0f6
-  dbg: a2437503c235e8aa5f5713e75b3518ab2edd9f49
-  refresh-temp: 5eb2078811a75b43a0e4d8af193ce6b042c13b11
+  dbg: 950688ac74f7073848eb98469eb60ff4b53c3d82
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index a7ec25b912d9c9a77d868feded96e930e2f0a368..fb06838e2a92beba57e92d569403791761005595 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: 2d7d36989522b9e010497256793038fb2cb5aa9e
-Top:    3b5b8e1557fedc1a739d19b10a2301d6d2461fe4
+Top:    8754908f54691ebf8eb338a5cf23c230a90d34d4
 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..9b205f9 100644
+index 52eaf1a..6f8e4f8 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -68,15 +68,31 @@ index 52eaf1a..9b205f9 100644
        recursive = 1;
        ret = rsocket(domain, type, protocol);
        recursive = 0;
-@@ -396,6 +398,7 @@ int socket(int domain, int type, int protocol)
+@@ -389,6 +391,7 @@ int socket(int domain, int type, int protocol)
+               if (fork_support) {
+                       rclose(ret);
+                       ret = real.socket(domain, type, protocol);
++                      printf("socket - fork support - real socket %d\n", ret);
+                       if (ret < 0)
+                               return ret;
+                       fd_store(index, ret, fd_fork);
+@@ -396,6 +399,7 @@ int socket(int domain, int type, int protocol)
                        fd_store(index, ret, fd_rsocket);
                        set_rsocket_options(ret);
                }
-+              printf("socket - %d\n", index);
++              printf("socket - return %d\n", index);
                return index;
        }
        fd_close(index, &ret);
-@@ -413,6 +416,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -406,6 +410,7 @@ real:
+ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
+ {
+       int fd;
++      printf("bind %d\n", socket);
+       return (fd_get(socket, &fd) == fd_rsocket) ?
+               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
+ }
+@@ -413,6 +418,7 @@ int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
  int listen(int socket, int backlog)
  {
        int fd;
@@ -84,7 +100,30 @@ index 52eaf1a..9b205f9 100644
        return (fd_get(socket, &fd) == fd_rsocket) ?
                rlisten(fd, backlog) : real.listen(fd, backlog);
  }
-@@ -455,14 +459,17 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+@@ -422,6 +428,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
+       int fd, index, ret;
+       enum fd_type type;
+ 
++      printf("accept %d\n", socket);
+       type = fd_get(socket, &fd);
+       if (type == fd_rsocket || type == fd_fork) {
+               index = fd_open();
+@@ -430,11 +437,14 @@ 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));
+               if (ret < 0) {
+                       fd_close(index, &fd);
+                       return ret;
+               }
+ 
++              printf("accept %d, new index %d new socket %d\n", socket, index, ret);
+               fd_store(index, ret, type);
+               return index;
+       } else {
+@@ -455,14 +465,17 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
        uint32_t msg;
        long flags;
  
@@ -102,7 +141,7 @@ index 52eaf1a..9b205f9 100644
        if ((ret != sizeof msg) || msg) {
                fd_store(socket, fd, fd_normal);
                return 0;
-@@ -470,10 +477,12 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
+@@ -470,10 +483,12 @@ static int fork_active(int socket, const struct sockaddr *addr, socklen_t addrle
  
        real.fcntl(fd, F_SETFL, flags);
        ret = transpose_socket(socket, fd_rsocket);
@@ -115,7 +154,7 @@ index 52eaf1a..9b205f9 100644
        return rconnect(ret, addr, addrlen);
  }
  
-@@ -570,6 +579,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
+@@ -570,6 +585,7 @@ int connect(int socket, const struct sockaddr *addr, socklen_t addrlen)
  {
        int fd, ret;
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7008940..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: 3b5b8e1557fedc1a739d19b10a2301d6d2461fe4
-Top:    8754908f54691ebf8eb338a5cf23c230a90d34d4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-25 12:01:34 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index 9b205f9..6f8e4f8 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -391,6 +391,7 @@ int socket(int domain, int type, int protocol)
-               if (fork_support) {
-                       rclose(ret);
-                       ret = real.socket(domain, type, protocol);
-+                      printf("socket - fork support - real socket %d\n", ret);
-                       if (ret < 0)
-                               return ret;
-                       fd_store(index, ret, fd_fork);
-@@ -398,7 +399,7 @@ int socket(int domain, int type, int protocol)
-                       fd_store(index, ret, fd_rsocket);
-                       set_rsocket_options(ret);
-               }
--              printf("socket - %d\n", index);
-+              printf("socket - return %d\n", index);
-               return index;
-       }
-       fd_close(index, &ret);
-@@ -409,6 +410,7 @@ real:
- int bind(int socket, const struct sockaddr *addr, socklen_t addrlen)
- {
-       int fd;
-+      printf("bind %d\n", socket);
-       return (fd_get(socket, &fd) == fd_rsocket) ?
-               rbind(fd, addr, addrlen) : real.bind(fd, addr, addrlen);
- }
-@@ -426,6 +428,7 @@ int accept(int socket, struct sockaddr *addr, socklen_t *addrlen)
-       int fd, index, ret;
-       enum fd_type type;
- 
-+      printf("accept %d\n", socket);
-       type = fd_get(socket, &fd);
-       if (type == fd_rsocket || type == fd_fork) {
-               index = fd_open();
-@@ -434,11 +437,14 @@ 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));
-               if (ret < 0) {
-                       fd_close(index, &fd);
-                       return ret;
-               }
- 
-+              printf("accept %d, new index %d new socket %d\n", socket, index, ret);
-               fd_store(index, ret, type);
-               return index;
-       } else {