pop (CONFLICT)

diff --git a/meta b/meta
index 89a3647c59ecf426fadbf0f18cb77178a9f4294b..6fb0a514fd87f5ac68987babe751f2e55bf83b43 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 51b79ba9e0522140b8f890d4cc4b44b9aa7c4f28
+Previous: 695e89f1f908e601af1f2355437b1e8274787376
 Head: a2ee50012bacd9cbd8a24a1953ddc474d1529029
 Applied:
   ip6-opt: a459c228426c4d25684dcfd2a4203f013f0b454e
   rs-shutdown: f16748cbaea650f19805ddc6652895ca88d36a45
   rs-maxseg: e7a519b8ae91403c8c0d29b2a86ae376b37a71c1
   rs-spin: 68a62bc98bd991130af0c0ef432d10c922600846
+  rs-defaults: a2ee50012bacd9cbd8a24a1953ddc474d1529029
 Unapplied:
-  rs-defaults: 807a6096f8e62176464b95e5907f34a6727c2a05
   buf-addr: eb70620389ced3c0c705d44b69e691a47cd3e4fd
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/rs-defaults b/patches/rs-defaults
index 1b177947d615b0c214c77740607e2e1d508fcc6a..acc217f70a60c917be4eb5aca6e2f4a3ce20db39 100644 (file)
--- a/patches/rs-defaults
+++ b/patches/rs-defaults
@@ -1,5 +1,5 @@
-Bottom: 79b36b9ed22f77cfe81e888155e383bcf09e5e9f
-Top:    1779fb10114ac58b8fec5784590ae492f83c745c
+Bottom: 9023ede0dfcb282ab90f7726e5c637c9ff842534
+Top:    9023ede0dfcb282ab90f7726e5c637c9ff842534
 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 bb66503..68316f9 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
-@@ -209,6 +210,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;
-+      }
- }
- 
- /*
-@@ -254,9 +289,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);
+