From: Mu-Woong Lee Date: Fri, 5 Feb 2016 05:42:49 +0000 (+0900) Subject: Replace dbus_server with DBusSignalWatcher X-Git-Tag: accepted/tizen/ivi/20160218.023342^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c58ccaeea61e8e11c9b289c183d3b27ed64d4862;p=platform%2Fcore%2Fcontext%2Fcontext-provider.git Replace dbus_server with DBusSignalWatcher Change-Id: I39d5490d8899fe8311ff36aa63b75e927bb7d6f8 Signed-off-by: Mu-Woong Lee --- diff --git a/src/device/social/email.cpp b/src/device/social/email.cpp index c7c8ea5..90a4efb 100644 --- a/src/device/social/email.cpp +++ b/src/device/social/email.cpp @@ -19,13 +19,13 @@ #include #include "social_types.h" -#include #include "email.h" GENERATE_PROVIDER_COMMON_IMPL(social_status_email); ctx::social_status_email::social_status_email() : dbus_signal_id(-1) + , __dbusWatcher(DBusType::SESSION) { } @@ -47,7 +47,7 @@ void ctx::social_status_email::submit_trigger_item() NULL); } -void ctx::social_status_email::on_signal_received(const char* sender, const char* path, const char* iface, const char* name, GVariant* param) +void ctx::social_status_email::onSignal(const char* sender, const char* path, const char* iface, const char* name, GVariant* param) { gint sub_type = 0; gint gi1 = 0; @@ -75,7 +75,7 @@ void ctx::social_status_email::on_signal_received(const char* sender, const char int ctx::social_status_email::subscribe() { - dbus_signal_id = ctx::dbus_server::subscribe_session_signal(NULL, NULL, "User.Email.NetworkStatus", "email", this); + dbus_signal_id = __dbusWatcher.watch(NULL, NULL, "User.Email.NetworkStatus", "email", this); IF_FAIL_RETURN_TAG(dbus_signal_id >= 0, ERR_OPERATION_FAILED, _E, "Email dbus signal subscription failed"); return ERR_NONE; } @@ -83,6 +83,6 @@ int ctx::social_status_email::subscribe() int ctx::social_status_email::unsubscribe() { - ctx::dbus_server::unsubscribe_session_signal(dbus_signal_id); + __dbusWatcher.unwatch(dbus_signal_id); return ERR_NONE; } diff --git a/src/device/social/email.h b/src/device/social/email.h index cbfc671..930da24 100644 --- a/src/device/social/email.h +++ b/src/device/social/email.h @@ -17,24 +17,25 @@ #ifndef _CONTEXT_SOCIAL_STATUS_EMAIL_H_ #define _CONTEXT_SOCIAL_STATUS_EMAIL_H_ -#include +#include #include "../provider_base.h" namespace ctx { - class social_status_email : public device_provider_base, public dbus_listener_iface { + class social_status_email : public device_provider_base, public IDBusSignalListener { GENERATE_PROVIDER_COMMON_DECL(social_status_email); public: int subscribe(); int unsubscribe(); - void on_signal_received(const char* sender, const char* path, const char* iface, const char* name, GVariant* param); + void onSignal(const char *sender, const char *path, const char *iface, const char *name, GVariant *param); static bool is_supported(); static void submit_trigger_item(); private: int64_t dbus_signal_id; + DBusSignalWatcher __dbusWatcher; social_status_email(); ~social_status_email(); diff --git a/src/statistics/app/active_window_monitor.cpp b/src/statistics/app/active_window_monitor.cpp index ee7ea66..58b0d9f 100644 --- a/src/statistics/app/active_window_monitor.cpp +++ b/src/statistics/app/active_window_monitor.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "app_stats_types.h" #include "active_window_monitor.h" @@ -33,6 +32,7 @@ ctx::app_use_monitor::app_use_monitor() : signal_id(-1) , last_cleanup_time(0) + , __dbusWatcher(DBusType::SYSTEM) { start_logging(); } @@ -44,8 +44,7 @@ ctx::app_use_monitor::~app_use_monitor() bool ctx::app_use_monitor::start_logging() { - signal_id = dbus_server::subscribe_system_signal(NULL, - "/Org/Tizen/Aul/AppStatus", "org.tizen.aul.AppStatus", "AppStatusChange", this); + signal_id = __dbusWatcher.watch(NULL, "/Org/Tizen/Aul/AppStatus", "org.tizen.aul.AppStatus", "AppStatusChange", this); _D("Active window monitoring started (%lld)", signal_id); return (signal_id > 0); } @@ -53,12 +52,12 @@ bool ctx::app_use_monitor::start_logging() void ctx::app_use_monitor::stop_logging() { if (signal_id > 0) { - dbus_server::unsubscribe_system_signal(signal_id); + __dbusWatcher.unwatch(signal_id); _D("Active window monitoring stopped"); } } -void ctx::app_use_monitor::on_signal_received(const char* sender, const char* path, const char* iface, const char* name, GVariant* param) +void ctx::app_use_monitor::onSignal(const char* sender, const char* path, const char* iface, const char* name, GVariant* param) { gint pid = 0; const gchar *appid = NULL; diff --git a/src/statistics/app/active_window_monitor.h b/src/statistics/app/active_window_monitor.h index c20f6aa..7b5e3a0 100644 --- a/src/statistics/app/active_window_monitor.h +++ b/src/statistics/app/active_window_monitor.h @@ -19,14 +19,15 @@ #include #include -#include +#include namespace ctx { - class app_use_monitor : public dbus_listener_iface { + class app_use_monitor : public IDBusSignalListener { private: int64_t signal_id; int last_cleanup_time; + DBusSignalWatcher __dbusWatcher; bool start_logging(void); void stop_logging(void); @@ -35,7 +36,7 @@ namespace ctx { void create_record(std::string app_id); void finish_record(std::string app_id); void remove_expired(); - void on_signal_received(const char* sender, const char* path, const char* iface, const char* name, GVariant* param); + void onSignal(const char *sender, const char *path, const char *iface, const char *name, GVariant *param); public: app_use_monitor(); diff --git a/src/statistics/app/app_stats_provider.cpp b/src/statistics/app/app_stats_provider.cpp index 7224592..06aa468 100644 --- a/src/statistics/app/app_stats_provider.cpp +++ b/src/statistics/app/app_stats_provider.cpp @@ -48,13 +48,12 @@ ctx::context_provider_iface *ctx::app_statistics_provider::create(void *data) __instance = new(std::nothrow) app_statistics_provider(); IF_FAIL_RETURN_TAG(__instance, NULL, _E, "Memory allocation failed"); - _I(BLUE("Created")); - if (!__instance->init()) { destroy(data); return NULL; } + _I(BLUE("Created")); return __instance; }