Disconnect from a port

After this patch is applied, rpc-port closes the file descriptor when
Read() is failed.

Change-Id: I25c1a2878037a664c4bec8320f97bc1fafeef38b
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --git a/src/port-internal.cc b/src/port-internal.cc
index ec798fd..0b61a27 100644 (file)
--- a/src/port-internal.cc
+++ b/src/port-internal.cc
@@ -78,7 +78,15 @@ Port::Port(int fd, std::string id, std::string instance)
 
 Port::~Port() {
   ClearQueue();
-  close(fd_);
+  Disconnect();
+}
+
+void Port::Disconnect() {
+  if (fd_ > 0) {
+    _W("Close fd(%d)", fd_);
+    close(fd_);
+    fd_ = -1;
+  }
 }
 
 int Port::SetPrivateSharing(const char* paths[], unsigned int size) {

diff --git a/src/port-internal.hh b/src/port-internal.hh
index a8cd03a..96c31a5 100644 (file)
--- a/src/port-internal.hh
+++ b/src/port-internal.hh
@@ -36,6 +36,7 @@ class Port {
   Port(int fd, std::string id);
   virtual ~Port();
 
+  void Disconnect();
   int SetPrivateSharing(const char* paths[], unsigned int size);
   int SetPrivateSharing(const char* path);
   int UnsetPrivateSharing();

diff --git a/src/rpc-port.cc b/src/rpc-port.cc
index 451fb83..04e20c8 100644 (file)
--- a/src/rpc-port.cc
+++ b/src/rpc-port.cc
@@ -207,12 +207,18 @@ RPC_API int rpc_port_read(rpc_port_h h, void* buf, unsigned int size) {
   auto port = static_cast<Port*>(h);
   uint32_t seq = 0;
   int ret = port->Read(reinterpret_cast<uint32_t*>(&seq), sizeof(seq));
-  if (ret < 0)
+  if (ret < 0) {
+    _E("IO Error");
+    port->Disconnect();
     return ret;
+  }
 
   ret = port->Read(buf, size);
-  if (ret < 0)
+  if (ret < 0) {
+    _E("IO Error");
+    port->Disconnect();
     return ret;
+  }
 
   auto& debug_port = DebugPort::GetInst();
   debug_port.Send(port->GetFd(), true, seq, buf, size);