summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Glacier2Lib/Application.cpp59
-rw-r--r--cpp/src/Ice/Application.cpp180
2 files changed, 120 insertions, 119 deletions
diff --git a/cpp/src/Glacier2Lib/Application.cpp b/cpp/src/Glacier2Lib/Application.cpp
index 6a228f7a88a..61307372a95 100644
--- a/cpp/src/Glacier2Lib/Application.cpp
+++ b/cpp/src/Glacier2Lib/Application.cpp
@@ -140,6 +140,7 @@ Glacier2::RestartSessionException::ice_throw() const
Ice::ObjectAdapterPtr
Glacier2::Application::objectAdapter()
{
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
if(!_adapter)
{
// TODO: Depending on the resolution of
@@ -206,9 +207,9 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
{
// Reset internal state variables from Ice.Application. The
// remainder are reset at the end of this method.
- IceInternal::_callbackInProgress = false;
- IceInternal::_destroyed = false;
- IceInternal::_interrupted = false;
+ IceInternal::Application::_callbackInProgress = false;
+ IceInternal::Application::_destroyed = false;
+ IceInternal::Application::_interrupted = false;
bool restart = false;
status = 0;
@@ -216,13 +217,13 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
SessionPingThreadIPtr ping;
try
{
- IceInternal::_communicator = Ice::initialize(args, initData);
+ IceInternal::Application::_communicator = Ice::initialize(args, initData);
_router = Glacier2::RouterPrx::uncheckedCast(communicator()->getDefaultRouter());
if(!_router)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": no glacier2 router configured";
+ out << IceInternal::Application::_appName << ": no glacier2 router configured";
status = 1;
}
else
@@ -230,7 +231,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
//
// The default is to destroy when a signal is received.
//
- if(IceInternal::_signalPolicy == Ice::HandleSignals)
+ if(IceInternal::Application::_signalPolicy == Ice::HandleSignals)
{
destroyOnInterrupt();
}
@@ -244,7 +245,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
catch(const Ice::LocalException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
status = 1;
}
@@ -268,61 +269,61 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
catch(const Ice::ConnectionRefusedException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
restart = true;
}
catch(const Ice::ConnectionLostException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
restart = true;
}
catch(const Ice::UnknownLocalException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
restart = true;
}
catch(const Ice::RequestFailedException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
restart = true;
}
catch(const Ice::TimeoutException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
restart = true;
}
catch(const Ice::LocalException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
status = 1;
}
catch(const std::exception& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": std::exception " << ex;
+ out << IceInternal::Application::_appName << ": std::exception " << ex;
status = 1;
}
catch(const std::string& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": c++ exception " << ex;
+ out << IceInternal::Application::_appName << ": c++ exception " << ex;
status = 1;
}
catch(const char* ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": char* exception " << ex;
+ out << IceInternal::Application::_appName << ": char* exception " << ex;
status = 1;
}
catch(...)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": unknown exception";
+ out << IceInternal::Application::_appName << ": unknown exception";
status = 1;
}
@@ -331,31 +332,31 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
// it would not make sense to release a held signal to run
// shutdown or destroy.
//
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
ignoreInterrupt();
}
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- while(IceInternal::_callbackInProgress)
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ while(IceInternal::Application::_callbackInProgress)
{
- IceInternal::_condVar->wait(lock);
+ IceInternal::Application::_condVar->wait(lock);
}
- if(IceInternal::_destroyed)
+ if(IceInternal::Application::_destroyed)
{
- IceInternal::_communicator = 0;
+ IceInternal::Application::_communicator = 0;
}
else
{
- IceInternal::_destroyed = true;
+ IceInternal::Application::_destroyed = true;
//
// And _communicator != 0, meaning will be destroyed
// next, _destroyed = true also ensures that any
// remaining callback won't do anything
//
}
- IceInternal::_application = 0;
+ IceInternal::Application::_application = 0;
}
if(!ping)
@@ -392,16 +393,16 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
_router = 0;
}
- if(IceInternal::_communicator)
+ if(IceInternal::Application::_communicator)
{
try
{
- IceInternal::_communicator->destroy();
+ IceInternal::Application::_communicator->destroy();
}
catch(const Ice::LocalException& ex)
{
Error out(getProcessLogger());
- out << IceInternal::_appName << ": " << ex;
+ out << IceInternal::Application::_appName << ": " << ex;
status = 1;
}
catch(const exception& ex)
@@ -410,7 +411,7 @@ Glacier2::Application::doMain(Ice::StringSeq& args, const Ice::InitializationDat
out << "unknown exception " << ex;
status = 1;
}
- IceInternal::_communicator = 0;
+ IceInternal::Application::_communicator = 0;
}
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index c7e41882fee..213792b3212 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -25,17 +25,17 @@ using namespace IceUtilInternal;
//
// static initializations.
//
-Mutex* IceInternal::mutex = 0;
+Mutex* IceInternal::Application::mutex = 0;
-bool IceInternal::_callbackInProgress = false;
-bool IceInternal::_destroyed = false;
-bool IceInternal::_interrupted = false;
+bool IceInternal::Application::_callbackInProgress = false;
+bool IceInternal::Application::_destroyed = false;
+bool IceInternal::Application::_interrupted = false;
-string IceInternal::_appName;
-CommunicatorPtr IceInternal::_communicator;
-SignalPolicy IceInternal::_signalPolicy = HandleSignals;
-auto_ptr<Cond> IceInternal::_condVar;
-Ice::Application* IceInternal::_application;
+string IceInternal::Application::_appName;
+CommunicatorPtr IceInternal::Application::_communicator;
+SignalPolicy IceInternal::Application::_signalPolicy = HandleSignals;
+auto_ptr<Cond> IceInternal::Application::_condVar;
+Ice::Application* IceInternal::Application::_application;
//
// _mutex and _condVar are used to synchronize the main thread and
// the CtrlCHandler thread
@@ -50,13 +50,13 @@ public:
Init()
{
- IceInternal::mutex = new IceUtil::Mutex;
+ IceInternal::Application::mutex = new IceUtil::Mutex;
}
~Init()
{
- delete IceInternal::mutex;
- IceInternal::mutex = 0;
+ delete IceInternal::Application::mutex;
+ IceInternal::Application::mutex = 0;
}
};
@@ -103,13 +103,13 @@ holdInterruptCallback(int signal)
{
CtrlCHandlerCallback callback = 0;
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
while(!_released)
{
- IceInternal::_condVar->wait(lock);
+ IceInternal::Application::_condVar->wait(lock);
}
- if(IceInternal::_destroyed)
+ if(IceInternal::Application::_destroyed)
{
//
// Being destroyed by main thread
@@ -130,8 +130,8 @@ static void
destroyOnInterruptCallback(int signal)
{
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- if(IceInternal::_destroyed)
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ if(IceInternal::Application::_destroyed)
{
//
// Being destroyed by main thread
@@ -143,16 +143,16 @@ destroyOnInterruptCallback(int signal)
return;
}
- assert(!IceInternal::_callbackInProgress);
- IceInternal::_callbackInProgress = true;
- IceInternal::_interrupted = true;
- IceInternal::_destroyed = true;
+ assert(!IceInternal::Application::_callbackInProgress);
+ IceInternal::Application::_callbackInProgress = true;
+ IceInternal::Application::_interrupted = true;
+ IceInternal::Application::_destroyed = true;
}
try
{
- assert(IceInternal::_communicator != 0);
- IceInternal::_communicator->destroy();
+ assert(IceInternal::Application::_communicator != 0);
+ IceInternal::Application::_communicator->destroy();
}
catch(const std::exception& ex)
{
@@ -176,18 +176,18 @@ destroyOnInterruptCallback(int signal)
}
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- IceInternal::_callbackInProgress = false;
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ IceInternal::Application::_callbackInProgress = false;
}
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
static void
shutdownOnInterruptCallback(int signal)
{
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- if(IceInternal::_destroyed)
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ if(IceInternal::Application::_destroyed)
{
//
// Being destroyed by main thread
@@ -199,15 +199,15 @@ shutdownOnInterruptCallback(int signal)
return;
}
- assert(!IceInternal::_callbackInProgress);
- IceInternal::_callbackInProgress = true;
- IceInternal::_interrupted = true;
+ assert(!IceInternal::Application::_callbackInProgress);
+ IceInternal::Application::_callbackInProgress = true;
+ IceInternal::Application::_interrupted = true;
}
try
{
- assert(IceInternal::_communicator != 0);
- IceInternal::_communicator->shutdown();
+ assert(IceInternal::Application::_communicator != 0);
+ IceInternal::Application::_communicator->shutdown();
}
catch(const std::exception& ex)
{
@@ -231,18 +231,18 @@ shutdownOnInterruptCallback(int signal)
}
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- IceInternal::_callbackInProgress = false;
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ IceInternal::Application::_callbackInProgress = false;
}
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
static void
callbackOnInterruptCallback(int signal)
{
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- if(IceInternal::_destroyed)
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ if(IceInternal::Application::_destroyed)
{
//
// Being destroyed by main thread
@@ -251,15 +251,15 @@ callbackOnInterruptCallback(int signal)
}
// For SIGHUP the user callback is always called. It can
// decide what to do.
- assert(!IceInternal::_callbackInProgress);
- IceInternal::_callbackInProgress = true;
- IceInternal::_interrupted = true;
+ assert(!IceInternal::Application::_callbackInProgress);
+ IceInternal::Application::_callbackInProgress = true;
+ IceInternal::Application::_interrupted = true;
}
try
{
- assert(IceInternal::_application != 0);
- IceInternal::_application->interruptCallback(signal);
+ assert(IceInternal::Application::_application != 0);
+ IceInternal::Application::_application->interruptCallback(signal);
}
catch(const std::exception& ex)
{
@@ -283,15 +283,15 @@ callbackOnInterruptCallback(int signal)
}
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- IceInternal::_callbackInProgress = false;
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ IceInternal::Application::_callbackInProgress = false;
}
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
Ice::Application::Application(SignalPolicy signalPolicy)
{
- IceInternal::_signalPolicy = signalPolicy;
+ IceInternal::Application::_signalPolicy = signalPolicy;
}
Ice::Application::~Application()
@@ -348,7 +348,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
setProcessLogger(new LoggerI(argv[0], ""));
}
- if(IceInternal::_communicator != 0)
+ if(IceInternal::Application::_communicator != 0)
{
Error out(getProcessLogger());
out << "only one instance of the Application class can be used";
@@ -356,7 +356,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat
}
int status;
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
try
{
@@ -418,27 +418,27 @@ Ice::Application::interruptCallback(int)
const char*
Ice::Application::appName()
{
- return IceInternal::_appName.c_str();
+ return IceInternal::Application::_appName.c_str();
}
CommunicatorPtr
Ice::Application::communicator()
{
- return IceInternal::_communicator;
+ return IceInternal::Application::_communicator;
}
void
Ice::Application::destroyOnInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() == holdInterruptCallback)
{
_released = true;
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
_ctrlCHandler->setCallback(destroyOnInterruptCallback);
}
@@ -453,15 +453,15 @@ Ice::Application::destroyOnInterrupt()
void
Ice::Application::shutdownOnInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() == holdInterruptCallback)
{
_released = true;
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
_ctrlCHandler->setCallback(shutdownOnInterruptCallback);
}
@@ -476,15 +476,15 @@ Ice::Application::shutdownOnInterrupt()
void
Ice::Application::ignoreInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() == holdInterruptCallback)
{
_released = true;
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
_ctrlCHandler->setCallback(0);
}
@@ -499,15 +499,15 @@ Ice::Application::ignoreInterrupt()
void
Ice::Application::callbackOnInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() == holdInterruptCallback)
{
_released = true;
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
_ctrlCHandler->setCallback(callbackOnInterruptCallback);
}
@@ -522,11 +522,11 @@ Ice::Application::callbackOnInterrupt()
void
Ice::Application::holdInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() != holdInterruptCallback)
{
_previousCallback = _ctrlCHandler->getCallback();
@@ -546,11 +546,11 @@ Ice::Application::holdInterrupt()
void
Ice::Application::releaseInterrupt()
{
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
if(_ctrlCHandler != 0)
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex); // we serialize all the interrupt-setting
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex); // we serialize all the interrupt-setting
if(_ctrlCHandler->getCallback() == holdInterruptCallback)
{
//
@@ -562,7 +562,7 @@ Ice::Application::releaseInterrupt()
_released = true;
_ctrlCHandler->setCallback(_previousCallback);
- IceInternal::_condVar->signal();
+ IceInternal::Application::_condVar->signal();
}
// Else nothing to release.
}
@@ -577,8 +577,8 @@ Ice::Application::releaseInterrupt()
bool
Ice::Application::interrupted()
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- return IceInternal::_interrupted;
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ return IceInternal::Application::_interrupted;
}
int
@@ -588,13 +588,13 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
try
{
- if(IceInternal::_condVar.get() == 0)
+ if(IceInternal::Application::_condVar.get() == 0)
{
- IceInternal::_condVar.reset(new Cond);
+ IceInternal::Application::_condVar.reset(new Cond);
}
- IceInternal::_interrupted = false;
- IceInternal::_appName = argv[0] ? argv[0] : "";
+ IceInternal::Application::_interrupted = false;
+ IceInternal::Application::_appName = argv[0] ? argv[0] : "";
//
// We parse the properties here to extract Ice.ProgramName.
@@ -611,19 +611,19 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), ""));
}
- IceInternal::_application = this;
- IceInternal::_communicator = initialize(argc, argv, initData);
- IceInternal::_destroyed = false;
+ IceInternal::Application::_application = this;
+ IceInternal::Application::_communicator = initialize(argc, argv, initData);
+ IceInternal::Application::_destroyed = false;
//
// Used by destroyOnInterruptCallback and shutdownOnInterruptCallback.
//
- _nohup = (IceInternal::_communicator->getProperties()->getPropertyAsInt("Ice.Nohup") > 0);
+ _nohup = (IceInternal::Application::_communicator->getProperties()->getPropertyAsInt("Ice.Nohup") > 0);
//
// The default is to destroy when a signal is received.
//
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
destroyOnInterrupt();
}
@@ -660,38 +660,38 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
// it would not make sense to release a held signal to run
// shutdown or destroy.
//
- if(IceInternal::_signalPolicy == HandleSignals)
+ if(IceInternal::Application::_signalPolicy == HandleSignals)
{
ignoreInterrupt();
}
{
- IceUtil::Mutex::Lock lock(*IceInternal::mutex);
- while(IceInternal::_callbackInProgress)
+ IceUtil::Mutex::Lock lock(*IceInternal::Application::mutex);
+ while(IceInternal::Application::_callbackInProgress)
{
- IceInternal::_condVar->wait(lock);
+ IceInternal::Application::_condVar->wait(lock);
}
- if(IceInternal::_destroyed)
+ if(IceInternal::Application::_destroyed)
{
- IceInternal::_communicator = 0;
+ IceInternal::Application::_communicator = 0;
}
else
{
- IceInternal::_destroyed = true;
+ IceInternal::Application::_destroyed = true;
//
// And _communicator != 0, meaning will be destroyed
// next, _destroyed = true also ensures that any
// remaining callback won't do anything
//
}
- IceInternal::_application = 0;
+ IceInternal::Application::_application = 0;
}
- if(IceInternal::_communicator != 0)
+ if(IceInternal::Application::_communicator != 0)
{
try
{
- IceInternal::_communicator->destroy();
+ IceInternal::Application::_communicator->destroy();
}
catch(const std::exception& ex)
{
@@ -705,7 +705,7 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initi
out << "unknown exception";
status = EXIT_FAILURE;
}
- IceInternal::_communicator = 0;
+ IceInternal::Application::_communicator = 0;
}
return status;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 17:09:43 +0000