Skip to content

GitLab

Commit d3bba28e authored by legoc's avatar legoc
Browse files

Changed the implementation of the static instance of This, 

This::terminate() is not required anymore.
parent 7bc2b539
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ d3bba28e
......@@ -7,4 +7,5 @@
* Added InvalidArgumentException to replace invalid_argument exception.
* Added SocketException thrown when the Server connect fails.
* Renamed ERROR into FAILURE.
* Implementation of unmanaged applications.
\ No newline at end of file
* Implementation of unmanaged applications.
* Implemented This static instance without pointer so that it is not necessary to call This::terminate() except if the destruction of the static instance is not automatic.
\ No newline at end of file
src/cameo/Application.cpp
View file @ d3bba28e
......@@ -46,7 +46,7 @@ using namespace std;
namespace cameo {
namespace application {
This * This::m_instance = 0;
This This::m_instance;
const std::string This::RUNNING_STATE = "RUNNING";
State This::parseState(const std::string& value) {
......@@ -77,13 +77,13 @@ State This::parseState(const std::string& value) {
}
void This::init(int argc, char *argv[]) {
if (m_instance == 0) {
m_instance = new This(argc, argv);
if (m_instance.m_impl == 0) {
m_instance.initApplication(argc, argv);
}
}
std::string This::getReference() {
if (m_instance != 0) {
if (m_instance.m_impl != 0) {
ostringstream os;
os << getName() << "." << getId() << "@" << getEndpoint();
return os.str();
......@@ -92,19 +92,34 @@ std::string This::getReference() {
}
void This::terminate() {
// Tell the cameo server that the application is terminated if it is unmanaged.
if (!m_instance->m_managed) {
m_instance->terminateUnmanagedApplication();
// Test if termination is already done.
if (m_instance.m_impl == 0) {
return;
}
// Terminate the unmanaged application.
if (!m_instance.m_managed) {
m_instance.terminateUnmanagedApplication();
}
delete m_instance;
// Terminate the services.
m_instance.Services::terminate();
// Ensure that it won't be done twice.
m_instance.m_impl = 0;
}
This::This(int argc, char *argv[]) :
This::This() :
Services(),
m_impl(0),
m_id(-1),
m_managed(false),
m_starterId(0) {
}
void This::initApplication(int argc, char *argv[]) {
m_impl = new ApplicationImpl();
Services::setImpl(m_impl);
......@@ -180,59 +195,64 @@ This::This(int argc, char *argv[]) :
This::~This() {
// Do not delete the impl here because there will be order trouble.
// Terminate the unmanaged application.
if (m_impl != 0 && !m_managed) {
terminateUnmanagedApplication();
}
}
const std::string& This::getName() {
return m_instance->m_name;
return m_instance.m_name;
}
int This::getId() {
return m_instance->m_id;
return m_instance.m_id;
}
void This::setTimeout(int timeout) {
m_instance->Services::setTimeout(timeout);
m_instance.Services::setTimeout(timeout);
}
int This::getTimeout() {
return m_instance->Services::getTimeout();
return m_instance.Services::getTimeout();
}
const std::string& This::getEndpoint() {
if (m_instance != 0) {
return m_instance->m_serverEndpoint;
if (m_instance.m_impl != 0) {
return m_instance.m_serverEndpoint;
}
static string result;
return result;
}
Server& This::getServer() {
return *m_instance->m_server;
return *m_instance.m_server;
}
Server& This::getStarterServer() {
if (m_instance->m_starterServer.get() == 0) {
if (m_instance.m_starterServer.get() == 0) {
throw StarterServerException();
}
return *m_instance->m_starterServer;
return *m_instance.m_starterServer;
}
const std::string& This::getUrl() {
return m_instance->Services::getUrl();
return m_instance.Services::getUrl();
}
bool This::isAvailable(int timeout) {
return m_instance->Services::isAvailable(timeout);
return m_instance.Services::isAvailable(timeout);
}
bool This::isStopping() {
return m_instance->getState(m_instance->m_id) == STOPPING;
return m_instance.getState(m_instance.m_id) == STOPPING;
}
void This::cancelWaitings() {
m_instance->m_waitingSet->cancelAll();
m_instance.m_waitingSet->cancelAll();
}
int This::initUnmanagedApplication() {
......@@ -261,9 +281,9 @@ void This::terminateUnmanagedApplication() {
bool This::setRunning() {
string strRequestType = m_instance->m_impl->createRequest(PROTO_SETSTATUS);
string strRequestData = m_instance->m_impl->createSetStatusRequest(m_instance->m_id, RUNNING);
zmq::message_t* reply = m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, m_instance->m_serverEndpoint);
string strRequestType = m_instance.m_impl->createRequest(PROTO_SETSTATUS);
string strRequestData = m_instance.m_impl->createSetStatusRequest(m_instance.m_id, RUNNING);
zmq::message_t* reply = m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, m_instance.m_serverEndpoint);
proto::RequestResponse requestResponse;
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
......@@ -278,10 +298,10 @@ bool This::setRunning() {
void This::setBinaryResult(const std::string& data) {
string strRequestType = m_instance->m_impl->createRequest(PROTO_SETRESULT);
string strRequestData = m_instance->m_impl->createSetResultRequest(m_instance->m_id, data);
string strRequestType = m_instance.m_impl->createRequest(PROTO_SETRESULT);
string strRequestData = m_instance.m_impl->createSetResultRequest(m_instance.m_id, data);
zmq::message_t* reply = m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, m_instance->m_serverEndpoint);
zmq::message_t* reply = m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, m_instance.m_serverEndpoint);
proto::RequestResponse requestResponse;
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -409,15 +429,15 @@ State This::waitForStop() {
std::auto_ptr<Instance> This::connectToStarter() {
if (m_instance->m_starterServer.get() == 0) {
if (m_instance.m_starterServer.get() == 0) {
return auto_ptr<Instance>(0);
}
// Iterate the instances to find the id
InstanceArray instances = m_instance->m_starterServer->connectAll(m_instance->m_starterName);
InstanceArray instances = m_instance.m_starterServer->connectAll(m_instance.m_starterName);
for (int i = 0; i < instances.size(); i++) {
if (instances[i]->getId() == m_instance->m_starterId) {
if (instances[i]->getId() == m_instance.m_starterId) {
return auto_ptr<Instance>(instances[i]);
}
}
......@@ -426,7 +446,7 @@ std::auto_ptr<Instance> This::connectToStarter() {
}
void This::handleStopImpl(StopFunctionType function) {
m_impl->handleStop(m_instance, function);
m_impl->handleStop(&m_instance, function);
}
///////////////////////////////////////////////////////////////////////////////
......@@ -728,10 +748,10 @@ Publisher::~Publisher() {
std::auto_ptr<Publisher> Publisher::create(const std::string& name, int numberOfSubscribers) {
string strRequestType = This::m_instance->m_impl->createRequest(PROTO_CREATEPUBLISHER);
string strRequestData = This::m_instance->m_impl->createCreatePublisherRequest(This::m_instance->m_id, name, numberOfSubscribers);
string strRequestType = This::m_instance.m_impl->createRequest(PROTO_CREATEPUBLISHER);
string strRequestData = This::m_instance.m_impl->createCreatePublisherRequest(This::m_instance.m_id, name, numberOfSubscribers);
zmq::message_t* reply = This::m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance->m_serverEndpoint);
zmq::message_t* reply = This::m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance.m_serverEndpoint);
proto::PublisherResponse requestResponse;
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -742,7 +762,7 @@ std::auto_ptr<Publisher> Publisher::create(const std::string& name, int numberOf
}
int synchronizerPort = requestResponse.synchronizerport();
return auto_ptr<Publisher>(new Publisher(This::m_instance, publisherPort, synchronizerPort, name, numberOfSubscribers));
return auto_ptr<Publisher>(new Publisher(&This::m_instance, publisherPort, synchronizerPort, name, numberOfSubscribers));
}
......@@ -943,10 +963,10 @@ std::auto_ptr<Responder> Responder::create(const std::string& name) {
string portName = ResponderImpl::RESPONDER_PREFIX + name;
string strRequestType = This::m_instance->m_impl->createRequest(PROTO_REQUESTPORT);
string strRequestData = This::m_instance->m_impl->createRequestPortRequest(This::m_instance->m_id, portName);
string strRequestType = This::m_instance.m_impl->createRequest(PROTO_REQUESTPORT);
string strRequestData = This::m_instance.m_impl->createRequestPortRequest(This::m_instance.m_id, portName);
zmq::message_t* reply = This::m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance->m_serverEndpoint);
zmq::message_t* reply = This::m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance.m_serverEndpoint);
proto::RequestResponse requestResponse;
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -956,7 +976,7 @@ std::auto_ptr<Responder> Responder::create(const std::string& name) {
throw ResponderCreationException(requestResponse.message());
}
return auto_ptr<Responder>(new Responder(This::m_instance, responderPort, name));
return auto_ptr<Responder>(new Responder(&This::m_instance, responderPort, name));
}
const std::string& Responder::getName() const {
......@@ -1002,10 +1022,10 @@ std::auto_ptr<Requester> Requester::create(Instance & instance, const std::strin
string responderPortName = ResponderImpl::RESPONDER_PREFIX + name;
string requesterPortName = RequesterImpl::REQUESTER_PREFIX + name;
string strRequestType = This::m_instance->m_impl->createRequest(PROTO_CONNECTPORT);
string strRequestData = This::m_instance->m_impl->createConnectPortRequest(responderId, responderPortName);
string strRequestType = This::m_instance.m_impl->createRequest(PROTO_CONNECTPORT);
string strRequestData = This::m_instance.m_impl->createConnectPortRequest(responderId, responderPortName);
zmq::message_t* reply = This::m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, responderEndpoint);
zmq::message_t* reply = This::m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, responderEndpoint);
proto::RequestResponse requestResponse;
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -1016,7 +1036,7 @@ std::auto_ptr<Requester> Requester::create(Instance & instance, const std::strin
instance.waitFor(0, responderPortName);
// Retry to connect.
reply = This::m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, responderEndpoint);
reply = This::m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, responderEndpoint);
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -1027,10 +1047,10 @@ std::auto_ptr<Requester> Requester::create(Instance & instance, const std::strin
}
// Request a requester port
strRequestType = This::m_instance->m_impl->createRequest(PROTO_REQUESTPORT);
strRequestData = This::m_instance->m_impl->createRequestPortRequest(This::m_instance->m_id, requesterPortName);
strRequestType = This::m_instance.m_impl->createRequest(PROTO_REQUESTPORT);
strRequestData = This::m_instance.m_impl->createRequestPortRequest(This::m_instance.m_id, requesterPortName);
reply = This::m_instance->m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance->m_serverEndpoint);
reply = This::m_instance.m_impl->tryRequestWithOnePartReply(strRequestType, strRequestData, This::m_instance.m_serverEndpoint);
requestResponse.ParseFromArray((*reply).data(), (*reply).size());
delete reply;
......@@ -1039,7 +1059,7 @@ std::auto_ptr<Requester> Requester::create(Instance & instance, const std::strin
throw RequesterCreationException(requestResponse.message());
}
return auto_ptr<Requester>(new Requester(This::m_instance, responderUrl, requesterPort, responderPort, name));
return auto_ptr<Requester>(new Requester(&This::m_instance, responderUrl, requesterPort, responderPort, name));
}
const std::string& Requester::getName() const {
......
src/cameo/Application.h
View file @ d3bba28e
......@@ -96,7 +96,14 @@ class This : private Services {
typedef boost::function<void ()> StopFunctionType;
public:
This();
~This();
static void init(int argc, char *argv[]);
/**
* The terminate call is not necessary unless the static instance of This is not destroyed automatically.
*/
static void terminate();
static const std::string& getName();
......@@ -116,7 +123,7 @@ public:
template<typename Type>
static void handleStop(Type function) {
m_instance->handleStopImpl(function);
m_instance.handleStopImpl(function);
}
static void cancelWaitings();
......@@ -139,8 +146,7 @@ public:
static std::auto_ptr<Instance> connectToStarter();
private:
This(int argc, char *argv[]);
~This();
void initApplication(int argc, char *argv[]);
static std::string getReference();
static State parseState(const std::string& value);
......@@ -168,7 +174,7 @@ private:
std::auto_ptr<WaitingImplSet> m_waitingSet;
static This * m_instance;
static This m_instance;
static const std::string RUNNING_STATE;
};
......
src/cameo/Services.cpp
View file @ d3bba28e
......@@ -36,7 +36,12 @@ Services::Services() :
Services::~Services() {
// Delete impl here to avoid order troubles.
terminate();
}
void Services::terminate() {
delete m_impl;
m_impl = 0;
}
void Services::setImpl(ServicesImpl * impl) {
......
src/cameo/Services.h
View file @ d3bba28e
......@@ -31,6 +31,8 @@ public:
Services();
~Services();
void terminate();
void setImpl(ServicesImpl * impl);
std::vector<std::string> split(const std::string& info);
......
src/cameo/impl/GenericWaitingImpl.cpp
View file @ d3bba28e
......@@ -29,16 +29,16 @@ GenericWaitingImpl::GenericWaitingImpl(GenericWaitingImpl::Function function)
: m_function(function) {
// Add the object in the waiting set if This exists.
if (application::This::m_instance != 0) {
application::This::m_instance->m_waitingSet->add(this);
if (application::This::m_instance.m_impl != 0) {
application::This::m_instance.m_waitingSet->add(this);
}
}
GenericWaitingImpl::~GenericWaitingImpl() {
// Remove the object in the waiting set if This exists.
if (application::This::m_instance != 0) {
application::This::m_instance->m_waitingSet->remove(this);
if (application::This::m_instance.m_impl != 0) {
application::This::m_instance.m_waitingSet->remove(this);
}
}
......
src/cameo/impl/SocketWaitingImpl.cpp
View file @ d3bba28e
......@@ -28,16 +28,16 @@ SocketWaitingImpl::SocketWaitingImpl(std::auto_ptr<zmq::socket_t>& socket, const
m_socket(socket), m_message(message) {
// Add the object in the waiting set if This exists.
if (application::This::m_instance != 0) {
application::This::m_instance->m_waitingSet->add(this);
if (application::This::m_instance.m_impl != 0) {
application::This::m_instance.m_waitingSet->add(this);
}
}
SocketWaitingImpl::~SocketWaitingImpl() {
// Remove the object in the waiting set if This exists.
if (application::This::m_instance != 0) {
application::This::m_instance->m_waitingSet->remove(this);
if (application::This::m_instance.m_impl != 0) {
application::This::m_instance.m_waitingSet->remove(this);
}
m_socket->close();
......
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