Disconnect channel when peer performs shutdown

[platform/core/system/sensord.git] / src / shared / channel.cpp

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 6ae8ed3..020d5fb 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -110,13 +110,15 @@ channel::channel(socket *sock)
 , m_loop(NULL)
 , m_connected(false)
 {
-       _D("Created");
+       _D("Create[%p]", this);
 }
 
 channel::~channel()
 {
-       _D("Destroyed[%llu]", m_event_id);
-       disconnect();
+       _D("Destroy[%p]", this);
+       if (is_connected()) {
+               disconnect();
+       }
 }
 
 uint64_t channel::bind(void)
@@ -126,7 +128,7 @@ uint64_t channel::bind(void)
                        (EVENT_IN | EVENT_HUP | EVENT_NVAL),
                        dynamic_cast<channel_event_handler *>(m_handler));
 
-       _D("Bound[%llu]", m_event_id);
+       _D("Bind channel[%p] : handler[%p] event_id[%llu]", this, m_handler, m_event_id);
        return m_event_id;
 }
 
@@ -152,44 +154,44 @@ uint64_t channel::connect(channel_handler *handler, event_loop *loop, bool loop_
 
        bind(handler, loop, loop_bind);
 
-       _D("Connected[%llu]", m_event_id);
+       _D("Connect channel[%p] : event id[%llu]", this, m_event_id);
        return m_event_id;
 }
 
 void channel::disconnect(void)
 {
+       AUTOLOCK(m_cmutex);
        if (!is_connected()) {
-               _D("Channel is not connected");
+               _D("Channel[%p] is not connected", this);
                return;
        }
 
        m_connected.store(false);
 
-       _D("Disconnecting..[%llu]", m_event_id);
+       _D("Disconnect channel[%p]", this);
 
        if (m_handler) {
+               _D("Disconnect channel[%p] handler[%p]", this, m_handler);
                m_handler->disconnected(this);
                m_handler = NULL;
        }
 
        if (m_loop) {
                for(auto id : m_pending_event_id) {
-                       _D("Remove pending event id[%llu]", id);
+                       _D("Remove channel[%p] pending event id[%llu]", this, id);
                        m_loop->remove_event(id, true);
                }
-               _D("Remove event[%llu]", m_event_id);
+               _D("Remove channel[%p] event[%llu]",this, m_event_id);
                m_loop->remove_event(m_event_id, true);
-               m_loop = NULL;
                m_event_id = 0;
        }
 
        if (m_socket) {
-               _D("Release socket[%d]", m_socket->get_fd());
+               _D("Release channel[%p] socket[%d]", this, m_socket->get_fd());
                delete m_socket;
                m_socket = NULL;
        }
-
-       _D("Disconnected");
+       _D("Channel[%p] is disconnected", this);
 }
 
 bool channel::send(std::shared_ptr<message> msg)
@@ -224,6 +226,12 @@ bool channel::send(std::shared_ptr<message> msg)
 
 bool channel::send_sync(message &msg)
 {
+       AUTOLOCK(m_cmutex);
+       if (!is_connected()) {
+               _D("Channel is not connected");
+               return false;
+       }
+
        retvm_if(msg.size() >= MAX_MSG_CAPACITY, true, "Invaild message size[%u]", msg.size());
 
        ssize_t size = 0;
@@ -264,14 +272,24 @@ bool channel::read(void)
 
 bool channel::read_sync(message &msg, bool select)
 {
+       AUTOLOCK(m_cmutex);
+       if (!is_connected()) {
+               _D("Channel is not connected");
+               return false;
+       }
+
        message_header header;
        ssize_t size = 0;
        char buf[MAX_MSG_CAPACITY];
 
        /* header */
        size = m_socket->recv(&header, sizeof(message_header), select);
-       retv_if(size <= 0, false);
-
+       if (size <= 0) {
+               if (size == -1) {
+                       disconnect();
+               }
+               return false;
+       }
        /* check error from header */
        if (m_handler && header.err != 0) {
                m_handler->error_caught(this, header.err);
@@ -287,7 +305,12 @@ bool channel::read_sync(message &msg, bool select)
 
        if (header.length > 0) {
                size = m_socket->recv(&buf, header.length, select);
-               retv_if(size <= 0, false);
+               if (size <= 0) {
+                       if (size == -1) {
+                               disconnect();
+                       }
+                       return false;
+               }
        }
 
        buf[header.length] = '\0';