diff options
author | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-02-13 15:06:23 +0100 |
---|---|---|
committer | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-02-13 15:06:23 +0100 |
commit | d1dedcb21e7ba074a0a83fad09a742e54a8d1525 (patch) | |
tree | 31aebff80bf016d32480a1e38b3e58110f8adb67 /libtransport/src/hicn/transport/core | |
parent | 13fccc2bb1c2317061e6bf985c87bca647fb3b6f (diff) |
[HICN-60] Solved concurrent memory access which was leading to seg-fault
Change-Id: I7b9fcf79bb97650346f7d92af8cbb419f0a5cb95
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/core')
-rw-r--r-- | libtransport/src/hicn/transport/core/memif_connector.cc | 22 | ||||
-rw-r--r-- | libtransport/src/hicn/transport/core/memif_connector.h | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/libtransport/src/hicn/transport/core/memif_connector.cc b/libtransport/src/hicn/transport/core/memif_connector.cc index a650c3681..38b2a2a98 100644 --- a/libtransport/src/hicn/transport/core/memif_connector.cc +++ b/libtransport/src/hicn/transport/core/memif_connector.cc @@ -298,17 +298,11 @@ int MemifConnector::txBurst(uint16_t qid) { } void MemifConnector::sendCallback(const std::error_code &ec) { + timer_set_ = false; + if (TRANSPORT_EXPECT_TRUE(!ec && !is_connecting_)) { doSend(); } - - if (output_buffer_.size() > 0) { - send_timer_->expiresFromNow(std::chrono::microseconds(50)); - send_timer_->asyncWait( - std::bind(&MemifConnector::sendCallback, this, std::placeholders::_1)); - } else { - timer_set_ = false; - } } void MemifConnector::processInputBuffer() { @@ -378,6 +372,7 @@ int MemifConnector::onInterrupt(memif_conn_handle_t conn, void *private_ctx, packet->append(packet_length); if (!connector->input_buffer_.push(std::move(packet))) { + TRANSPORT_LOGI("Error pushing packet. Ring buffer full."); // TODO Here we should consider the possibility to signal the congestion @@ -442,7 +437,11 @@ void MemifConnector::close() { void MemifConnector::enableBurst() { enable_burst_ = true; } void MemifConnector::send(const Packet::MemBufPtr &packet) { -#ifdef CANCEL_TIMER + { + utils::SpinLock::Acquire locked(write_msgs_lock_); + output_buffer_.push_back(packet); + } +#if CANCEL_TIMER if (!timer_set_) { timer_set_ = true; send_timer_->expiresFromNow(std::chrono::microseconds(50)); @@ -450,11 +449,6 @@ void MemifConnector::send(const Packet::MemBufPtr &packet) { std::bind(&MemifConnector::sendCallback, this, std::placeholders::_1)); } #endif - - { - utils::SpinLock::Acquire locked(write_msgs_lock_); - output_buffer_.push_back(packet); - } } int MemifConnector::doSend() { diff --git a/libtransport/src/hicn/transport/core/memif_connector.h b/libtransport/src/hicn/transport/core/memif_connector.h index 6e76b78da..3d2e8411d 100644 --- a/libtransport/src/hicn/transport/core/memif_connector.h +++ b/libtransport/src/hicn/transport/core/memif_connector.h @@ -110,7 +110,7 @@ class MemifConnector : public Connector { int epfd; std::unique_ptr<std::thread> memif_worker_; utils::EpollEventReactor event_reactor_; - volatile bool timer_set_; + std::atomic_bool timer_set_; std::unique_ptr<utils::FdDeadlineTimer> send_timer_; asio::io_service &io_service_; std::unique_ptr<asio::io_service::work> work_; |