summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Activator.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-09-06 15:43:45 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-09-06 15:44:35 +0200
commit550ae394d7e3f69f89684284859aa905f99789f1 (patch)
treed51935b04bb57cd4076450876be608f2b8c8b46a /cpp/src/IceGrid/Activator.cpp
parentNetworkProxy warnings running with python_d - Close #443 (diff)
downloadice-550ae394d7e3f69f89684284859aa905f99789f1.tar.bz2
ice-550ae394d7e3f69f89684284859aa905f99789f1.tar.xz
ice-550ae394d7e3f69f89684284859aa905f99789f1.zip
Fixed IceGrid locking issue, fixes #503
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
-rw-r--r--cpp/src/IceGrid/Activator.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index 9a9fb38af2b..6f4ce63d1ea 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -156,6 +156,14 @@ signalToString(int signal)
{
return ICE_STRING(SIGALRM);
}
+ case SIGCONT:
+ {
+ return ICE_STRING(SIGCONT);
+ }
+ case SIGSTOP:
+ {
+ return ICE_STRING(SIGSTOP);
+ }
#endif
case SIGKILL:
{
@@ -230,6 +238,14 @@ stringToSignal(const string& str)
{
return SIGALRM;
}
+ else if(str == ICE_STRING(SIGCONT))
+ {
+ return SIGCONT;
+ }
+ else if(str == ICE_STRING(SIGSTOP))
+ {
+ return SIGSTOP;
+ }
else
#endif
if(str == ICE_STRING(SIGKILL))