sensord: ternimate sensord instantly when signal is received 71/142371/1
authorkibak.yoon <kibak.yoon@samsung.com>
Thu, 3 Aug 2017 15:37:13 +0000 (00:37 +0900)
committerkibak.yoon <kibak.yoon@samsung.com>
Thu, 3 Aug 2017 15:37:13 +0000 (00:37 +0900)
Change-Id: I1993404cf85cf92427ccaf69a28dbe88a461134d
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>
src/server/server.cpp
src/shared/event_loop.cpp

index 237f658..a411340 100644 (file)
@@ -96,8 +96,8 @@ bool server::init(void)
 
 void server::deinit(void)
 {
-       m_manager->deinit();
        m_server->close();
+       m_manager->deinit();
 
        delete m_server;
        m_server = NULL;
index 1b569a1..c3a698b 100644 (file)
@@ -238,12 +238,7 @@ void event_loop::stop(void)
 {
        ret_if(!is_running() || m_terminating.load());
 
-       uint64_t term = 1;
-       ssize_t size;
-       m_terminating.store(true);
-       size = write(m_term_fd, &term, sizeof(uint64_t));
-
-       retm_if(size != sizeof(ssize_t), "Failed to write[%d]", m_term_fd);
+       terminate();
 }
 
 void event_loop::terminate(void)