From: Sean Hefty Date: Wed, 6 Jun 2012 00:06:23 +0000 (-0700) Subject: refresh X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1201afcaf984b1f75fdb83b3710a531bc1ba1aa2;p=~shefty%2Flibrdmacm.git refresh --- diff --git a/meta b/meta index 2ac2250f..000ec2d0 100644 --- a/meta +++ b/meta @@ -1,13 +1,12 @@ Version: 1 -Previous: 12ad4e5a0172ec893b926a28e0d85b9ebb946e09 -Head: 8631c91af0a12d9e7ecfeea10231549647f35c8e +Previous: ed248ee091af4b178817bf1dbcacb719b4483ce7 +Head: a73ea989a64632a05e1cec11c161f1a2fa449ecc Applied: ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45 rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1 rs-spin: 2625a8a7f37fe6126242b7728bf18b25a5b6ee12 - rs-defaults: 0db74a43ee1496376bb38e37fb46b144589322be - refresh-temp: 8631c91af0a12d9e7ecfeea10231549647f35c8e + rs-defaults: a73ea989a64632a05e1cec11c161f1a2fa449ecc Unapplied: buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index da7ad07f..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,94 +0,0 @@ -Bottom: b81754028658b7a877798e12b2fd67dd9d2ae0be -Top: d90367263f5a974038034a311c40904c960afdff -Author: Sean Hefty -Date: 2012-06-05 17:06:22 -0700 - -Refresh of rs-defaults - ---- - -diff --git a/src/rsocket.c b/src/rsocket.c -index f53f1c8..f7a0fdd 100644 ---- a/src/rsocket.c -+++ b/src/rsocket.c -@@ -53,19 +53,20 @@ - #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 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 = 10; - - /* -@@ -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 245c7a12..e3ecdd41 100644 --- a/patches/rs-defaults +++ b/patches/rs-defaults @@ -1,5 +1,5 @@ Bottom: b81754028658b7a877798e12b2fd67dd9d2ae0be -Top: b81754028658b7a877798e12b2fd67dd9d2ae0be +Top: d90367263f5a974038034a311c40904c960afdff Author: Sean Hefty Date: 2012-06-05 15:28:18 -0700 @@ -22,4 +22,88 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/rsocket.c b/src/rsocket.c +index f53f1c8..f7a0fdd 100644 +--- a/src/rsocket.c ++++ b/src/rsocket.c +@@ -53,19 +53,20 @@ + #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 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 = 10; + + /* +@@ -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);