refresh

diff --git a/meta b/meta
index 29b337dfa8ed13bf193062d80204c899f9e26220..3a021b215c06f3b991c952572984355ef3abef4f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8f3fddfb802cebd3d568e6368380413cb02dfc6a
-Head: 83dd383d7c49956cca8e587f98a1f819460e5169
+Previous: 24754997ba70e04b7e1f91c179b1b7d26bbc4f10
+Head: 2932f476cf2663c133e11625263279a4f90b7ebf
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -16,8 +16,7 @@ Applied:
   rs-states: f44db4e0cb7c822c7b9886882d6f502d183d9392
   rs-def-qpsize: 0fbd81e6a091a33b273e841b5c89414f52519adb
   rstream-bufsize: c6faa18bc246817c759475f4b44221555a4e892b
-  rstream-opt: 81325f64106fbcdeb7bd5d9d46dc60bc4e971ed1
-  refresh-temp: 83dd383d7c49956cca8e587f98a1f819460e5169
+  rstream-opt: 2932f476cf2663c133e11625263279a4f90b7ebf
 Unapplied:
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a4b84dc..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,32 +0,0 @@
-Bottom: dbb24b900018a9627ea7ad901c186abcabb5229a
-Top:    18854afb6b2fef4d972541319707eef7cabe0229
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-28 10:46:37 -0700
-
-Refresh of rstream-opt
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 067b746..6577fe1 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -379,12 +379,12 @@ static void set_options(int rs)
- 
-       if (use_rs) {
-               /* Inline size based on experimental data */
--//            if (optimization == opt_latency)
--//                    val = 384;
--//            else if (optimization == opt_bandwidth)
--                      val = 32; // 0;
--//            else
--//                    val = 64;
-+              if (optimization == opt_latency)
-+                      val = 384;
-+              else if (optimization == opt_bandwidth)
-+                      val = 0;
-+              else
-+                      val = 64;
- 
-               rs_setsockopt(rs, SOL_RDMA, RDMA_INLINE, &val, sizeof val);
-       }

diff --git a/patches/rstream-opt b/patches/rstream-opt
index bebb0279d652ea7dc1b4b097293d60f354f5e038..811e71f800857995fe2445bf717c8c21b180e95b 100644 (file)
--- a/patches/rstream-opt
+++ b/patches/rstream-opt
@@ -1,5 +1,5 @@
 Bottom: fdfaeba03cd72a5fb2f57a5316f270c905d4dc15
-Top:    dbb24b900018a9627ea7ad901c186abcabb5229a
+Top:    18854afb6b2fef4d972541319707eef7cabe0229
 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..067b746 100644
+index df36e34..6577fe1 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -71,12 +71,20 @@ static struct test_size_param test_size[] = {
@@ -121,12 +121,12 @@ index df36e34..067b746 100644
 +
 +      if (use_rs) {
 +              /* Inline size based on experimental data */
-+//            if (optimization == opt_latency)
-+//                    val = 384;
-+//            else if (optimization == opt_bandwidth)
-+                      val = 32; // 0;
-+//            else
-+//                    val = 64;
++              if (optimization == opt_latency)
++                      val = 384;
++              else if (optimization == opt_bandwidth)
++                      val = 0;
++              else
++                      val = 64;
 +
 +              rs_setsockopt(rs, SOL_RDMA, RDMA_INLINE, &val, sizeof val);
 +      }