summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Wang <li.wang@kylin-cloud.com>2016-12-06 09:31:45 +0100
committerLi Wang <li.wang@kylin-cloud.com>2016-12-06 09:32:22 +0100
commitfbfc5483e3a0654038cf879f0969dd2b6d3c51ee (patch)
tree971b3a1179d43881cef6fbb01c2bc99a07291133
parentmsg/async/dpdk/DPDK.cc: assert(0) -> ceph_abort() (diff)
downloadceph-fbfc5483e3a0654038cf879f0969dd2b6d3c51ee.tar.xz
ceph-fbfc5483e3a0654038cf879f0969dd2b6d3c51ee.zip
msg/async/dpdk/DPDKStack.cc: assert(0) -> ceph_abort()
Signed-off-by: Li Wang <li.wang@kylin-cloud.com>
-rw-r--r--src/msg/async/dpdk/DPDKStack.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/msg/async/dpdk/DPDKStack.cc b/src/msg/async/dpdk/DPDKStack.cc
index efe77844714..2374fcb2218 100644
--- a/src/msg/async/dpdk/DPDKStack.cc
+++ b/src/msg/async/dpdk/DPDKStack.cc
@@ -109,7 +109,7 @@ void DPDKWorker::initialize()
} else {
// auto master = qid % sdev->hw_queues_count();
// sdev->set_local_queue(create_proxy_net_device(master, sdev.get()));
- assert(0);
+ ceph_abort();
}
if (i == 0) {
{
@@ -120,7 +120,7 @@ void DPDKWorker::initialize()
if (sdev->init_port_fini() < 0) {
lderr(cct) << __func__ << " init_port_fini failed " << dendl;
- assert(0);
+ ceph_abort();
}
Mutex::Locker l(lock);
create_stage = DONE;
@@ -189,7 +189,7 @@ DPDKWorker::Impl::Impl(CephContext *cct, unsigned i, EventCenter *c, std::shared
<< cct->_conf->ms_dpdk_gateway_ipv4_addr << ", "
<< cct->_conf->ms_dpdk_netmask_ipv4_addr << ", "
<< dendl;
- assert(0);
+ ceph_abort();
}
_inet.set_host_address(ipv4_address(std::get<0>(tuples[0])));
_inet.set_gw_address(ipv4_address(std::get<1>(tuples[0])));
@@ -244,7 +244,7 @@ void DPDKStack::spawn_worker(unsigned i, std::function<void ()> &&func)
r = dpdk::eal::init(cct);
if (r < 0) {
lderr(cct) << __func__ << " init dpdk rte failed, r=" << r << dendl;
- assert(0);
+ ceph_abort();
}
// if dpdk::eal::init already called by NVMEDevice, we will select 1..n
// cores
@@ -253,7 +253,7 @@ void DPDKStack::spawn_worker(unsigned i, std::function<void ()> &&func)
r = rte_eal_remote_launch(dpdk_thread_adaptor, static_cast<void*>(&funcs[i]), i+1);
if (r < 0) {
lderr(cct) << __func__ << " remote launch failed, r=" << r << dendl;
- assert(0);
+ ceph_abort();
}
});
}