aboutsummaryrefslogtreecommitdiffstats
path: root/stacks/rsocket
diff options
context:
space:
mode:
Diffstat (limited to 'stacks/rsocket')
-rw-r--r--stacks/rsocket/CMakeLists.txt2
-rw-r--r--stacks/rsocket/configure/module_config.json (renamed from stacks/rsocket/config/module_config.json)10
-rw-r--r--stacks/rsocket/configure/rd_config.json (renamed from stacks/rsocket/config/rd_config.json)0
-rw-r--r--stacks/rsocket/doc/README.md8
-rw-r--r--stacks/rsocket/src/rsocket_adpt.c1
5 files changed, 6 insertions, 15 deletions
diff --git a/stacks/rsocket/CMakeLists.txt b/stacks/rsocket/CMakeLists.txt
index c1b2f18..6ba868b 100644
--- a/stacks/rsocket/CMakeLists.txt
+++ b/stacks/rsocket/CMakeLists.txt
@@ -17,7 +17,7 @@
SET(rdmacm_dir librdmacm-1.1.0)
SET(dmm_inc_dir ${DMM_REL_INC_DIR})
-SET(RSOCKET_DEBUG 0)
+SET(RSOCKET_DEBUG 1)
########################
diff --git a/stacks/rsocket/config/module_config.json b/stacks/rsocket/configure/module_config.json
index 2df82cd..736de24 100644
--- a/stacks/rsocket/config/module_config.json
+++ b/stacks/rsocket/configure/module_config.json
@@ -3,27 +3,17 @@
"module_list": [
{
"stack_name": "kernel", /*stack name*/
- "function_name": "kernel_stack_register", /*function name*/
"libname": "./", /*library name, if loadtype is static, this maybe
null, else must give a library name*/
- "loadtype": "static", /*library load type: static or dynamic*/
"deploytype": "1", /*deploy model type:model type1, model type2,
model type3. Indicating single or multi process
deployment. Used during shared memory initialization.*/
- "maxfd": "1024", /*the max fd supported*/
- "minfd": "0", /*the min fd supported*/
- "priorty": "1", /*priorty when executing, reserv*/
"stackid": "0", /*stack id, this must be ordered and not be repeated*/
},
{
"stack_name": "rsocket",
- "function_name": "rsocket_stack_register",
"libname": "libdmm_rsocket.so",
- "loadtype": "dynmic",
"deploytype": "1",
- "maxfd": "1024",
- "minfd": "0",
- "priorty": "1",
"stackid": "1",
},
]
diff --git a/stacks/rsocket/config/rd_config.json b/stacks/rsocket/configure/rd_config.json
index 5c6f861..5c6f861 100644
--- a/stacks/rsocket/config/rd_config.json
+++ b/stacks/rsocket/configure/rd_config.json
diff --git a/stacks/rsocket/doc/README.md b/stacks/rsocket/doc/README.md
index 237db68..6cdacfb 100644
--- a/stacks/rsocket/doc/README.md
+++ b/stacks/rsocket/doc/README.md
@@ -34,10 +34,10 @@ dmm/release/lib64/libdmm_rsocket.so
```sh
#export LD_LIBRARY_PATH=${dmm}/release/lib64
#export LD_PRELOAD=${dmm}/release/lib64/libnStackAPI.so
- #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/rsocket/config/module_config.json
- #export NSTACK_MOD_CFG_RD=${dmm}/stacks/rsocket/config/rd_config.json
+ #export NSTACK_MOD_CFG_FILE=${dmm}/stacks/rsocket/configure/module_config.json
+ #export NSTACK_MOD_CFG_RD=${dmm}/stacks/rsocket/configure/rd_config.json
```
-- Steps 2: Modify rd_config.json(located at dmm/stacks/rsocket/config/)
+- Steps 2: Modify rd_config.json(located at dmm/stacks/rsocket/configure/)
```sh
#vim rd_config.json
//set "subnet": "192.168.21.1/24"
@@ -107,4 +107,4 @@ all using GSAPI macro control.
https://wiki.fd.io/view/DMM
https://github.com/ofiwg/librdmacm/blob/master/docs/rsocket
https://github.com/rsocket/rsocket
-http://www.mellanox.com/page/products_dyn?product_family=26 \ No newline at end of file
+http://www.mellanox.com/page/products_dyn?product_family=26
diff --git a/stacks/rsocket/src/rsocket_adpt.c b/stacks/rsocket/src/rsocket_adpt.c
index ea22c76..2839909 100644
--- a/stacks/rsocket/src/rsocket_adpt.c
+++ b/stacks/rsocket/src/rsocket_adpt.c
@@ -235,6 +235,7 @@ rsocket_stack_register (nstack_proc_cb * proc_fun,
proc_fun->extern_ops.module_init = rsocket_init;
proc_fun->extern_ops.ep_ctl = rsocket_ep_ctl;
proc_fun->extern_ops.ep_getevt = NULL;
+ proc_fun->extern_ops.module_init_child = rsocket_init;
g_rr_var.type = event_ops->type;
g_rr_var.event_cb = event_ops->event_cb;