From 2fcb8ce4599ab94178aae1ac9f9ff800fd25cd0a Mon Sep 17 00:00:00 2001
From: Alberto Compagno <acompagn+fdio@cisco.com>
Date: Wed, 23 Oct 2019 15:41:59 +0200
Subject: [HICN-354] Fixed bug on raaqm when reassemblying packets

Moved rescheduleOnIOService in the header file to allow its usage together
with inheritance

Change-Id: I15e4b92535e1478d0dd09828d2d13e2b77e000b3
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
---
 .../hicn/transport/interfaces/socket_producer.cc   | 64 ----------------------
 1 file changed, 64 deletions(-)

(limited to 'libtransport/src/hicn/transport/interfaces/socket_producer.cc')

diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.cc b/libtransport/src/hicn/transport/interfaces/socket_producer.cc
index f90197490..8f8fc1a79 100644
--- a/libtransport/src/hicn/transport/interfaces/socket_producer.cc
+++ b/libtransport/src/hicn/transport/interfaces/socket_producer.cc
@@ -391,70 +391,6 @@ void ProducerSocket::onInterest(Interest &interest) {
   }
 }
 
-// If the thread calling lambda_func is not the same of io_service, this
-// function reschedule the function on it
-template <typename Lambda, typename arg2>
-int ProducerSocket::rescheduleOnIOService(int socket_option_key,
-                                          arg2 socket_option_value,
-                                          Lambda lambda_func) {
-  // To enforce type check
-  std::function<int(int, arg2)> func = lambda_func;
-  int result = SOCKET_OPTION_SET;
-  if (listening_thread_.joinable() &&
-      std::this_thread::get_id() != listening_thread_.get_id()) {
-    std::mutex mtx;
-    /* Condition variable for the wait */
-    std::condition_variable cv;
-    bool done = false;
-    io_service_.dispatch([&socket_option_key, &socket_option_value, &mtx,
-                          &result, &done, &func]() {
-      std::unique_lock<std::mutex> lck(mtx);
-      done = true;
-      result = func(socket_option_key, socket_option_value);
-    });
-    std::unique_lock<std::mutex> lck(mtx);
-    if (!done) {
-      cv.wait(lck);
-    }
-  } else {
-    result = func(socket_option_key, socket_option_value);
-  }
-
-  return result;
-}
-
-// If the thread calling lambda_func is not the same of io_service, this
-// function reschedule the function on it
-template <typename Lambda, typename arg2>
-int ProducerSocket::rescheduleOnIOServiceWithReference(
-    int socket_option_key, arg2 &socket_option_value, Lambda lambda_func) {
-  // To enforce type check
-  std::function<int(int, arg2 &)> func = lambda_func;
-  int result = SOCKET_OPTION_SET;
-  if (listening_thread_.joinable() &&
-      std::this_thread::get_id() != this->listening_thread_.get_id()) {
-    std::mutex mtx;
-    /* Condition variable for the wait */
-    std::condition_variable cv;
-    std::unique_lock<std::mutex> lck(mtx);
-    bool done = false;
-    io_service_.dispatch([this, &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);
-
-      if (!done) {
-        cv.wait(lck);
-      }
-    });
-  } else {
-    result = func(socket_option_key, socket_option_value);
-  }
-
-  return result;
-}
-
 int ProducerSocket::setSocketOption(int socket_option_key,
                                     uint32_t socket_option_value) {
   switch (socket_option_key) {
-- 
cgit 1.2.3-korg