Unverified Commit 6f537ff7 authored by kladko's avatar kladko

bug/SKALE-3751-enable-zeromq

parent f0baecee
...@@ -43,6 +43,13 @@ ZMQServer::ZMQServer(bool _checkSignature, const string& _caCertFile) ...@@ -43,6 +43,13 @@ ZMQServer::ZMQServer(bool _checkSignature, const string& _caCertFile)
frontend_(*ctx_, ZMQ_ROUTER), frontend_(*ctx_, ZMQ_ROUTER),
backend_(*ctx_, ZMQ_DEALER) { backend_(*ctx_, ZMQ_DEALER) {
workerThreads = 2 * thread::hardware_concurrency();
if (workerThreads == 0) {
workerThreads = 8;
}
if (_checkSignature) { if (_checkSignature) {
CHECK_STATE(!_caCertFile.empty()); CHECK_STATE(!_caCertFile.empty());
ifstream t(_caCertFile); ifstream t(_caCertFile);
...@@ -81,10 +88,10 @@ void ZMQServer::run() { ...@@ -81,10 +88,10 @@ void ZMQServer::run() {
} }
spdlog::info("Creating {} zmq server workers ...", kMaxThread); spdlog::info("Creating {} zmq server workers ...", workerThreads);
try { try {
for (int i = 0; i < kMaxThread; ++i) { for (int i = 0; i < workerThreads; ++i) {
workers.push_back(make_shared<ServerWorker>(*ctx_, ZMQ_DEALER, workers.push_back(make_shared<ServerWorker>(*ctx_, ZMQ_DEALER,
this->checkSignature, this->caCert)); this->checkSignature, this->caCert));
auto th = make_shared<std::thread>(std::bind(&ServerWorker::work, workers[i])); auto th = make_shared<std::thread>(std::bind(&ServerWorker::work, workers[i]));
......
...@@ -42,6 +42,9 @@ using namespace std; ...@@ -42,6 +42,9 @@ using namespace std;
class ZMQServer { class ZMQServer {
uint64_t workerThreads;
public: public:
bool checkSignature = false; bool checkSignature = false;
...@@ -54,9 +57,6 @@ public: ...@@ -54,9 +57,6 @@ public:
ZMQServer(bool _checkSignature, const string& _caCertFile); ZMQServer(bool _checkSignature, const string& _caCertFile);
enum {
kMaxThread = 1
};
void run(); void run();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment