Fix service and mainloop prepare logic

Change-Id: Iea76c91e992e28271e36b015a0e3c453c157e4ea
Signed-off-by: seolheui kim <s414.kim@samsung.com>

diff --git a/include/klay/rmi/service.h b/include/klay/rmi/service.h
index b5158f79b56c84d83bd27efa2c0288ea3e1df6c0..013cab129ca823bac43247489e9d13fd166df40b 100644 (file)
--- a/include/klay/rmi/service.h
+++ b/include/klay/rmi/service.h
@@ -201,6 +201,8 @@ private:
                Credentials credentials;
        };
 
+       void prepare(bool activation);
+
        typedef std::list<std::shared_ptr<Connection>> ConnectionRegistry;
        typedef std::function<void(const std::shared_ptr<Connection>& connection)> CallbackDispatcher;
 
@@ -240,6 +242,7 @@ private:
        std::mutex methodRegistryLock;
 
        static thread_local ProcessingContext processingContext;
+       std::unique_ptr<Socket> socket;
 };
 
 template<typename Type, typename... Args>

diff --git a/src/mainloop.cpp b/src/mainloop.cpp
index 9272247fba3e1269d1a29cbcda227ca48ad05b8f..92321ea54747ea9feeff29b53b1933b61332a01d 100644 (file)
--- a/src/mainloop.cpp
+++ b/src/mainloop.cpp
@@ -38,6 +38,8 @@ Mainloop::Mainloop() :
        if (pollFd == -1) {
                throw Exception(GetSystemErrorMessage());
        }
+
+       prepare();
 }
 
 Mainloop::~Mainloop()
@@ -141,8 +143,6 @@ void Mainloop::run(int timeout)
        bool done = false;
        stopped = false;
 
-       prepare();
-
        while (!stopped && !done) {
                done = !dispatch(timeout);
        }

diff --git a/src/rmi/service.cpp b/src/rmi/service.cpp
index 22d17a3a09dfa672a9b3a3cfc9e84cfb261a8d82..e53030fcf132c09b1397e35dda595735ea2e2563 100644 (file)
--- a/src/rmi/service.cpp
+++ b/src/rmi/service.cpp
@@ -46,18 +46,23 @@ Service::~Service()
 {
 }
 
-void Service::start(bool activation, int timeout)
+void Service::prepare(bool activation)
 {
-       Socket socket(Socket::create(address, activation));
-
+       socket.reset(new Socket(Socket::create(address, activation)));
        auto accept = [&](int fd, runtime::Mainloop::Event event) {
-               onNewConnection(std::make_shared<Connection>(socket.accept()));
+               onNewConnection(std::make_shared<Connection>(socket->accept()));
        };
 
-       mainloop.addEventSource(socket.getFd(),
+       mainloop.addEventSource(socket->getFd(),
                                                        EPOLLIN | EPOLLHUP | EPOLLRDHUP,
                                                        accept);
+}
 
+void Service::start(bool activation, int timeout)
+{
+       if (socket == nullptr) {
+               prepare(activation);
+       }
        mainloop.run(timeout);
 }