From 447f76e51d74efa44702b48e2cd2884dd4b8b9b0 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Thu, 22 Sep 2022 05:42:25 +0000
Subject: [PATCH 01/16] Release version 1.13.5

Changes:
 - Check debug port connection
 - Fix static analysis issue

Change-Id: Iad333eae69105012fa456e08f0f042b792e7883e
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 47a9b0e..5144054 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.4
+Version: 	1.13.5
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From ce812b6c2ad864314c7911d0f421acca45b92e5c Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Fri, 23 Sep 2022 11:06:39 +0000
Subject: [PATCH 02/16] Use modified tizen_base::Parcel

To improve the performance of the parcel creation, the implementation of
the Parcel is changed. It uses malloc() instead of std::vector.

Requires:
 - https://review.tizen.org/gerrit/#/c/platform/core/base/bundle/+/281779/

Change-Id: Iaf01e6e94e34e10a36b8ca17081c6aba3b3b51e1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/debug-port-internal.cc |  4 ++--
 src/parcel-internal.cc     | 23 +++++++----------------
 src/parcel-internal.hh     |  4 +++-
 src/proxy-internal.cc      | 17 +++++++++++------
 src/rpc-port-parcel.cc     | 14 ++++++--------
 src/stub-internal.cc       |  5 ++---
 6 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/debug-port-internal.cc b/src/debug-port-internal.cc
index e5c1802..06e44dc 100644
--- a/src/debug-port-internal.cc
+++ b/src/debug-port-internal.cc
@@ -327,7 +327,7 @@ void DebugPortImpl::CreateThread() {
       do {
         std::shared_ptr<tizen_base::Parcel> parcel;
         queue_.WaitAndPop(parcel);
-        int len = parcel->GetRaw().size();
+        int len = parcel->GetDataSize();
         if (len == 0) {
           _W("Done");
           break;
@@ -343,7 +343,7 @@ void DebugPortImpl::CreateThread() {
           continue;
         }
 
-        ret = port_->Write(&*parcel->GetRaw().cbegin(), len);
+        ret = port_->Write(parcel->GetData(), len);
         if (ret < 0) {
           _E("Failed to write data");
           SetConnectionStatus(false);
diff --git a/src/parcel-internal.cc b/src/parcel-internal.cc
index ba6ba66..75f5805 100644
--- a/src/parcel-internal.cc
+++ b/src/parcel-internal.cc
@@ -22,23 +22,15 @@
 namespace rpc_port {
 namespace internal {
 
-Parcel::Parcel() {
-  parcel_create(&handle_);
-}
+Parcel::Parcel() {}
 
-Parcel::~Parcel() {
-  if (handle_)
-    parcel_destroy(handle_);
-}
+Parcel::~Parcel() {}
 
 void Parcel::WriteToParcel(tizen_base::Parcel* parcel) const {
   parcel->WriteParcelable(header_);
 
-  void* raw = nullptr;
-  uint32_t size = 0;
-  parcel_get_raw(handle_, &raw, &size);
-  parcel->WriteUInt32(size);
-  parcel->Write(raw, size);
+  parcel->WriteUInt32(handle_.GetDataSize());
+  parcel->Write(handle_.GetData(), handle_.GetDataSize());
 }
 
 void Parcel::ReadFromParcel(tizen_base::Parcel* parcel) {
@@ -47,15 +39,14 @@ void Parcel::ReadFromParcel(tizen_base::Parcel* parcel) {
   uint32_t size = 0;
   parcel->ReadUInt32(&size);
   if (size > 0) {
-    auto buf = new (std::nothrow) uint8_t[size];
+    auto* buf = static_cast<uint8_t*>(malloc(size));
     if (buf == nullptr) {
       _E("Out of memory");
       return;
     }
 
-    std::unique_ptr<uint8_t[]> ptr(buf);
     parcel->Read(buf, size);
-    parcel_reset(handle_, buf, size);
+    handle_ = std::move(tizen_base::Parcel(buf, size, false));
   }
 }
 
@@ -64,7 +55,7 @@ const ParcelHeader* Parcel::GetParcelHeader() {
 }
 
 parcel_h Parcel::GetHandle() const {
-  return handle_;
+  return static_cast<parcel_h>(const_cast<tizen_base::Parcel*>(&handle_));
 }
 
 }  // namespace internal
diff --git a/src/parcel-internal.hh b/src/parcel-internal.hh
index 77507fb..6922003 100644
--- a/src/parcel-internal.hh
+++ b/src/parcel-internal.hh
@@ -19,6 +19,8 @@
 
 #include <parcel.h>
 
+#include <parcel.hh>
+
 #include <parcelable.hh>
 
 #include "parcel-header-internal.hh"
@@ -39,7 +41,7 @@ class Parcel : public tizen_base::Parcelable {
 
  private:
   ParcelHeader header_;
-  parcel_h handle_ = nullptr;
+  tizen_base::Parcel handle_;
 };
 
 }  // namespace internal
diff --git a/src/proxy-internal.cc b/src/proxy-internal.cc
index 771a303..8ddb569 100644
--- a/src/proxy-internal.cc
+++ b/src/proxy-internal.cc
@@ -53,15 +53,14 @@ std::string GenInstance() {
 int SendRequest(ClientSocket* client, const Request& request) {
   tizen_base::Parcel parcel;
   parcel.WriteParcelable(const_cast<Request&>(request));
-  const std::vector<uint8_t>& raw = parcel.GetRaw();
-  size_t size = raw.size();
+  size_t size = parcel.GetDataSize();
   int ret = client->Send(reinterpret_cast<void*>(&size), sizeof(size));
   if (ret != 0) {
     _E("Send() is failed. error(%d)", ret);
     return -1;
   }
 
-  ret = client->Send(raw.data(), raw.size());
+  ret = client->Send(parcel.GetData(), size);
   if (ret != 0) {
     _E("Send() is failed. error(%d)", ret);
     return -1;
@@ -78,14 +77,20 @@ int ReceiveResponse(ClientSocket* client, Response** response) {
     return -1;
   }
 
-  std::vector<uint8_t> buf(size);
-  ret = client->Receive(buf.data(), size);
+  uint8_t* buf = static_cast<uint8_t*>(malloc(size));
+  if (buf == nullptr) {
+    _E("Out of memory");
+    return -1;
+  }
+
+  ret = client->Receive(buf, size);
   if (ret != 0) {
     _E("Receive() is failed. error(%d)", ret);
+    free(buf);
     return -1;
   }
 
-  tizen_base::Parcel parcel(buf.data(), buf.size());
+  tizen_base::Parcel parcel(buf, size, false);
   *response = new (std::nothrow) Response();
   if (*response == nullptr) {
     _E("Out of memory");
diff --git a/src/rpc-port-parcel.cc b/src/rpc-port-parcel.cc
index 35361db..86af7b3 100644
--- a/src/rpc-port-parcel.cc
+++ b/src/rpc-port-parcel.cc
@@ -62,7 +62,7 @@ RPC_API int rpc_port_parcel_create_from_port(rpc_port_parcel_h* h,
     if (len <= 0 || len > MAX_PARCEL_SIZE)
       return RPC_PORT_ERROR_IO_ERROR;
 
-    buf = new (std::nothrow) unsigned char[len];
+    buf = static_cast<unsigned char*>(malloc(len));
     if (buf == nullptr) {
       _E("Out of memory");
       return RPC_PORT_ERROR_IO_ERROR;
@@ -70,7 +70,7 @@ RPC_API int rpc_port_parcel_create_from_port(rpc_port_parcel_h* h,
 
     ret = rpc_port_read(port, buf, len);
     if (ret != 0) {
-      delete[] buf;
+      free(buf);
       return ret;
     }
   }
@@ -78,13 +78,12 @@ RPC_API int rpc_port_parcel_create_from_port(rpc_port_parcel_h* h,
   auto* parcel = new (std::nothrow) internal::Parcel();
   if (parcel == nullptr) {
     _E("Out of memory");
-    delete[] buf;
+    free(buf);
     return RPC_PORT_ERROR_IO_ERROR;
   }
 
-  tizen_base::Parcel raw_parcel(buf, len);
+  tizen_base::Parcel raw_parcel(buf, len, false);
   raw_parcel.ReadParcelable(parcel);
-  delete[] buf;
   *h = static_cast<rpc_port_parcel_h>(parcel);
   return RPC_PORT_ERROR_NONE;
 }
@@ -96,9 +95,8 @@ RPC_API int rpc_port_parcel_send(rpc_port_parcel_h h, rpc_port_h port) {
   auto* parcel = static_cast<internal::Parcel*>(h);
   tizen_base::Parcel raw_parcel;
   raw_parcel.WriteParcelable(*parcel);
-  const std::vector<uint8_t>& raw_data = raw_parcel.GetRaw();
-  void* raw = reinterpret_cast<void*>(const_cast<uint8_t*>(&raw_data[0]));
-  uint32_t len = raw_data.size();
+  void* raw = reinterpret_cast<void*>(raw_parcel.GetData());
+  uint32_t len = raw_parcel.GetDataSize();
   if (len <= 0)
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
diff --git a/src/stub-internal.cc b/src/stub-internal.cc
index 5a9d014..5508bc4 100644
--- a/src/stub-internal.cc
+++ b/src/stub-internal.cc
@@ -69,15 +69,14 @@ int ReceiveRequest(ClientSocket* client, Request** request) {
 int SendResponse(ClientSocket* client, const Response& response) {
   tizen_base::Parcel parcel;
   parcel.WriteParcelable(const_cast<Response&>(response));
-  const std::vector<uint8_t>& raw = parcel.GetRaw();
-  size_t size = raw.size();
+  size_t size = parcel.GetDataSize();
   int ret = client->Send(reinterpret_cast<void*>(&size), sizeof(size));
   if (ret != 0) {
     _E("Send() is failed. error(%d)", ret);
     return -1;
   }
 
-  ret = client->Send(raw.data(), raw.size());
+  ret = client->Send(parcel.GetData(), size);
   if (ret != 0) {
     _E("Send() is failed. error(%d)", ret);
     return -1;
-- 
2.7.4


From 6629e6615e87dbbbb58946ce63d7ad330ca43a7d Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Tue, 27 Sep 2022 05:30:49 +0000
Subject: [PATCH 03/16] Fix static analysis issue

The following issue is fixed:
 - ODR_VIOLATION

Change-Id: Icece742e174148c3af52fed4e7346a04b51e1790
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/exception-internal.cc | 2 --
 src/exception-internal.hh | 2 +-
 src/request-internal.cc   | 4 ----
 src/request-internal.hh   | 4 ++--
 src/response-internal.cc  | 2 --
 src/response-internal.hh  | 2 +-
 utils/message.cc          | 2 --
 utils/message.hh          | 2 +-
 8 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/exception-internal.cc b/src/exception-internal.cc
index 8e21f20..2af6bfb 100644
--- a/src/exception-internal.cc
+++ b/src/exception-internal.cc
@@ -26,8 +26,6 @@ Exception::Exception(int error_code, const std::string& file, int line)
       message_(std::move(GetErrorMessage(error_code_, file, line))) {
 }
 
-Exception::~Exception() = default;
-
 const char* Exception::what() const noexcept {
   return message_.c_str();
 }
diff --git a/src/exception-internal.hh b/src/exception-internal.hh
index 4f52240..655fbae 100644
--- a/src/exception-internal.hh
+++ b/src/exception-internal.hh
@@ -28,7 +28,7 @@ namespace internal {
 class Exception : public std::exception {
  public:
   explicit Exception(int error_code, const std::string& file, int line);
-  virtual ~Exception();
+  virtual ~Exception() = default;
 
   virtual const char* what() const noexcept;
   int GetErrorCode();
diff --git a/src/request-internal.cc b/src/request-internal.cc
index af78026..c293c29 100644
--- a/src/request-internal.cc
+++ b/src/request-internal.cc
@@ -26,10 +26,6 @@ Request::Request(std::string instance, std::string port_type)
       port_type_(std::move(port_type)) {
 }
 
-Request::Request() = default;
-
-Request::~Request() = default;
-
 void Request::SetPortType(std::string port_type) {
   port_type_ = std::move(port_type);
 }
diff --git a/src/request-internal.hh b/src/request-internal.hh
index bd72505..3aa9b05 100644
--- a/src/request-internal.hh
+++ b/src/request-internal.hh
@@ -28,8 +28,8 @@ namespace internal {
 class Request : public tizen_base::Parcelable {
  public:
   Request(std::string instance, std::string port_type);
-  Request();
-  ~Request();
+  Request() = default;
+  ~Request() = default;
 
   void SetPortType(std::string port_type);
   const std::string& GetInstance();
diff --git a/src/response-internal.cc b/src/response-internal.cc
index 3583dde..9d32604 100644
--- a/src/response-internal.cc
+++ b/src/response-internal.cc
@@ -25,8 +25,6 @@ Response::Response(int result) : result_(result) {
 Response::Response() : result_(0) {
 }
 
-Response::~Response() = default;
-
 int Response::GetResult() {
   return result_;
 }
diff --git a/src/response-internal.hh b/src/response-internal.hh
index 25227d3..2c12ab2 100644
--- a/src/response-internal.hh
+++ b/src/response-internal.hh
@@ -27,7 +27,7 @@ class Response : public tizen_base::Parcelable {
  public:
   explicit Response(int result);
   Response();
-  ~Response();
+  ~Response() = default;
 
   int GetResult();
 
diff --git a/utils/message.cc b/utils/message.cc
index 47be341..c4145bc 100644
--- a/utils/message.cc
+++ b/utils/message.cc
@@ -41,8 +41,6 @@ Message::Message(time_t time, int pid, std::string port_name,
     data_(std::move(data)) {
 }
 
-Message::~Message() = default;
-
 void Message::Print() {
   struct tm sent_time;
   localtime_r(&time_, &sent_time);
diff --git a/utils/message.hh b/utils/message.hh
index 9157b2b..098a4f5 100644
--- a/utils/message.hh
+++ b/utils/message.hh
@@ -30,7 +30,7 @@ class Message {
   Message(time_t time, int pid, std::string port_name, std::string destination,
       bool is_delegate, int port, bool is_read, uint32_t seq,
       std::vector<unsigned char> data);
-  virtual ~Message();
+  virtual ~Message() = default;
 
   void Print();
 
-- 
2.7.4


From 1b6d9ceef23c57fedc4099bd4ef1fb83d65565ad Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Tue, 27 Sep 2022 06:56:16 +0000
Subject: [PATCH 04/16] Release version 1.13.6

Changes:
 - Use modified tizen_base::Parcel
 - Fix static analysis issue

Change-Id: Ifad26b8f42b17f3b793f751659203e6e27ccccc1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 5144054..650f8b2 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.5
+Version: 	1.13.6
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From fd1c15c4a95a4092008d27583f0c7c3d9ae62f5b Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Wed, 28 Sep 2022 10:27:29 +0000
Subject: [PATCH 05/16] Fix bugs about getting and setting raw data

Unfortunately, there is a bug about the raw data of the parcel.
When the rpc_port_parcel_get_raw() is called, the function allocates a
tizen_base::Parcel to set the raw data internally.

Change-Id: I4297f7fab5ba144bafd17366b518627bfbd1e5d1
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/parcel-internal.cc |  8 ++++++++
 src/parcel-internal.hh |  7 ++++++-
 src/rpc-port-parcel.cc | 26 +++++++++++++++++---------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/parcel-internal.cc b/src/parcel-internal.cc
index 75f5805..5cb299d 100644
--- a/src/parcel-internal.cc
+++ b/src/parcel-internal.cc
@@ -58,5 +58,13 @@ parcel_h Parcel::GetHandle() const {
   return static_cast<parcel_h>(const_cast<tizen_base::Parcel*>(&handle_));
 }
 
+void Parcel::SetRawParcel(tizen_base::Parcel* raw_parcel) {
+  raw_parcel_.reset(raw_parcel);
+}
+
+tizen_base::Parcel* Parcel::GetRawParcel() const {
+  return raw_parcel_.get();
+}
+
 }  // namespace internal
 }  // namespace rpc_port
diff --git a/src/parcel-internal.hh b/src/parcel-internal.hh
index 6922003..6c907b8 100644
--- a/src/parcel-internal.hh
+++ b/src/parcel-internal.hh
@@ -20,9 +20,10 @@
 #include <parcel.h>
 
 #include <parcel.hh>
-
 #include <parcelable.hh>
 
+#include <memory>
+
 #include "parcel-header-internal.hh"
 
 namespace rpc_port {
@@ -39,9 +40,13 @@ class Parcel : public tizen_base::Parcelable {
   const ParcelHeader* GetParcelHeader();
   parcel_h GetHandle() const;
 
+  void SetRawParcel(tizen_base::Parcel* raw_parcel);
+  tizen_base::Parcel* GetRawParcel() const;
+
  private:
   ParcelHeader header_;
   tizen_base::Parcel handle_;
+  std::unique_ptr<tizen_base::Parcel> raw_parcel_ { nullptr };
 };
 
 }  // namespace internal
diff --git a/src/rpc-port-parcel.cc b/src/rpc-port-parcel.cc
index 86af7b3..12782ee 100644
--- a/src/rpc-port-parcel.cc
+++ b/src/rpc-port-parcel.cc
@@ -415,9 +415,10 @@ RPC_API int rpc_port_parcel_to_array(rpc_port_parcel_h h, void** array,
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
   auto* parcel = static_cast<internal::Parcel*>(h);
-  void* raw = nullptr;
-  uint32_t raw_size = 0;
-  parcel_get_raw(parcel->GetHandle(), &raw, &raw_size);
+  tizen_base::Parcel raw_parcel;
+  raw_parcel.WriteParcelable(*parcel);
+  void* raw = raw_parcel.GetData();
+  uint32_t raw_size = raw_parcel.GetDataSize();;
   if (raw_size == 0) {
     _E("raw_size is zero");
     return RPC_PORT_ERROR_IO_ERROR;
@@ -440,7 +441,8 @@ RPC_API int rpc_port_parcel_from_array(rpc_port_parcel_h h, const void* array,
 
   auto* parcel = static_cast<internal::Parcel*>(h);
   uint32_t valid_size = size & UINT32_MAX;
-  parcel_reset(parcel->GetHandle(), array, valid_size);
+  tizen_base::Parcel raw_parcel(array, valid_size);
+  raw_parcel.ReadParcelable(parcel);
   return RPC_PORT_ERROR_NONE;
 }
 
@@ -517,12 +519,18 @@ RPC_API int rpc_port_parcel_get_raw(rpc_port_parcel_h h, void** raw,
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
   auto* parcel = static_cast<internal::Parcel*>(h);
-  void* raw_data = nullptr;
-  uint32_t raw_size = 0;
-  parcel_get_raw(parcel->GetHandle(), &raw_data, &raw_size);
+  auto* raw_parcel = new (std::nothrow) tizen_base::Parcel();
+  if (raw_parcel != nullptr) {
+    raw_parcel->WriteParcelable(*parcel);
+    parcel->SetRawParcel(raw_parcel);
+    *raw = raw_parcel->GetData();
+    *size = static_cast<unsigned int>(raw_parcel->GetDataSize());
+  } else {
+    _E("Out of memory");
+    *raw = nullptr;
+    *size = 0;
+  }
 
-  *raw = raw_data;
-  *size = static_cast<unsigned int>(raw_size);
   return RPC_PORT_ERROR_NONE;
 }
 
-- 
2.7.4


From 04fa14c796d9d939647ceb149a5f70b8f6d2cb79 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Wed, 28 Sep 2022 23:20:50 +0000
Subject: [PATCH 06/16] Release version 1.13.7

Changes:
 - Fix bugs about getting and setting raw data

Change-Id: I55f35f2f2506158285f6b3f07ac8a924e73e6206
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 650f8b2..19ef7b9 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.6
+Version: 	1.13.7
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From 98c79873c97089db94449b57c2603dc43f0bef14 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Tue, 4 Oct 2022 11:47:34 +0900
Subject: [PATCH 07/16] Fix wrong exception handling

Change-Id: Ifd4f0104ad69dbcaddbdc31a75e84b676471716e
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 benchmark/server/main.cc | 21 +++++++++---------
 benchmark/tool/main.cc   | 58 ++++++++++++++++++++++++++----------------------
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/benchmark/server/main.cc b/benchmark/server/main.cc
index c4466cf..9be81a1 100644
--- a/benchmark/server/main.cc
+++ b/benchmark/server/main.cc
@@ -29,14 +29,14 @@ namespace bs = rpc_port::BenchmarkStub::stub;
 class TestService : public bs::Benchmark::ServiceBase {
  public:
   class Factory : public bs::Benchmark::ServiceBase::Factory {
-     public:
-      virtual ~Factory() = default;
-
-      std::unique_ptr<bs::Benchmark::ServiceBase>
-          CreateService(std::string sender, std::string instance) {
-        return std::unique_ptr<bs::Benchmark::ServiceBase>(
-            new TestService(sender, instance));
-      }
+   public:
+    virtual ~Factory() = default;
+
+    std::unique_ptr<bs::Benchmark::ServiceBase>
+        CreateService(std::string sender, std::string instance) {
+      return std::unique_ptr<bs::Benchmark::ServiceBase>(
+          new TestService(sender, instance));
+    }
   };
 
   TestService(std::string sender, std::string instance) :
@@ -75,9 +75,10 @@ class MainLoop {
     try {
       stub_.Listen(std::shared_ptr<bs::Benchmark::ServiceBase::Factory>(
           new TestService::Factory()));
-    } catch (const std::exception& e) {
-      _E("stub listen is failed(%s)", e.what());
+    } catch (const bs::Exception&) {
+      _E("stub listen is failed");
     }
+
     g_main_loop_run(loop_);
   }
 
diff --git a/benchmark/tool/main.cc b/benchmark/tool/main.cc
index 580eb69..8abe412 100644
--- a/benchmark/tool/main.cc
+++ b/benchmark/tool/main.cc
@@ -65,8 +65,8 @@ class Tester {
   void Run(int argc, char** argv) {
     options_ = rpc_port::benchmark::Options::Parse(argc, argv);
     if (!options_) {
-      _E("options is nullptr");
-      exit(1);
+      std::cerr << "options is unllptr" << std::endl;
+      return;
     }
 
     ExecuteServer();
@@ -75,28 +75,36 @@ class Tester {
     try {
       proxy_->Connect(true);
     } catch (const bp::Exception& e) {
-      _E("Connect() failed");
-      exit(1);
+      std::cerr << "Connect() failed" << std::endl;
+      return;
+    } catch (const std::exception& e) {
+      std::cerr << "Connect() failed. " << e.what() << std::endl;
+      return;
     }
 
     printf("%15s\t%15s\t%15s\t\t%15s\t\t%15s\n", "Iterations", "Data size",
         "Time", "Throughput", "Latency");
-    if (options_->IsAll()) {
-      DoTest(4000, 10);
-      DoTest(4000, 20);
-      DoTest(4000, 100);
-      DoTest(4000, 200);
-      DoTest(2000, 1000);
-      DoTest(2000, 2000);
-      DoTest(1000, 10000);
-      DoTest(1000, 20000);
-      DoTest(1000, 30000);
-      DoTest(1000, 40000);
-      DoTest(1000, 50000);
-      DoTest(1000, 60000);
-      DoTest(500, 100000);
-    } else {
-      DoTest(options_->GetIters(), options_->GetSize());
+
+    try {
+      if (options_->IsAll()) {
+        DoTest(4000, 10);
+        DoTest(4000, 20);
+        DoTest(4000, 100);
+        DoTest(4000, 200);
+        DoTest(2000, 1000);
+        DoTest(2000, 2000);
+        DoTest(1000, 10000);
+        DoTest(1000, 20000);
+        DoTest(1000, 30000);
+        DoTest(1000, 40000);
+        DoTest(1000, 50000);
+        DoTest(1000, 60000);
+        DoTest(500, 100000);
+      } else {
+        DoTest(options_->GetIters(), options_->GetSize());
+      }
+    } catch (const bp::Exception& e) {
+      std::cerr << "test failed" << std::endl;
     }
   }
 
@@ -134,7 +142,8 @@ class Tester {
   }
 
   void EndTime(int iters, int size) {
-    std::chrono::duration<double> sec = std::chrono::system_clock::now() - start_;
+    std::chrono::duration<double> sec =
+        std::chrono::system_clock::now() - start_;
     double t = size * iters * 8 / sec.count() / 1024 / 1024;
     double l = sec.count() * 1000 / iters;
 
@@ -175,11 +184,6 @@ class Tester {
 
 int main(int argc, char** argv) {
   Tester tester;
-  try {
-    tester.Run(argc, argv);
-  } catch (const std::exception& e) {
-    std::cerr << "Exception occurred!!!" << e.what() << std::endl;
-  }
-
+  tester.Run(argc, argv);
   return 0;
 }
-- 
2.7.4


From b3ad5d660c267deb2276dc43d8a95bb5ed0cfcc6 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Wed, 12 Oct 2022 06:41:39 +0000
Subject: [PATCH 08/16] Release the client handle

When the client application calls the rpc_port_proxy_connect() function
after the diconnected event is received, the main_client_ and the
delegate_client_ handles have to be released.

Change-Id: I2aeef18323bc9f438b048cfef42fb9dd1c82f62e
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/proxy-internal.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/proxy-internal.cc b/src/proxy-internal.cc
index 8ddb569..7816276 100644
--- a/src/proxy-internal.cc
+++ b/src/proxy-internal.cc
@@ -206,6 +206,8 @@ int Proxy::Connect(std::string appid, std::string port_name,
   target_appid_ = std::move(appid);
   port_name_ = std::move(port_name);
   SetRealAppId(target_appid_);
+  main_port_.reset();
+  delegate_port_.reset();
 
   UnsetConnTimer();
   int ret = Aul::PrepareStub(real_appid_, port_name_,
-- 
2.7.4


From 2ef2bea64aa235d172daaefc5e5776d6b4f51288 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Mon, 17 Oct 2022 13:14:44 +0900
Subject: [PATCH 09/16] Fix static analysis issues

Change-Id: I443f2472f98001c1b279cc27d835dc341024e846
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 src/client-socket-internal.cc | 8 ++++----
 src/peer-cred-internal.cc     | 2 +-
 src/rpc-port-parcel.cc        | 4 ++--
 src/server-socket-internal.cc | 2 +-
 utils/debug-port.cc           | 4 ++--
 utils/message.cc              | 3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/client-socket-internal.cc b/src/client-socket-internal.cc
index 4fbb344..c932342 100644
--- a/src/client-socket-internal.cc
+++ b/src/client-socket-internal.cc
@@ -62,7 +62,7 @@ int ClientSocket::Connect(const std::string& endpoint) {
   snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s",
       endpoint.c_str());
   struct sockaddr* sockaddr_ptr = reinterpret_cast<struct sockaddr*>(&sockaddr);
-  socklen_t len = sizeof(sockaddr);
+  socklen_t len = static_cast<socklen_t>(sizeof(sockaddr));
   int ret = connect(GetFd(), sockaddr_ptr, len);
   fcntl(GetFd(), F_SETFL, flag);
   if (ret < 0) {
@@ -142,7 +142,7 @@ int ClientSocket::GetSendBufferSize() {
 
 int ClientSocket::GetReceiveTimeout() {
   struct timeval timeout = { 0, };
-  socklen_t len = sizeof(struct timeval);
+  socklen_t len = static_cast<socklen_t>(sizeof(struct timeval));
   int ret = getsockopt(GetFd(), SOL_SOCKET, SO_RCVTIMEO,
       reinterpret_cast<void*>(&timeout), &len);
   if (ret < 0) {
@@ -156,7 +156,7 @@ int ClientSocket::GetReceiveTimeout() {
 }
 
 void ClientSocket::SetReceiveBufferSize(int size) {
-  socklen_t len = sizeof(size);
+  socklen_t len = static_cast<socklen_t>(sizeof(size));
   int ret = setsockopt(GetFd(), SOL_SOCKET, SO_RCVBUF, &size, len);
   if (ret < 0) {
     ret = -errno;
@@ -191,7 +191,7 @@ void ClientSocket::SetReceiveTimeout(int timeout) {
     .tv_sec = static_cast<time_t>(timeout / 1000),
     .tv_usec = static_cast<suseconds_t>((timeout % 1000) * 1000)
   };
-  socklen_t len = sizeof(struct timeval);
+  socklen_t len = static_cast<socklen_t>(sizeof(struct timeval));
   int ret = setsockopt(GetFd(), SOL_SOCKET, SO_RCVTIMEO, &tv, len);
   if (ret < 0) {
     ret = -errno;
diff --git a/src/peer-cred-internal.cc b/src/peer-cred-internal.cc
index eebc131..e978e0f 100644
--- a/src/peer-cred-internal.cc
+++ b/src/peer-cred-internal.cc
@@ -31,7 +31,7 @@ PeerCred::PeerCred(pid_t pid, uid_t uid, gid_t gid)
 
 PeerCred* PeerCred::Get(int fd) {
   struct ucred cred;
-  socklen_t len = sizeof(struct ucred);
+  socklen_t len = static_cast<socklen_t>(sizeof(struct ucred));
   int ret = getsockopt(fd, SOL_SOCKET, SO_PEERCRED,
       static_cast<void*>(&cred), &len);
   if (ret != 0) {
diff --git a/src/rpc-port-parcel.cc b/src/rpc-port-parcel.cc
index 12782ee..098a53a 100644
--- a/src/rpc-port-parcel.cc
+++ b/src/rpc-port-parcel.cc
@@ -96,7 +96,7 @@ RPC_API int rpc_port_parcel_send(rpc_port_parcel_h h, rpc_port_h port) {
   tizen_base::Parcel raw_parcel;
   raw_parcel.WriteParcelable(*parcel);
   void* raw = reinterpret_cast<void*>(raw_parcel.GetData());
-  uint32_t len = raw_parcel.GetDataSize();
+  uint32_t len = static_cast<uint32_t>(raw_parcel.GetDataSize());
   if (len <= 0)
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
@@ -418,7 +418,7 @@ RPC_API int rpc_port_parcel_to_array(rpc_port_parcel_h h, void** array,
   tizen_base::Parcel raw_parcel;
   raw_parcel.WriteParcelable(*parcel);
   void* raw = raw_parcel.GetData();
-  uint32_t raw_size = raw_parcel.GetDataSize();;
+  size_t raw_size = raw_parcel.GetDataSize();
   if (raw_size == 0) {
     _E("raw_size is zero");
     return RPC_PORT_ERROR_IO_ERROR;
diff --git a/src/server-socket-internal.cc b/src/server-socket-internal.cc
index 228e75b..4f60c20 100644
--- a/src/server-socket-internal.cc
+++ b/src/server-socket-internal.cc
@@ -42,7 +42,7 @@ bool ServerSocket::IsClosed() {
 
 ClientSocket* ServerSocket::Accept() {
   struct sockaddr_un addr = { 0, };
-  socklen_t len = sizeof(struct sockaddr_un);
+  socklen_t len = static_cast<socklen_t>(sizeof(struct sockaddr_un));
   auto* addr_ptr = reinterpret_cast<struct sockaddr*>(&addr);
   int client_fd = accept(GetFd(), addr_ptr, &len);
   if (client_fd == -1) {
diff --git a/utils/debug-port.cc b/utils/debug-port.cc
index b1c5fc7..08a80ea 100644
--- a/utils/debug-port.cc
+++ b/utils/debug-port.cc
@@ -219,7 +219,7 @@ void DebugPort::Unwatch() {
 
 int DebugPort::Accept(struct ucred* cred) {
   struct sockaddr_un addr = { 0, };
-  socklen_t socklen = sizeof(addr);
+  socklen_t socklen = static_cast<socklen_t>(sizeof(addr));
   int client_fd = accept(fd_, reinterpret_cast<struct sockaddr*>(&addr),
       &socklen);
   if (client_fd < 0) {
@@ -227,7 +227,7 @@ int DebugPort::Accept(struct ucred* cred) {
     return -1;
   }
 
-  socklen = sizeof(struct ucred);
+  socklen = static_cast<socklen_t>(sizeof(struct ucred));
   int ret = getsockopt(client_fd, SOL_SOCKET, SO_PEERCRED,
       cred, &socklen);
   if (ret < 0) {
diff --git a/utils/message.cc b/utils/message.cc
index c4145bc..e62bd3e 100644
--- a/utils/message.cc
+++ b/utils/message.cc
@@ -69,7 +69,8 @@ void Message::Hexdump() {
       break;
 
     std::cout << std::setw(8) << address;
-    nread = ((data_.size() - address) > 16) ? 16 : (data_.size() - address);
+    nread = static_cast<unsigned int>(
+        ((data_.size() - address) > 16) ? 16 : (data_.size() - address));
 
     for (unsigned int i = 0; i < 16; ++i) {
       if (i % 8 == 0)
-- 
2.7.4


From fb67889685490cc8b304bb21205b71f4db817d01 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Tue, 18 Oct 2022 11:25:12 +0900
Subject: [PATCH 10/16] Release version 1.13.8

Changes:
 - Fix wrong exception handling
 - Release the client handle
 - Fix static analysis issues

Change-Id: Ia6118104adb388f2a6387b8f5ad0295949df1402
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 19ef7b9..8a0d81a 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.7
+Version: 	1.13.8
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From bf7ec8b46ea1e854256c01faf3f1e9f7ec1e8749 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Tue, 22 Nov 2022 14:29:40 +0900
Subject: [PATCH 11/16] Add client reset step in OnTimedOut()

If the timeout occurs between OnAppeared and Connected events,
even if try to reconnect, the port may not be valid.
After applying this patch, the client is reset to protect the possibility of accessing invalid ports.

Change-Id: Ic268bac9f899f96c2ceda196f5def1abdd624159
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 src/proxy-internal.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/proxy-internal.cc b/src/proxy-internal.cc
index 7816276..518c436 100644
--- a/src/proxy-internal.cc
+++ b/src/proxy-internal.cc
@@ -442,6 +442,8 @@ gboolean Proxy::OnTimedOut(gpointer user_data) {
   }
 
   proxy->Cancel();
+  proxy->main_client_.reset();
+  proxy->delegate_client_.reset();
   DestroyWeakPtr(proxy->conn_timer_data_);
   proxy->conn_timer_data_ = nullptr;
 
-- 
2.7.4


From e34e0d98f3da2ca4f9c72e6837156ad4228bf7e2 Mon Sep 17 00:00:00 2001
From: Changgyu Choi <changyu.choi@samsung.com>
Date: Wed, 23 Nov 2022 10:14:42 +0900
Subject: [PATCH 12/16] Release version 1.13.9

Changes:
 - Add client reset step in OnTimedOut()

Change-Id: I70f808c4c1c82902f8e9278f2e8a0044625a5d7c
Signed-off-by: Changgyu Choi <changyu.choi@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 8a0d81a..7d9bdc2 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.8
+Version: 	1.13.9
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From 0219f6fc3b16925aee5dad7b5e83ea49e8f64974 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Mon, 26 Dec 2022 05:14:37 +0000
Subject: [PATCH 13/16] Call abort() when double free occurs

When double free occurs, rpc-port library calls abort().
This is for deubgging C# applications.

Change-Id: I15465d756f8b17d21b4b56bb2938cb2c8b536fe4
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/rpc-port.cc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/rpc-port.cc b/src/rpc-port.cc
index 6d38540..88799b0 100644
--- a/src/rpc-port.cc
+++ b/src/rpc-port.cc
@@ -297,6 +297,11 @@ RPC_API int rpc_port_proxy_destroy(rpc_port_proxy_h h) {
 
   auto p = static_cast<std::shared_ptr<::ProxyExt>*>(h);
   auto* proxy = p->get();
+  if (proxy->IsDestroying()) {
+    _E("already destroyed. handle(%p)", proxy);
+    abort();
+  }
+
   _W("rpc_port_proxy_destroy(%p)", proxy);
   if (getpid() == gettid()) {
     delete p;
@@ -434,6 +439,12 @@ RPC_API int rpc_port_stub_destroy(rpc_port_stub_h h) {
 
   _W("rpc_port_stub_destroy(%p)", h);
   auto p = static_cast<::StubExt*>(h);
+  if (p->IsDestroying()) {
+    _E("already destroyed. handle(%p)", h);
+    abort();
+  }
+
+  p->SetDestroying(true);
   aul_rpc_port_usr_destroy(p->GetPortName().c_str(), rpc_port_get_target_uid());
   if (getpid() == gettid()) {
     delete p;
@@ -441,7 +452,6 @@ RPC_API int rpc_port_stub_destroy(rpc_port_stub_h h) {
   }
 
   p->Ignore();
-  p->SetDestroying(true);
   g_idle_add_full(G_PRIORITY_HIGH,
       [](gpointer data) -> gboolean {
         auto p = static_cast<::StubExt*>(data);
-- 
2.7.4


From b581d145bb37721302cad020ebc8cfc729fa1a99 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Mon, 26 Dec 2022 05:28:38 +0000
Subject: [PATCH 14/16] Release version 1.13.10

Changes:
 - Call abort() when double free occurs

Change-Id: I9f7508c7010188f9cdb72200a6539dd620b6ed0a
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index 7d9bdc2..d5e9ca6 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.9
+Version: 	1.13.10
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4


From 1a65f6984cbf6d874f1413a021938b63cbddcde6 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Wed, 4 Jan 2023 03:46:37 +0000
Subject: [PATCH 15/16] Modify connect method of proxy

The proxy is able to call the rpc_port_proxy_connect() function after
calling the rpc_port_proxy_disconnect() function.

Change-Id: Ib9cb6758b1792e4f3413164745b5c34819ef51ce
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 src/proxy-internal.cc | 14 ++++++++++----
 src/proxy-internal.hh |  1 +
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/proxy-internal.cc b/src/proxy-internal.cc
index 518c436..8465ed2 100644
--- a/src/proxy-internal.cc
+++ b/src/proxy-internal.cc
@@ -197,7 +197,7 @@ int Proxy::Connect(std::string appid, std::string port_name,
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
   std::lock_guard<std::recursive_mutex> lock(GetMutex());
-  if (listener_ != nullptr) {
+  if (HasRequested()) {
     _D("Already requested");
     return RPC_PORT_ERROR_INVALID_PARAMETER;
   }
@@ -209,6 +209,7 @@ int Proxy::Connect(std::string appid, std::string port_name,
   main_port_.reset();
   delegate_port_.reset();
 
+  Cancel();
   UnsetConnTimer();
   int ret = Aul::PrepareStub(real_appid_, port_name_,
       rpc_port_get_target_uid());
@@ -231,12 +232,12 @@ int Proxy::ConnectSync(std::string appid, std::string port_name,
   if (listener == nullptr)
     return RPC_PORT_ERROR_INVALID_PARAMETER;
 
-  if (listener_ != nullptr) {
-    _W("Already requested");
+  std::lock_guard<std::recursive_mutex> lock(GetMutex());
+  if (HasRequested()) {
+    _D("Already requested");
     return RPC_PORT_ERROR_INVALID_PARAMETER;
   }
 
-  std::lock_guard<std::recursive_mutex> lock(GetMutex());
   listener_ = listener;
   target_appid_ = std::move(appid);
   port_name_ = std::move(port_name);
@@ -801,5 +802,10 @@ void Proxy::DestroyWeakPtr(gpointer data) {
   delete ptr;
 }
 
+bool Proxy::HasRequested() const {
+  return listener_ != nullptr &&
+      (!main_port_ || !delegate_port_ || main_port_->GetFd() > 0);
+}
+
 }  // namespace internal
 }  // namespace rpc_port
diff --git a/src/proxy-internal.hh b/src/proxy-internal.hh
index 5003539..2cfef0d 100644
--- a/src/proxy-internal.hh
+++ b/src/proxy-internal.hh
@@ -130,6 +130,7 @@ class Proxy : public std::enable_shared_from_this<Proxy> {
   std::shared_ptr<Proxy> GetSharedPtr();
   gpointer CreateWeakPtr();
   static void DestroyWeakPtr(gpointer data);
+  bool HasRequested() const;
 
  private:
   std::string port_name_;
-- 
2.7.4


From c8c3a9577b0f30976463a3eba86597fe3e46ff93 Mon Sep 17 00:00:00 2001
From: Hwankyu Jhun <h.jhun@samsung.com>
Date: Thu, 5 Jan 2023 01:42:10 +0000
Subject: [PATCH 16/16] Release version 1.13.11

Changes:
 - Modify connect method of proxy

Change-Id: I703dd13a99aaaa1bd96bceefcb49e93a8e99f719
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
---
 packaging/rpc-port.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpc-port.spec b/packaging/rpc-port.spec
index d5e9ca6..d5b8dbc 100644
--- a/packaging/rpc-port.spec
+++ b/packaging/rpc-port.spec
@@ -1,6 +1,6 @@
 Name:       rpc-port
 Summary:    RPC Port library
-Version: 	1.13.10
+Version: 	1.13.11
 Release:    0
 Group:		Application Framework/Libraries
 License:    Apache-2.0
-- 
2.7.4