pop (CONFLICT)

diff --git a/meta b/meta
index 9b4f441301c2631bae4f3eab2a4d99f16dec37dc..7d04f7481d325b3fa1e2d5fc22da50dad91094f7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 161fc2d8832bf158fb4fad9c4f4bc4a7bd4833cc
+Previous: 268cc23bc7fc5e903e444ba2f471bc0ca75fa84f
 Head: 0db74a43ee1496376bb38e37fb46b144589322be
 Applied:
   ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e
   rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45
   rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1
   rs-spin: 2625a8a7f37fe6126242b7728bf18b25a5b6ee12
+  rs-defaults: 0db74a43ee1496376bb38e37fb46b144589322be
 Unapplied:
-  rs-defaults: 5501d786f18e25467a01195ca7464313bcceb5b2
   buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/rs-defaults b/patches/rs-defaults
index f6994cd7e9929a86d8ca7ebbdb5d94b65a9620bf..245c7a126d4a003e8c1031b2370b9a4c515e2a92 100644 (file)
--- a/patches/rs-defaults
+++ b/patches/rs-defaults
@@ -1,5 +1,5 @@
-Bottom: 9023ede0dfcb282ab90f7726e5c637c9ff842534
-Top:    a4efc6fe73ad6eab8713c648bed5c4bd441fd96e
+Bottom: b81754028658b7a877798e12b2fd67dd9d2ae0be
+Top:    b81754028658b7a877798e12b2fd67dd9d2ae0be
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-05 15:28:18 -0700
 
@@ -22,90 +22,4 @@ 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);
+