refresh

diff --git a/meta b/meta
index 85c2d8983dceec1939c50fb925a228ff0fdaf6e3..b9d65abf88e552c969fca97510bd39da94c751bf 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 757f45674cf97243dc0ab2d07a9915fb3d47b1a1
-Head: fbfa2c9a5489430cc13b293b336c12229fb165cd
+Previous: 5844c8285404da2c63cc5d50debab43ac57932c2
+Head: 5501d786f18e25467a01195ca7464313bcceb5b2
 Applied:
   ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e
   rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45
   rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1
   rs-spin: 68a62bc98bd991130af0c0ef432d10c922600846
-  rs-defaults: a2ee50012bacd9cbd8a24a1953ddc474d1529029
-  refresh-temp: fbfa2c9a5489430cc13b293b336c12229fb165cd
+  rs-defaults: 5501d786f18e25467a01195ca7464313bcceb5b2
 Unapplied:
   buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a6514c3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,96 +0,0 @@
-Bottom: 9023ede0dfcb282ab90f7726e5c637c9ff842534
-Top:    a4efc6fe73ad6eab8713c648bed5c4bd441fd96e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-05 16:59:33 -0700
-
-Refresh of rs-defaults
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 90f9a10..c0316af 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -53,20 +53,21 @@
- #include "cma.h"
- #include "indexer.h"
- 
--#define RS_INLINE 64
- #define RS_OLAP_START_SIZE 2048
- #define RS_MAX_TRANSFER 65536
--#define RS_QP_SIZE 384
- #define RS_QP_MAX_SIZE 0xFFFE
--#define RS_QP_MIN_SIZE 8
- #define RS_QP_CTRL_SIZE 4
- #define RS_CONN_RETRIES 6
- #define RS_SGL_SIZE 2
--#define RS_BUF_SIZE (1 << 17)
- static struct index_map idm;
- static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
- 
--static uint32_t polling_time;
-+static uint16_t def_inline = 64;
-+static uint16_t def_sqsize = 384;
-+static uint16_t def_rqsize = 384;
-+static uint32_t def_mem = (1 << 17);
-+static uint32_t def_wmem = (1 << 17);
-+static uint32_t polling_time = 8;
- 
- /*
-  * Immediate data format is determined by the upper bits
-@@ -217,6 +218,40 @@ void rs_configure(void)
-               fscanf(f, "%u", &polling_time);
-               fclose(f);
-       }
-+
-+      if ((f = fopen(RS_CONF_DIR "/inline_default", "r"))) {
-+              fscanf(f, "%hu", &def_inline);
-+              fclose(f);
-+
-+              if (def_inline < RS_MIN_INLINE)
-+                      def_inline = RS_MIN_INLINE;
-+      }
-+
-+      if ((f = fopen(RS_CONF_DIR "/sqsize_default", "r"))) {
-+              fscanf(f, "%hu", &def_sqsize);
-+              fclose(f);
-+      }
-+
-+      if ((f = fopen(RS_CONF_DIR "/rqsize_default", "r"))) {
-+              fscanf(f, "%hu", &def_rqsize);
-+              fclose(f);
-+      }
-+
-+      if ((f = fopen(RS_CONF_DIR "/mem_default", "r"))) {
-+              fscanf(f, "%u", &def_mem);
-+              fclose(f);
-+
-+              if (def_mem < 1)
-+                      def_mem = 1;
-+      }
-+
-+      if ((f = fopen(RS_CONF_DIR "/wmem_default", "r"))) {
-+              fscanf(f, "%u", &def_wmem);
-+              fclose(f);
-+
-+              if (def_wmem < 1)
-+                      def_wmem = 1;
-+      }
-       init = 1;
- out:
-       pthread_mutex_unlock(&mut);
-@@ -265,9 +300,11 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs)
-               rs->rq_size = inherited_rs->rq_size;
-               rs->ctrl_avail = inherited_rs->ctrl_avail;
-       } else {
--              rs->sbuf_size = rs->rbuf_size = RS_BUF_SIZE;
--              rs->sq_inline = RS_INLINE;
--              rs->sq_size = rs->rq_size = RS_QP_SIZE;
-+              rs->sbuf_size = def_wmem;
-+              rs->rbuf_size = def_mem;
-+              rs->sq_inline = def_inline;
-+              rs->sq_size = def_sqsize;
-+              rs->rq_size = def_rqsize;
-               rs->ctrl_avail = RS_QP_CTRL_SIZE;
-       }
-       fastlock_init(&rs->slock);

diff --git a/patches/rs-defaults b/patches/rs-defaults
index acc217f70a60c917be4eb5aca6e2f4a3ce20db39..f6994cd7e9929a86d8ca7ebbdb5d94b65a9620bf 100644 (file)
--- a/patches/rs-defaults
+++ b/patches/rs-defaults
@@ -1,5 +1,5 @@
 Bottom: 9023ede0dfcb282ab90f7726e5c637c9ff842534
-Top:    9023ede0dfcb282ab90f7726e5c637c9ff842534
+Top:    a4efc6fe73ad6eab8713c648bed5c4bd441fd96e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-05 15:28:18 -0700
 
@@ -22,4 +22,90 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/rsocket.c b/src/rsocket.c
+index 90f9a10..c0316af 100644
+--- a/src/rsocket.c
++++ b/src/rsocket.c
+@@ -53,20 +53,21 @@
+ #include "cma.h"
+ #include "indexer.h"
+ 
+-#define RS_INLINE 64
+ #define RS_OLAP_START_SIZE 2048
+ #define RS_MAX_TRANSFER 65536
+-#define RS_QP_SIZE 384
+ #define RS_QP_MAX_SIZE 0xFFFE
+-#define RS_QP_MIN_SIZE 8
+ #define RS_QP_CTRL_SIZE 4
+ #define RS_CONN_RETRIES 6
+ #define RS_SGL_SIZE 2
+-#define RS_BUF_SIZE (1 << 17)
+ static struct index_map idm;
+ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
+ 
+-static uint32_t polling_time;
++static uint16_t def_inline = 64;
++static uint16_t def_sqsize = 384;
++static uint16_t def_rqsize = 384;
++static uint32_t def_mem = (1 << 17);
++static uint32_t def_wmem = (1 << 17);
++static uint32_t polling_time = 8;
+ 
+ /*
+  * Immediate data format is determined by the upper bits
+@@ -217,6 +218,40 @@ void rs_configure(void)
+               fscanf(f, "%u", &polling_time);
+               fclose(f);
+       }
++
++      if ((f = fopen(RS_CONF_DIR "/inline_default", "r"))) {
++              fscanf(f, "%hu", &def_inline);
++              fclose(f);
++
++              if (def_inline < RS_MIN_INLINE)
++                      def_inline = RS_MIN_INLINE;
++      }
++
++      if ((f = fopen(RS_CONF_DIR "/sqsize_default", "r"))) {
++              fscanf(f, "%hu", &def_sqsize);
++              fclose(f);
++      }
++
++      if ((f = fopen(RS_CONF_DIR "/rqsize_default", "r"))) {
++              fscanf(f, "%hu", &def_rqsize);
++              fclose(f);
++      }
++
++      if ((f = fopen(RS_CONF_DIR "/mem_default", "r"))) {
++              fscanf(f, "%u", &def_mem);
++              fclose(f);
++
++              if (def_mem < 1)
++                      def_mem = 1;
++      }
++
++      if ((f = fopen(RS_CONF_DIR "/wmem_default", "r"))) {
++              fscanf(f, "%u", &def_wmem);
++              fclose(f);
++
++              if (def_wmem < 1)
++                      def_wmem = 1;
++      }
+       init = 1;
+ out:
+       pthread_mutex_unlock(&mut);
+@@ -265,9 +300,11 @@ static struct rsocket *rs_alloc(struct rsocket *inherited_rs)
+               rs->rq_size = inherited_rs->rq_size;
+               rs->ctrl_avail = inherited_rs->ctrl_avail;
+       } else {
+-              rs->sbuf_size = rs->rbuf_size = RS_BUF_SIZE;
+-              rs->sq_inline = RS_INLINE;
+-              rs->sq_size = rs->rq_size = RS_QP_SIZE;
++              rs->sbuf_size = def_wmem;
++              rs->rbuf_size = def_mem;
++              rs->sq_inline = def_inline;
++              rs->sq_size = def_sqsize;
++              rs->rq_size = def_rqsize;
+               rs->ctrl_avail = RS_QP_CTRL_SIZE;
+       }
+       fastlock_init(&rs->slock);