Skip to content

add try/catch around zmq poll in ServiceDiscovery, and bugfix in Services #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brichards64 merged 3 commits into from
Jul 30, 2025
Merged

add try/catch around zmq poll in ServiceDiscovery, and bugfix in Services #44

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62f0b2f
put service discovery zmq polls in try/catch as sending signals to pa…
superkanalysis May 7, 2025
e300b23
bugfix; middleman version response no longer has quotes
superkanalysis May 7, 2025
931d010
Merge branch 'main' into main
brichards64 Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 49 additions & 12 deletions src/ServiceDiscovery/ServiceDiscovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,13 @@ void* ServiceDiscovery::MulticastPublishThread(void* arg){

while(running){

zmq::poll(&items [0], 2, 1000);
try{
zmq::poll(&items [0], 2, 1000);
} catch(zmq::error_t& err){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}

if ((items [0].revents & ZMQ_POLLIN) && running) {

Expand Down Expand Up @@ -292,15 +298,27 @@ void* ServiceDiscovery::MulticastPublishThread(void* arg){

zmq::message_t Esend(command.length()+1);
snprintf ((char *) Esend.data(), command.length()+1 , "%s" ,command.c_str()) ;

zmq::poll(out,1,1000);


try{
zmq::poll(out,1,1000);
} catch(zmq::error_t& err){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}

if(out[0].revents & ZMQ_POLLOUT){
StatusCheck.send(Esend);


//std::cout<<"waiting for message "<<std::endl;
zmq::poll(in,1,1000);
try{
zmq::poll(in,1,1000);
} catch(zmq::error_t& err){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}

if(in[0].revents & ZMQ_POLLIN){
zmq::message_t Ereceive;
StatusCheck.recv (&Ereceive);
Expand Down Expand Up @@ -532,8 +550,14 @@ void* ServiceDiscovery::MulticastListenThread(void* arg){

while(running){

// zmq::poll (&items[0], sock.size()+1, 1000);
zmq::poll (items.data(), items.size(), 1000);
try {
//zmq::poll (&items[0], sock.size()+1, 1000);
zmq::poll (&items [0], items.size(), 1000);
} catch(zmq::error_t& e){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}

for(size_t i =0; i < sock.size(); i++){
if ((items.at(i+1).revents & ZMQ_POLLIN) && running) {
Expand Down Expand Up @@ -709,8 +733,15 @@ void* ServiceDiscovery::MulticastListenThread(void* arg){
*(it->second)>>service;
zmq::message_t send(service.length()+1);
snprintf ((char *) send.data(), service.length()+1 , "%s" ,service.c_str()) ;

zmq::poll(out,1,1000);

try{
zmq::poll(out,1,1000);
} catch(zmq::error_t& err){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}


if(out[0].revents & ZMQ_POLLOUT) Ireceive.send(send);
}
Expand All @@ -736,8 +767,14 @@ void* ServiceDiscovery::MulticastListenThread(void* arg){
*(it->second)>>service;
zmq::message_t send(service.length()+1);
snprintf ((char *) send.data(), service.length()+1 , "%s" ,service.c_str()) ;

zmq::poll(out,1,1000);

try{
zmq::poll(out,1,1000);
} catch(zmq::error_t& err){
// ignore poll aborting due to signals
if(zmq_errno()==EINTR) continue;
throw;
}

if(out[0].revents & ZMQ_POLLOUT) Ireceive.send(send);
}
Expand Down