Optimize some parameters

Use reference or move semantics instead of copy.

Change-Id: Iab4c4f5981a7982290843b497b71d6f353f665d2
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/cion/channel/broadcast_channel.cc b/cion/channel/broadcast_channel.cc
index 55dac41ce3c3dcef666d83b0ebbf158cbb1725ed..80a55cb7fc9acd20f7ea328f35a81f49d5d8d0e9 100644 (file)
--- a/cion/channel/broadcast_channel.cc
+++ b/cion/channel/broadcast_channel.cc
@@ -166,7 +166,7 @@ void BroadcastChannel::Impl::OnOpened(VineDpPtr dp, int result) {
 }
 
 void BroadcastChannel::Impl::OnReceived(VineDpPtr dp,
-    std::vector<unsigned char> data) {
+    const std::vector<unsigned char>& data) {
 
   ChannelJob<BroadcastChannel> job(parent_,
       std::make_shared<tizen_base::Parcel>(data.data(), data.size()), dp);

diff --git a/cion/channel/broadcast_channel_implementation.hh b/cion/channel/broadcast_channel_implementation.hh
index 6b9545d5a335df766edcb843ea29cb02b79de1ab..1d5253f9c78b23d89a5db78b20ebd90ecf1f42b5 100644 (file)
--- a/cion/channel/broadcast_channel_implementation.hh
+++ b/cion/channel/broadcast_channel_implementation.hh
@@ -47,7 +47,8 @@ class BroadcastChannel::Impl : private IVineDpTerminatedEventHandler,
   friend class BroadcastChannel;
   void OnTerminated(VineDpPtr dp) override;
   void OnOpened(VineDpPtr dp, int result) override;
-  void OnReceived(VineDpPtr dp, std::vector<unsigned char> data) override;
+  void OnReceived(VineDpPtr dp,
+      const std::vector<unsigned char>& data) override;
   void OnJoined(VineDpPtr dp, std::string peer_id) override;
   void OnLeft(VineDpPtr dp, std::string peer_id) override;
   void Subscribe();

diff --git a/cion/channel/client_channel.cc b/cion/channel/client_channel.cc
index 31e03d12dd513cce0721f9b873a14efdc186b070..87722d4a8ca1e262e2dd5bb121d5fd2bc458e34c 100644 (file)
--- a/cion/channel/client_channel.cc
+++ b/cion/channel/client_channel.cc
@@ -54,7 +54,7 @@ namespace channel {
 
 ClientChannel::Impl::Impl(ClientChannel* parent, std::string service_name,
     SecurityInfo security)
-    : parent_(parent), service_name_(service_name),
+    : parent_(parent), service_name_(std::move(service_name)),
       security_(std::move(security)) {
   if (!IsWifiActivated()) {
     LOG(ERROR) << "Wi-Fi is not activated";
@@ -107,7 +107,8 @@ void ClientChannel::Impl::Send(cmd::CionCmd cmd, IPayload* data) {
   as.Send(cmd, dplist, data);
 }
 
-void ClientChannel::Impl::Send(cmd::CionCmd cmd, std::vector<uint8_t> raw) {
+void ClientChannel::Impl::Send(cmd::CionCmd cmd,
+    const std::vector<uint8_t>& raw) {
   LOG(INFO) << "send uint& CMD " << cmd;
   if (connected_peer_ == nullptr) {
     LOG(ERROR) << "No connection to send";
@@ -335,14 +336,14 @@ void ClientChannel::Impl::OnTerminated(VineDpPtr dp) {
 }
 
 void ClientChannel::Impl::OnReceived(
-    VineDpPtr dp, std::vector<unsigned char> data) {
+    VineDpPtr dp, const std::vector<unsigned char>& data) {
   LOG(INFO) << "OnReceived " << data.size();
 
   // Reply to the sender if a reply is needed
   TrySyncReply(data);
 
   ChannelJob<ClientChannel> job(parent_, std::make_shared<tizen_base::Parcel>(
-        reinterpret_cast<unsigned char*>(data.data()),
+        reinterpret_cast<const unsigned char*>(data.data()),
       data.size()), dp);
   queue_.Push(job);
 

diff --git a/cion/channel/client_channel_implementation.hh b/cion/channel/client_channel_implementation.hh
index 2f7962307eabf6bd464b8f00d37439d5be64c633..f8e2370d48efa237c485c473375a029d2c87135a 100644 (file)
--- a/cion/channel/client_channel_implementation.hh
+++ b/cion/channel/client_channel_implementation.hh
@@ -47,7 +47,7 @@ class ClientChannel::Impl : public IVineBrowser, IVineDpOpenedEventHandler,
   virtual ~Impl();
   void SendPeerInfo(PeerInfo* peerinfo);
   void Send(cmd::CionCmd cmd, IPayload* data);
-  void Send(cmd::CionCmd cmd, std::vector<uint8_t> raw);
+  void Send(cmd::CionCmd cmd, const std::vector<uint8_t>& raw);
   std::vector<char> SendData(std::vector<char> data, int timeout);
   void SendPayloadAsync(IPayload* data,
       PayloadAsyncResult::PayloadAsyncResultCallback func);
@@ -63,7 +63,8 @@ class ClientChannel::Impl : public IVineBrowser, IVineDpOpenedEventHandler,
 
   void OnDiscovered(VineService service, std::string ip) override;
   void OnOpened(VineDpPtr dp, int result) override;
-  void OnReceived(VineDpPtr dp, std::vector<unsigned char> data) override;
+  void OnReceived(VineDpPtr dp,
+      const std::vector<unsigned char>& data) override;
   void OnTerminated(VineDpPtr dp) override;
 
  private:

diff --git a/cion/channel/server_channel.cc b/cion/channel/server_channel.cc
index 93ee7b36f7765305df1962dc558a6a854e997a50..4c565b40f16253e6381f3f8120df350260aa663e 100644 (file)
--- a/cion/channel/server_channel.cc
+++ b/cion/channel/server_channel.cc
@@ -66,7 +66,7 @@ namespace channel {
 
 ServerChannel::Impl::Impl(
   ServerChannel* parent, std::string service_name, SecurityInfo security)
-      : parent_(parent), service_name_(service_name),
+      : parent_(parent), service_name_(std::move(service_name)),
         security_(std::move(security)) {
   if (!IsWifiActivated()) {
     LOG(ERROR) << "Wi-Fi is not activated";
@@ -139,16 +139,15 @@ void ServerChannel::Impl::Accept(std::shared_ptr<PeerInfo> peer_info) {
 }
 
 void ServerChannel::Impl::Reject(std::shared_ptr<PeerInfo> peer_info,
-    std::string reason) {
+    const std::string& reason) {
   std::shared_ptr<ServerPeerInfo> server_peer_info =
       std::dynamic_pointer_cast<ServerPeerInfo>(peer_info);
   auto dplist = std::make_shared<std::list<std::shared_ptr<VineDp>>>();
   dplist->push_back(server_peer_info->GetClientDp());
   std::vector<char> data(reason.begin(), reason.end());
-  DataPayload* dpayload = new DataPayload();
-  dpayload->SetData(data);
-  Send(cmd::CionCmd::Reject, dplist, dpayload);
-  delete dpayload;
+  DataPayload dpayload;
+  dpayload.SetData(data);
+  Send(cmd::CionCmd::Reject, dplist, &dpayload);
 }
 
 void ServerChannel::Impl::SendPayloadAsync(IPayload* data,
@@ -199,7 +198,7 @@ void ServerChannel::Impl::OnOpened(VineDpPtr dp, int result) {
 }
 
 void ServerChannel::Impl::OnReceived(VineDpPtr dp,
-    std::vector<unsigned char> data) {
+    const std::vector<unsigned char>& data) {
   LOG(INFO) << "server OnReceived " << dp->GetRawDp();
   ChannelJob<ServerChannel> job(parent_, std::make_shared<tizen_base::Parcel>(
     data.data(), data.size()), dp);
@@ -336,7 +335,7 @@ void ServerChannel::Impl::Send(cmd::CionCmd cmd,
 }
 
 void ServerChannel::Impl::Send(cmd::CionCmd cmd, VineDpPtr client_dp,
-    std::vector<uint8_t> raw) {
+    const std::vector<uint8_t>& raw) {
   tizen_base::Parcel parcel;
   parcel.WriteUInt32(cmd);
   parcel.WriteUInt32(raw.size());

diff --git a/cion/channel/server_channel_implementation.hh b/cion/channel/server_channel_implementation.hh
index f760709b9a4ea6bca40e87e3e3b9b3820d870727..2ea947f5e604ea785069ef8bb10f7bf3379de9c4 100644 (file)
--- a/cion/channel/server_channel_implementation.hh
+++ b/cion/channel/server_channel_implementation.hh
@@ -49,11 +49,12 @@ class ServerChannel::Impl : public IVineDpOpenedEventHandler,
   void Stop();
   void Disconnect(std::shared_ptr<PeerInfo> peer);
   void Accept(std::shared_ptr<PeerInfo> peer_info);
-  void Reject(std::shared_ptr<PeerInfo> peer_info, std::string reason);
+  void Reject(std::shared_ptr<PeerInfo> peer_info, const std::string& reason);
   void SendPayloadAsync(IPayload* data, std::shared_ptr<PeerInfo> peer_info,
       PayloadAsyncResult::PayloadAsyncResultCallback func);
   void OnOpened(VineDpPtr dp, int result) override;
-  void OnReceived(VineDpPtr dp, std::vector<unsigned char> data) override;
+  void OnReceived(VineDpPtr dp,
+      const std::vector<unsigned char>& data) override;
   void OnTerminated(VineDpPtr dp) override;
   void OnAccepted(VineDpPtr dp, VineDpPtr accepted_dp) override;
 
@@ -62,7 +63,8 @@ class ServerChannel::Impl : public IVineDpOpenedEventHandler,
   void Send(cmd::CionCmd cmd,
     std::shared_ptr<std::list<std::shared_ptr<VineDp>>>,
     IPayload* data);
-  void Send(cmd::CionCmd cmd, VineDpPtr client_dp, std::vector<uint8_t> raw);
+  void Send(cmd::CionCmd cmd, VineDpPtr client_dp,
+      const std::vector<uint8_t>& raw);
 
   ServerChannel* parent_;
   std::string service_name_;

diff --git a/cion/vine/vine_interfaces.hh b/cion/vine/vine_interfaces.hh
index cd205fcb238af48aa2eb8edf9d00336b19931c24..344102e8a2b6b2693e5e9a1739fbcd6e66e335e9 100644 (file)
--- a/cion/vine/vine_interfaces.hh
+++ b/cion/vine/vine_interfaces.hh
@@ -43,7 +43,8 @@ class IVineDpOpenedEventHandler {
 class IVineDpReceivedEventHandler {
  public:
   virtual ~IVineDpReceivedEventHandler() = default;
-  virtual void OnReceived(VineDpPtr dp, std::vector<unsigned char> data) = 0;
+  virtual void OnReceived(VineDpPtr dp,
+      const std::vector<unsigned char>& data) = 0;
 };
 
 class IVineDpAcceptedEventHandler {