RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

msg/async: drop Stack::num_workers

Browse Source 
no need to store it as a member variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-02-24 13:02:43 +08:00
parent 52044dcbc7
commit 789c1bd62a
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/msg/async/Stack.cc
View File

@ -85,8 +85,17 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
return nullptr;
}
unsigned num_workers = c->_conf->ms_async_op_threads;
ceph_assert(num_workers > 0);
if (num_workers >= EventCenter::MAX_EVENTCENTER) {
ldout(c, 0) << __func__ << " max thread limit is "
<< EventCenter::MAX_EVENTCENTER << ", switching to this now. "
<< "Higher thread values are unnecessary and currently unsupported."
<< dendl;
num_workers = EventCenter::MAX_EVENTCENTER;
}
const int InitEventNumber = 5000;
for (unsigned worker_id = 0; worker_id < stack->num_workers; ++worker_id) {
for (unsigned worker_id = 0; worker_id < num_workers; ++worker_id) {
Worker *w = stack->create_worker(c, worker_id);
int ret = w->center.init(InitEventNumber, worker_id, t);
if (ret)
@ -99,18 +108,7 @@ std::shared_ptr<NetworkStack> NetworkStack::create(CephContext *c,
NetworkStack::NetworkStack(CephContext *c)
: cct(c)
{
ceph_assert(cct->_conf->ms_async_op_threads > 0);
num_workers = cct->_conf->ms_async_op_threads;
if (num_workers >= EventCenter::MAX_EVENTCENTER) {
ldout(cct, 0) << __func__ << " max thread limit is "
<< EventCenter::MAX_EVENTCENTER << ", switching to this now. "
<< "Higher thread values are unnecessary and currently unsupported."
<< dendl;
num_workers = EventCenter::MAX_EVENTCENTER;
}
}
{}
void NetworkStack::start()
{

1
src/msg/async/Stack.h
View File

@ -293,7 +293,6 @@ class Worker {
};
class NetworkStack {
unsigned num_workers = 0;
ceph::spinlock pool_spin;
bool started = false;