Add GMainloop support in mainloop for CAPI and DBus

Change-Id: Icd994077552c7e2a6a8be9f69dad965ea0e5704e
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 217c646..cb76978 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -53,6 +53,7 @@ ADD_LIBRARY(${PROJECT_NAME} STATIC ${COMMON_SOURCES})
 PKG_CHECK_MODULES(COMMON_DEPS REQUIRED  libxml-2.0
                                         sqlite3
                                         libsmack
+                                        gio-2.0
 )
 
 INCLUDE_DIRECTORIES(SYSTEM  ${DPM_COMMON}

diff --git a/common/mainloop.cpp b/common/mainloop.cpp
index 408e93b..5ecb608 100644 (file)
--- a/common/mainloop.cpp
+++ b/common/mainloop.cpp
@@ -14,12 +14,12 @@
  *  limitations under the License
  */
 
-#include <sys/epoll.h>
-#include <string.h>
+#include <cstring>
+#include <iostream>
 #include <unistd.h>
 #include <assert.h>
-
-#include <iostream>
+#include <gio/gio.h>
+#include <sys/epoll.h>
 
 #include "error.h"
 #include "exception.h"
@@ -29,6 +29,17 @@
 
 namespace runtime {
 
+namespace {
+
+gboolean GIOCallback(GIOChannel* channel, GIOCondition condition, void *data)
+{
+    Mainloop* mainloop = reinterpret_cast<Mainloop*>(data);
+    mainloop->dispatch(-1);
+    return TRUE;
+}
+
+} // namespace
+
 Mainloop::Mainloop() :
     pollFd(::epoll_create1(EPOLL_CLOEXEC)),
     stopped(false)
@@ -123,7 +134,7 @@ void Mainloop::stop()
     wakeupSignal.send();
 }
 
-void Mainloop::run()
+void Mainloop::prepare()
 {
     auto wakeupMainloop = [this](int fd, Mainloop::Event event) {
         wakeupSignal.receive();
@@ -132,9 +143,29 @@ void Mainloop::run()
     };
 
     addEventSource(wakeupSignal.getFd(), EPOLLIN, wakeupMainloop);
+}
+
+void Mainloop::run(bool useGMainloop)
+{
+    prepare();
+
+    if (useGMainloop) {
+        GIOChannel* channel;
+        channel = g_io_channel_unix_new(pollFd);
+        if (channel == NULL) {
+            std::cout << "GMAINLOOP CHANNEL ALLOC FAILED" << std::endl;
+            return;
+        }
+        g_io_add_watch(channel, (GIOCondition)(G_IO_IN|G_IO_HUP), GIOCallback, this);
+        g_io_channel_unref(channel);
 
-    while (!stopped) {
-        dispatch(-1);
+        while (!stopped) {
+            g_main_iteration(TRUE);
+        }
+    } else {
+        while (!stopped) {
+            dispatch(-1);
+        }
     }
 }
 

diff --git a/common/mainloop.h b/common/mainloop.h
index 7b9e752..781578b 100644 (file)
--- a/common/mainloop.h
+++ b/common/mainloop.h
@@ -41,7 +41,7 @@ public:
     void addEventSource(const int fd, const Event events, Callback&& callback);
     void removeEventSource(const int fd);
     bool dispatch(const int timeout);
-    void run();
+    void run(bool useGMainloop = false);
     void stop();
 
 private:
@@ -52,6 +52,8 @@ private:
     int pollFd;
     std::atomic<bool> stopped;
     runtime::EventFD wakeupSignal;
+
+    void prepare();
 };
 
 } // namespace runtime

diff --git a/common/rmi/service.cpp b/common/rmi/service.cpp
index 7170ed2..52cae3a 100644 (file)
--- a/common/rmi/service.cpp
+++ b/common/rmi/service.cpp
@@ -39,7 +39,7 @@ Service::~Service()
 {
 }
 
-void Service::start()
+void Service::start(bool useGMainloop)
 {
     Socket socket(Socket::create(address));
 
@@ -50,7 +50,8 @@ void Service::start()
     mainloop.addEventSource(socket.getFd(),
                             EPOLLIN | EPOLLHUP | EPOLLRDHUP,
                             accept);
-    mainloop.run();
+
+    mainloop.run(useGMainloop);
 }
 
 void Service::stop()

diff --git a/common/rmi/service.h b/common/rmi/service.h
index 4ebbeda..8b1163a 100644 (file)
--- a/common/rmi/service.h
+++ b/common/rmi/service.h
@@ -73,7 +73,7 @@ public:
     Service(const Service&) = delete;
     Service& operator=(const Service&) = delete;
 
-    void start();
+    void start(bool useGMainloop = false);
     void stop();
 
     void setNewConnectionCallback(const ConnectionCallback& callback);

diff --git a/server/server.cpp b/server/server.cpp
index 63a997c..61ffdd9 100644 (file)
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -39,7 +39,7 @@ Server::~Server()
 void Server::run()
 {
     // Prepare execution environment
-    service->start();
+    service->start(true);
 }
 
 void Server::terminate()