diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-21 18:03:16 +0200 |
|---|---|---|
| committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-22 18:01:19 +0200 |
| commit | 0afc64ba6ca5a522202c948fc56ae42344a51e76 (patch) | |
| tree | afe1b99d0ffc97122b3fcb1b6e7efbd247cc49c4 /libtransport | |
| parent | a9a7f4c36804d0a5acc5788cf2ef9f39954cccb4 (diff) | |
[HICN-342] No need to take a lock on the hash entry if the lookup for
a data hit the CS. Data packets coming from the network are dropped,
data packets coming from an application face are either dropped or
sent to the push node (which does not require a lock on the hash
entry)
Change-Id: Icf662dffa33b9dda2e2a69fc2104a69a82ef19fd
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'libtransport')
4 files changed, 6 insertions, 6 deletions
diff --git a/libtransport/src/hicn/transport/interfaces/callbacks.cc b/libtransport/src/hicn/transport/interfaces/callbacks.cc index af470898c..2574e7720 100644 --- a/libtransport/src/hicn/transport/interfaces/callbacks.cc +++ b/libtransport/src/hicn/transport/interfaces/callbacks.cc @@ -19,7 +19,7 @@ namespace transport { namespace interface { -nullptr_t VOID_HANDLER = nullptr; +std::nullptr_t VOID_HANDLER = nullptr; } // namespace interface diff --git a/libtransport/src/hicn/transport/interfaces/callbacks.h b/libtransport/src/hicn/transport/interfaces/callbacks.h index 41b6213fe..7194cca42 100644 --- a/libtransport/src/hicn/transport/interfaces/callbacks.h +++ b/libtransport/src/hicn/transport/interfaces/callbacks.h @@ -107,7 +107,7 @@ using ProducerContentObjectCallback = using ProducerInterestCallback = std::function<void(ProducerSocket &, core::Interest &)>; -extern nullptr_t VOID_HANDLER; +extern std::nullptr_t VOID_HANDLER; } // namespace interface diff --git a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc index 6eae23c85..14cd27b6b 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_consumer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_consumer.cc @@ -135,8 +135,8 @@ int ConsumerSocket::rescheduleOnIOService(int socket_option_key, /* Condition variable for the wait */ std::condition_variable cv; bool done = false; - io_service_.dispatch([this, &socket_option_key, &socket_option_value, &mtx, - &cv, &result, &done, &func]() { + 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); diff --git a/libtransport/src/hicn/transport/interfaces/socket_producer.cc b/libtransport/src/hicn/transport/interfaces/socket_producer.cc index bc93e77c6..f90197490 100644 --- a/libtransport/src/hicn/transport/interfaces/socket_producer.cc +++ b/libtransport/src/hicn/transport/interfaces/socket_producer.cc @@ -406,8 +406,8 @@ int ProducerSocket::rescheduleOnIOService(int socket_option_key, /* Condition variable for the wait */ std::condition_variable cv; bool done = false; - io_service_.dispatch([this, &socket_option_key, &socket_option_value, &mtx, - &cv, &result, &done, &func]() { + 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); |