From 2fcb8ce4599ab94178aae1ac9f9ff800fd25cd0a Mon Sep 17 00:00:00 2001 From: Alberto Compagno 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 --- .../hicn/transport/interfaces/socket_consumer.cc | 31 ---------------------- 1 file changed, 31 deletions(-) (limited to 'libtransport/src/hicn/transport/interfaces/socket_consumer.cc') diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc index 14cd27b6b..64b60101d 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc @@ -121,37 +121,6 @@ asio::io_service &ConsumerSocket::getIoService() { return portal_->getIoService(); } -// If the thread calling lambda_func is not the same of io_service, this -// function reschedule the function on it -template -int ConsumerSocket::rescheduleOnIOService(int socket_option_key, - arg2 socket_option_value, - Lambda lambda_func) { - // To enforce type check - std::function func = lambda_func; - int result = SOCKET_OPTION_SET; - if (transport_protocol_->isRunning()) { - 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 lck(mtx); - done = true; - result = func(socket_option_key, socket_option_value); - }); - std::unique_lock lck(mtx); - if (!done) { - cv.wait(lck); - } - } else { - result = func(socket_option_key, socket_option_value); - } - - return result; -} - int ConsumerSocket::setSocketOption(int socket_option_key, ReadCallback *socket_option_value) { // Reschedule the function on the io_service to avoid race condition in case -- cgit 1.2.3-korg