refresh

diff --git a/meta b/meta
index 54dd21f8ce214bf6ac786da55079f1d1174102cc..c60e8d1d10e9aa6783b1780a39e349fba0909b60 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 205b764b41e93cbc67d37d5eff759886521fdfba
-Head: 38c4a06ecb8743f37b40dfde4c63b1d8492c9f45
+Previous: 422c035059f497ac774c83eb37cf2c9f8f3436d3
+Head: 57e07a4f6fe08206fe2008e3e1d7340804a4a491
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -16,8 +16,7 @@ Applied:
   rs-states: f44db4e0cb7c822c7b9886882d6f502d183d9392
   rs-def-qpsize: 0fbd81e6a091a33b273e841b5c89414f52519adb
   rstream-bufsize: c6faa18bc246817c759475f4b44221555a4e892b
-  rstream-opt: d0ab04bfcc3d81078036ac785d88af71bad12f78
-  refresh-temp: 38c4a06ecb8743f37b40dfde4c63b1d8492c9f45
+  rstream-opt: 57e07a4f6fe08206fe2008e3e1d7340804a4a491
 Unapplied:
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index b293657..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: 23ea717380e9724145efbafcb81d1f6498f3c19c
-Top:    bd11f606feed611373ef6b7818eefe33c92cc6f5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-28 01:47:54 -0700
-
-Refresh of rstream-opt
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index ae4574b..65529ab 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -365,11 +365,11 @@ static void set_options(int rs)
-                             sizeof buffer_size);
-               rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size,
-                             sizeof buffer_size);
--      } else if (optimization == opt_bandwidth) {
-+      } /* else if (optimization == opt_bandwidth) {
-               val = 1 << 20;
-               rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &val, sizeof val);
-               rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &val, sizeof val);
--      }
-+      } */
- 
-       val = 1;
-       rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
-@@ -382,7 +382,7 @@ static void set_options(int rs)
-               if (optimization == opt_latency)
-                       val = 384;
-               else if (optimization == opt_bandwidth)
--                      val = 0;
-+                      val = 32; // 0;
-               else
-                       val = 64;

diff --git a/patches/rstream-opt b/patches/rstream-opt
index 44d040319011db3a7eb87b592224b1515705c6b2..3424b25fffe7a95fa28ec94c9181376e6d834470 100644 (file)
--- a/patches/rstream-opt
+++ b/patches/rstream-opt
@@ -1,5 +1,5 @@
 Bottom: fdfaeba03cd72a5fb2f57a5316f270c905d4dc15
-Top:    23ea717380e9724145efbafcb81d1f6498f3c19c
+Top:    bd11f606feed611373ef6b7818eefe33c92cc6f5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-27 14:07:42 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index df36e34..ae4574b 100644
+index df36e34..65529ab 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -71,12 +71,20 @@ static struct test_size_param test_size[] = {
@@ -103,18 +103,19 @@ index df36e34..ae4574b 100644
                        if (ret)
                                goto out;
                }
-@@ -357,6 +365,10 @@ static void set_options(int rs)
+@@ -357,20 +365,35 @@ static void set_options(int rs)
                              sizeof buffer_size);
                rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &buffer_size,
                              sizeof buffer_size);
-+      } else if (optimization == opt_bandwidth) {
+-      }
++      } /* else if (optimization == opt_bandwidth) {
 +              val = 1 << 20;
 +              rs_setsockopt(rs, SOL_SOCKET, SO_SNDBUF, (void *) &val, sizeof val);
 +              rs_setsockopt(rs, SOL_SOCKET, SO_RCVBUF, (void *) &val, sizeof val);
-       }
++      } */
  
        val = 1;
-@@ -364,13 +376,24 @@ static void set_options(int rs)
+       rs_setsockopt(rs, IPPROTO_TCP, TCP_NODELAY, (void *) &val, sizeof(val));
  
        if (flags & MSG_DONTWAIT)
                rs_fcntl(rs, F_SETFL, O_NONBLOCK);
@@ -124,7 +125,7 @@ index df36e34..ae4574b 100644
 +              if (optimization == opt_latency)
 +                      val = 384;
 +              else if (optimization == opt_bandwidth)
-+                      val = 0;
++                      val = 32; // 0;
 +              else
 +                      val = 64;
 +