RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-04 15:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20640 from tchaikov/wip-async-dpdk-temp-str

Browse Source 
msg/async: avoid referencing the temporary string

Reviewed-by: Haomai Wang <haomai@xsky.com>
This commit is contained in:
Kefu Chai 2018-03-01 19:19:01 +08:00 committed by GitHub
commit e1c23cde27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/msg/async/dpdk/dpdk_rte.cc
View File

@ -40,7 +40,7 @@ namespace dpdk {
std::condition_variable eal::cond; std::condition_variable eal::cond;
std::list<std::function<void()>> eal::funcs; std::list<std::function<void()>> eal::funcs;
static int bitcount(unsigned n) static int bitcount(unsigned long long n)
{ {
return std::bitset<CHAR_BIT * sizeof(n)>{n}.count(); return std::bitset<CHAR_BIT * sizeof(n)>{n}.count();
} }
@ -52,8 +52,8 @@ namespace dpdk {
} }
bool done = false; bool done = false;
const char *hexstring = c->_conf->get_val<std::string>("ms_dpdk_coremask").c_str(); auto num = std::stoull(c->_conf->get_val<std::string>("ms_dpdk_coremask"),
int num = (int)strtol(hexstring, NULL, 0); nullptr, 16);
unsigned int coremaskbit = bitcount(num); unsigned int coremaskbit = bitcount(num);
ceph_assert(coremaskbit > c->_conf->ms_async_op_threads); ceph_assert(coremaskbit > c->_conf->ms_async_op_threads);