Add to destruct job for release callbacks

Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>

diff --git a/src/server/runner.cc b/src/server/runner.cc
index 50b7320..fb7afa0 100644 (file)
--- a/src/server/runner.cc
+++ b/src/server/runner.cc
@@ -32,15 +32,20 @@ namespace pkgmgr_server {
 
 static const std::string SOCK_PATH = "/run/pkgmgr-info-server";
 
-Runner::Runner(int thread_num) : thread_num_(thread_num) {
+Runner::Runner(int thread_num) : sid_(-1), thread_num_(thread_num) {
   server_ = std::make_unique<pkgmgr_common::socket::ServerSocket>(SOCK_PATH);
   thread_pool_ = std::make_unique<WorkerThread>(thread_num_);
-  g_unix_fd_add(server_->GetFd(), G_IO_IN, OnReceiveRequest, this);
+  sid_ = g_unix_fd_add(server_->GetFd(), G_IO_IN, OnReceiveRequest, this);
   vconf_notify_key_changed(VCONFKEY_LANGSET, OnLanguageChange, this);
   thread_pool_->SetLocale(vconf_get_str(VCONFKEY_LANGSET));
   LOGI("Start Runner");
 }
 
+Runner::~Runner() {
+  g_source_remove(sid_);
+  vconf_ignore_key_changed(VCONFKEY_LANGSET, OnLanguageChange);
+}
+
 int Runner::OnReceiveRequest(int fd, GIOCondition cond, void* user_data) {
   auto runner = static_cast<Runner*>(user_data);
   int client_fd = runner->server_->Accept();

diff --git a/src/server/runner.hh b/src/server/runner.hh
index b584259..52ba888 100644 (file)
--- a/src/server/runner.hh
+++ b/src/server/runner.hh
@@ -34,7 +34,7 @@ namespace pkgmgr_server {
 class EXPORT_API Runner {
  public:
   Runner(int thread_num);
-  ~Runner() = default;
+  ~Runner();
 
  private:
   static int OnReceiveRequest(int fd, GIOCondition cond, void* user_data);
@@ -42,6 +42,7 @@ class EXPORT_API Runner {
   bool QueueRequest(int client_fd);
 
  private:
+  int sid_;
   int thread_num_;
   std::unique_ptr<pkgmgr_common::socket::ServerSocket> server_;
   std::unique_ptr<WorkerThread> thread_pool_;