Add two parameterized constructors of Timer for specifying the main context

Normally, a Timer object will be used within a main context,
thus it is OK to create a Timer without specifying the main context.
However, in the case that a service creates more threads,
this parameterized constructors would be convenient.

Change-Id: I835d56f220de2afc1f364ea7c816f74cd11610ce
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/include/ServiceBase.h b/include/ServiceBase.h
index 1274db0..b9532ff 100644 (file)
--- a/include/ServiceBase.h
+++ b/include/ServiceBase.h
@@ -43,6 +43,8 @@ namespace ctx {
                // If the GVariant 'param' is floating, it is consumed.
                void publish(const std::string& busName, const std::string& signalName, GVariant* param);
 
+               GMainContext* getMainContext();
+
                GDBusConnection* getConnection();
 
                static uid_t getActiveUser();

diff --git a/include/Timer.h b/include/Timer.h
index 3cb867f..3e0d019 100644 (file)
--- a/include/Timer.h
+++ b/include/Timer.h
@@ -22,12 +22,15 @@
 
 namespace ctx {
 
+       class ServiceBase;
        class ITimerListener;
 
        /* All timers expire in the context where the Timer object is created. */
        class EXPORT_API Timer {
        public:
                Timer();
+               Timer(ServiceBase* hostService);
+               Timer(GMainContext* mainContext);
                ~Timer();
 
                /* This is a helper function that chooses and executes one of the below three functions. */

diff --git a/src/server/ServiceBase.cpp b/src/server/ServiceBase.cpp
index 4a24920..2a8585d 100644 (file)
--- a/src/server/ServiceBase.cpp
+++ b/src/server/ServiceBase.cpp
@@ -46,6 +46,11 @@ ServiceBase::~ServiceBase()
 {
 }
 
+GMainContext* ServiceBase::getMainContext()
+{
+       return __mainContext;
+}
+
 GDBusConnection* ServiceBase::getConnection()
 {
        return __connection;

diff --git a/src/server/Timer.cpp b/src/server/Timer.cpp
index 90217e7..7256509 100644 (file)
--- a/src/server/Timer.cpp
+++ b/src/server/Timer.cpp
@@ -16,6 +16,7 @@
 
 #include <atomic>
 #include <alarm.h>
+#include <ServiceBase.h>
 #include <ITimerListener.h>
 #include <Timer.h>
 
@@ -48,6 +49,18 @@ Timer::Timer() :
 {
 }
 
+Timer::Timer(GMainContext* mainContext) :
+       __context(mainContext)
+{
+       if (__context)
+               g_main_context_ref(__context);
+}
+
+Timer::Timer(ServiceBase* hostService) :
+       Timer(hostService->getMainContext())
+{
+}
+
 Timer::~Timer()
 {
        cancelAll();