From 061033258529737bccda38c238ac939ca094969b Mon Sep 17 00:00:00 2001 From: chunmei Date: Mon, 13 Nov 2017 11:19:23 -0800 Subject: [PATCH] msg/async: rebase msg/async/dpdk to spdk/dpdk Signed-off-by: Liu-Chunmei --- src/msg/async/dpdk/DPDK.cc | 5 +---- src/msg/async/dpdk/dpdk_rte.cc | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/msg/async/dpdk/DPDK.cc b/src/msg/async/dpdk/DPDK.cc index b419d91cdef3d..597f1d51ebd06 100644 --- a/src/msg/async/dpdk/DPDK.cc +++ b/src/msg/async/dpdk/DPDK.cc @@ -532,7 +532,7 @@ bool DPDKQueuePair::init_rx_mbuf_pool() for (int i = 0; i < mbufs_per_queue_rx; i++) { rte_mbuf* m = rte_pktmbuf_alloc(_pktmbuf_pool_rx); assert(m); - rte_mbuf_refcnt_update(m, -1); + rte_mbuf_refcnt_set(m, 1); _rx_free_bufs.push_back(m); } @@ -562,7 +562,6 @@ bool DPDKQueuePair::init_rx_mbuf_pool() } } - ldout(cct, 20) << __func__ << " count " << rte_mempool_count(_pktmbuf_pool_rx) << " free count " << rte_mempool_free_count(_pktmbuf_pool_rx) << dendl; return _pktmbuf_pool_rx != nullptr; } @@ -785,8 +784,6 @@ bool DPDKQueuePair::rx_gc(bool force) ldout(cct, 10) << __func__ << " free segs " << _num_rx_free_segs << " thresh " << rx_gc_thresh << " free pkts " << _rx_free_pkts.size() - << " pool count " << rte_mempool_count(_pktmbuf_pool_rx) - << " free pool count " << rte_mempool_free_count(_pktmbuf_pool_rx) << dendl; while (!_rx_free_pkts.empty()) { diff --git a/src/msg/async/dpdk/dpdk_rte.cc b/src/msg/async/dpdk/dpdk_rte.cc index 75aea4e4e16a4..3e577d0aed621 100644 --- a/src/msg/async/dpdk/dpdk_rte.cc +++ b/src/msg/async/dpdk/dpdk_rte.cc @@ -52,7 +52,7 @@ namespace dpdk { } bool done = false; - const char *hexstring = c->_conf->get_val("ms_dpdk_coremaskbit").c_str(); + const char *hexstring = c->_conf->get_val("ms_dpdk_coremask").c_str(); int num = (int)strtol(hexstring, NULL, 0); unsigned int coremaskbit = bitcount(num); -- 2.39.5