EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

putme/monitorme return 1 on timeout

Browse Source
This commit is contained in:
Michael Davidsaver
2017-09-06 09:52:30 -05:00
parent 54914b7fbf
commit e9c4959dba
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/monitorme.cpp
View File

@ -260,6 +260,7 @@ int main(int argc, char *argv[]) {
monitors.push_back(mon);
}
int ret = 0;
{
Guard G(mutex);
while(waitingFor) {
@ -268,6 +269,7 @@ int main(int argc, char *argv[]) {
done.wait();
} else if(!done.wait(waitTime)) {
std::cerr<<"Timeout\n";
ret = 1;
break; // timeout
}
}
@ -281,10 +283,10 @@ int main(int argc, char *argv[]) {
refmon.current();
}
monwork.close();
return ret;
} catch(std::exception& e){
std::cout<<"Error: "<<e.what()<<"\n";
return 1;
return 2;
}
monwork.close();
return 0;
}

6
examples/putme.cpp
View File

@ -212,6 +212,7 @@ int main(int argc, char *argv[]) {
signal(SIGQUIT, alldone);
#endif
int ret = 0;
{
Guard G(mutex);
while(waitingFor) {
@ -220,16 +221,17 @@ int main(int argc, char *argv[]) {
done.wait();
} else if(!done.wait(waitTime)) {
std::cerr<<"Timeout\n";
ret = 1;
break; // timeout
}
}
}
return ret;
} catch(std::exception& e){
PRINT_EXCEPTION(e);
std::cerr<<"Error: "<<e.what()<<"\n";
return 1;
return 2;
}
return 0;
}