refresh

diff --git a/meta b/meta
index 6d7d0d3245f845b4ce10a36c2a438b41223987e3..d8872709f24bec18e139680b657da4b7d0aa8157 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: ace390fa40015baa1ff09452d0dc6a30ab277863
-Head: 7bd0398a7af8c4c1f46e8c2243be329f548a8c3b
+Previous: d07484fff073c6deb2950d7639895a824abfe184
+Head: c49c6b56c55385774065f5aa2704078e6ae0ceb8
 Applied:
-  waitall-buggy: 11385ea5d83fb57988a6e57591e346ce19df6ff2
-  refresh-temp: 7bd0398a7af8c4c1f46e8c2243be329f548a8c3b
+  waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
 Unapplied:
   v6only-kernel: 56e2b4566930fa7b05debec8b247e8dfe9df7ffe
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 70df095..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: b7dfa8c66e1dc86225c445ccf919d88ab1bb492c
-Top:    cc155d40ac28117d20959cbd97dbc2bbb3c4ffe6
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-28 12:40:22 -0700
-
-Refresh of waitall-buggy
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 30727fa..6605df9 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -1143,6 +1143,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
- 
-               ret = 0;
-               if (flags & MSG_PEEK) {
-+                      // fixme or will peek same data in waitall loop
-                       left -= rs_peek(rs, &buf, left);
-                       continue;
-               }
-@@ -1170,7 +1171,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
-                       rs->rbuf_offset += rsize;
-                       buf += rsize;
-               }
--              rs->rbuf_bytes_avail += len - left;
-+              rs->rbuf_bytes_avail += len - left; // <- fixme in waitall loop
- 
-       } while ((flags & MSG_WAITALL) && (rs->state & rs_connect_rd) && left);

diff --git a/patches/waitall-buggy b/patches/waitall-buggy
index c4f8b9fc33d775ef08783d715a2abea6eca161c3..288cb56669bb0a2ec296d69503d6c61ff52fcfdc 100644 (file)
--- a/patches/waitall-buggy
+++ b/patches/waitall-buggy
@@ -1,5 +1,5 @@
 Bottom: 1242d5df80aef5749c32bdb6490d768bfdd28ffe
-Top:    b7dfa8c66e1dc86225c445ccf919d88ab1bb492c
+Top:    cc155d40ac28117d20959cbd97dbc2bbb3c4ffe6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-28 11:34:38 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index bdb756f..30727fa 100644
+index bdb756f..6605df9 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -1079,7 +1079,7 @@ static int rs_all_sends_done(struct rsocket *rs)
@@ -43,7 +43,7 @@ index bdb756f..30727fa 100644
        }
  
        return len - left;
-@@ -1133,43 +1133,47 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1133,43 +1133,48 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
                }
        }
        fastlock_acquire(&rs->rlock);
@@ -77,6 +77,7 @@ index bdb756f..30727fa 100644
 -                              rs->rmsg_head = 0;
 +              ret = 0;
 +              if (flags & MSG_PEEK) {
++                      // fixme or will peek same data in waitall loop
 +                      left -= rs_peek(rs, &buf, left);
 +                      continue;
                }
@@ -117,7 +118,7 @@ index bdb756f..30727fa 100644
 -      }
 -      rs->rbuf_bytes_avail += len - left;
 -out:
-+              rs->rbuf_bytes_avail += len - left;
++              rs->rbuf_bytes_avail += len - left; // <- fixme in waitall loop
 +
 +      } while ((flags & MSG_WAITALL) && (rs->state & rs_connect_rd) && left);
 +