From afe807c61372fe2481e73af63c8382af1e1d3011 Mon Sep 17 00:00:00 2001
From: Mauro Sardara <msardara@cisco.com>
Date: Wed, 4 Mar 2020 16:21:54 +0100
Subject: [HICN-540] Optimizations for libhicntransport

Change-Id: I8b46b4eb2ef5488c09041887cc8296a216440f33
Signed-off-by: Mauro Sardara <msardara@cisco.com>
---
 libtransport/src/implementation/socket_consumer.h | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to 'libtransport/src/implementation/socket_consumer.h')

diff --git a/libtransport/src/implementation/socket_consumer.h b/libtransport/src/implementation/socket_consumer.h
index 2fc8d2b48..488f238ba 100644
--- a/libtransport/src/implementation/socket_consumer.h
+++ b/libtransport/src/implementation/socket_consumer.h
@@ -35,7 +35,7 @@ class ConsumerSocket : public Socket<BasePortal> {
  public:
   ConsumerSocket(interface::ConsumerSocket *consumer, int protocol)
       : consumer_interface_(consumer),
-        portal_(std::make_shared<Portal>(io_service_)),
+        portal_(std::make_shared<Portal>()),
         async_downloader_(),
         interest_lifetime_(default_values::interest_lifetime),
         min_window_size_(default_values::min_window_size),
@@ -62,10 +62,8 @@ class ConsumerSocket : public Socket<BasePortal> {
         on_interest_satisfied_(VOID_HANDLER),
         on_content_object_input_(VOID_HANDLER),
         on_content_object_verification_(VOID_HANDLER),
-        on_content_object_(VOID_HANDLER),
         stats_summary_(VOID_HANDLER),
         read_callback_(nullptr),
-        virtual_download_(false),
         timer_interval_milliseconds_(0),
         guard_raaqm_params_() {
     switch (protocol) {
@@ -323,11 +321,6 @@ class ConsumerSocket : public Socket<BasePortal> {
     int result = SOCKET_OPTION_NOT_SET;
     if (!transport_protocol_->isRunning()) {
       switch (socket_option_key) {
-        case OtherOptions::VIRTUAL_DOWNLOAD:
-          virtual_download_ = socket_option_value;
-          result = SOCKET_OPTION_SET;
-          break;
-
         case GeneralTransportOptions::VERIFY_SIGNATURE:
           verify_signature_ = socket_option_value;
           result = SOCKET_OPTION_SET;
@@ -631,10 +624,6 @@ class ConsumerSocket : public Socket<BasePortal> {
         socket_option_value = transport_protocol_->isRunning();
         break;
 
-      case OtherOptions::VIRTUAL_DOWNLOAD:
-        socket_option_value = virtual_download_;
-        break;
-
       case GeneralTransportOptions::VERIFY_SIGNATURE:
         socket_option_value = verify_signature_;
         break;
@@ -861,8 +850,9 @@ class ConsumerSocket : public Socket<BasePortal> {
       /* Condition variable for the wait */
       std::condition_variable cv;
       bool done = false;
-      io_service_.dispatch([&socket_option_key, &socket_option_value, &mtx, &cv,
-                            &result, &done, &func]() {
+      portal_->getIoService().dispatch([&socket_option_key,
+                                        &socket_option_value, &mtx, &cv,
+                                        &result, &done, &func]() {
         std::unique_lock<std::mutex> lck(mtx);
         done = true;
         result = func(socket_option_key, socket_option_value);
@@ -881,7 +871,6 @@ class ConsumerSocket : public Socket<BasePortal> {
 
  protected:
   interface::ConsumerSocket *consumer_interface_;
-  asio::io_service io_service_;
 
   std::shared_ptr<Portal> portal_;
   utils::EventThread async_downloader_;
@@ -925,15 +914,11 @@ class ConsumerSocket : public Socket<BasePortal> {
   ConsumerInterestCallback on_interest_satisfied_;
   ConsumerContentObjectCallback on_content_object_input_;
   ConsumerContentObjectVerificationCallback on_content_object_verification_;
-  ConsumerContentObjectCallback on_content_object_;
   ConsumerTimerCallback stats_summary_;
   ConsumerContentObjectVerificationFailedCallback verification_failed_callback_;
 
   ReadCallback *read_callback_;
 
-  // Virtual download for traffic generator
-  bool virtual_download_;
-
   uint32_t timer_interval_milliseconds_;
 
   // Transport protocol
-- 
cgit 1.2.3-korg