diff options
| author | luqiuwen <[email protected]> | 2019-01-14 20:09:02 +0600 |
|---|---|---|
| committer | luqiuwen <[email protected]> | 2019-01-14 20:09:02 +0600 |
| commit | 70124a50ab8697dd72033a868ef6212e485a4ba8 (patch) | |
| tree | 4eb06da26f026fe223051f80e46c6510901cb4b9 | |
| parent | 19f7f023e3b8388a8d07f0a48703819170019701 (diff) | |
#12 暂时屏蔽内存保护模式，增加numa编译依赖项feature-dpdk-18-11
| -rw-r--r-- | app/src/marsio.c | 3 | ||||
| -rw-r--r-- | cmake/FindDPDK.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/src/marsio.c b/app/src/marsio.c index 04cf39b..1548b52 100644 --- a/app/src/marsio.c +++ b/app/src/marsio.c @@ -100,6 +100,7 @@ static void mrapp_mem_protect_with_asan_init(struct mr_instance * instance) struct rte_config *cfg = rte_eal_get_configuration(); const struct rte_mem_config * mcfg = cfg->mem_config; +#if 0 for(int i = 0; i < RTE_MAX_MEMSEG; i++) { if(mcfg->memseg[i].addr == NULL) break; @@ -112,6 +113,8 @@ static void mrapp_mem_protect_with_asan_init(struct mr_instance * instance) /* 解锁所有的mempool */ rte_mempool_walk(__mrapp_mem_protect_unlock_mempool_cb, NULL); + +#endif } /* EAL环境初始化 */ diff --git a/cmake/FindDPDK.cmake b/cmake/FindDPDK.cmake index 60539d3..e5b9f70 100644 --- a/cmake/FindDPDK.cmake +++ b/cmake/FindDPDK.cmake @@ -106,7 +106,7 @@ endif() # Additional library file(GLOB DPDK_LIBRARY_GEN "${DPDK_LIBRARY_DIR}/librte*.a" "${DPDK_LIBRARY_DIR}/libeth*.a") -set(DPDK_LIBRARY -Wl,--whole-archive ${DPDK_LIBRARY_GEN} -Wl,--no-whole-archive rt m dl pcap) +set(DPDK_LIBRARY -Wl,--whole-archive ${DPDK_LIBRARY_GEN} -Wl,--no-whole-archive rt m dl pcap numa) # Force Include set(DPDK_FORCE_INCLUDE "-include ${DPDK_INCLUDE_DIR}/rte_config.h") |