refresh

diff --git a/meta b/meta
index 8dbf76db185057bccf069d14b5c4542bd2f59ed1..5d802a9951e235bb4e6748dba0aa5b361593ed16 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 93f9749a93a784dfd06344df61aa886ee5783c39
-Head: 764e85fbd357d96e49c988b185b471160c787fe1
+Previous: 4568e96f6af3d042bcf8c11b4237c5bbc00fe3e8
+Head: 0687e42f87b1129e584afae0e28b5a9c15f75510
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f
   rstream-fork: 2724e02d5b461f8c580249461271de0f7acefcab
-  dbg: 684e1fe67558aa0c7d2cff2f8634866c435e7803
-  refresh-temp: 764e85fbd357d96e49c988b185b471160c787fe1
+  dbg: 0687e42f87b1129e584afae0e28b5a9c15f75510
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/dbg b/patches/dbg
index efdbb35635962fb4b8c4f9bb121bc724d9463e20..e32c211d29f2bbfaa813f058335a96b189d2d45e 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
 Bottom: e0b82367be775902f3588a79dd714486d21646b3
-Top:    552216c4c92cac1034077b23311e7374f0379b5d
+Top:    fc0d4fef187ee5bca74ac50c3bb7806917a0a428
 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 f824af3..e429ad6 100644
+index f824af3..47e1e64 100644
 --- a/src/preload.c
 +++ b/src/preload.c
 @@ -48,6 +48,7 @@
@@ -78,7 +78,7 @@ index f824af3..e429ad6 100644
        if ((ret != sizeof msg) || msg) {
                fd_store(socket, fd, fd_normal);
                return 0;
-@@ -482,6 +486,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
+@@ -482,10 +486,12 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
  
        real.fcntl(fd, F_SETFL, flags);
        ret = transpose_socket(socket, fd_rsocket);
@@ -86,7 +86,12 @@ index f824af3..e429ad6 100644
        if (ret < 0)
                return ret;
  
-@@ -834,11 +839,15 @@ pid_t fork(void)
+       real.close(fd);
++      printf("connect_fork - connecting rsocket");
+       return rconnect(ret, addr, addrlen);
+ }
+ 
+@@ -834,11 +840,15 @@ pid_t fork(void)
        uint32_t msg;
  
        init_preload();
@@ -102,7 +107,7 @@ index f824af3..e429ad6 100644
        len = sizeof sin6;
        ret = real.getsockname(sfd, (struct sockaddr *) &sin6, &len);
        if (ret)
-@@ -846,33 +855,42 @@ pid_t fork(void)
+@@ -846,33 +856,42 @@ pid_t fork(void)
        sin6.sin6_flowinfo = sin6.sin6_scope_id = 0;
        memset(&sin6.sin6_addr, 0, sizeof sin6.sin6_addr);
  
@@ -145,6 +150,14 @@ index f824af3..e429ad6 100644
        if (dfd < 0)
                goto lclose;
  
+@@ -883,6 +902,7 @@ pid_t fork(void)
+       copysockopts(dfd, sfd, &rs, &real);
+       real.shutdown(sfd, SHUT_RDWR);
+       real.close(sfd);
++      printf("fork - using rsocket\n");
+       fd_store(last_accept, dfd, fd_rsocket);
+ 
+ lclose:
 diff --git a/src/rsocket.c b/src/rsocket.c
 index ed125b3..1d293f7 100644
 --- a/src/rsocket.c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ee64553..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 552216c4c92cac1034077b23311e7374f0379b5d
-Top:    fc0d4fef187ee5bca74ac50c3bb7806917a0a428
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-19 16:02:26 -0700
-
-Refresh of dbg
-
----
-
-diff --git a/src/preload.c b/src/preload.c
-index e429ad6..47e1e64 100644
---- a/src/preload.c
-+++ b/src/preload.c
-@@ -491,6 +491,7 @@ static int connect_fork(int socket, const struct sockaddr *addr, socklen_t addrl
-               return ret;
- 
-       real.close(fd);
-+      printf("connect_fork - connecting rsocket");
-       return rconnect(ret, addr, addrlen);
- }
- 
-@@ -901,6 +902,7 @@ pid_t fork(void)
-       copysockopts(dfd, sfd, &rs, &real);
-       real.shutdown(sfd, SHUT_RDWR);
-       real.close(sfd);
-+      printf("fork - using rsocket\n");
-       fd_store(last_accept, dfd, fd_rsocket);
- 
- lclose: