Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve SHM resilience to crashing participants (backport #3759) #3763

Merged
merged 1 commit into from
Aug 7, 2023
Merged

Improve SHM resilience to crashing participants (backport #3759) #3763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/cpp/rtps/DataSharing/DataSharingListener.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,21 @@ void DataSharingListener::run()
std::unique_lock<Segment::mutex> lock(notification_->notification_->notification_mutex, std::defer_lock);
while (is_running_.load())
{
lock.lock();
notification_->notification_->notification_cv.wait(lock, [&]
{
return !is_running_.load() || notification_->notification_->new_data.load();
});
try
{
lock.lock();
notification_->notification_->notification_cv.wait(lock, [&]
{
return !is_running_.load() || notification_->notification_->new_data.load();
});

lock.unlock();
lock.unlock();
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
continue;
}

if (!is_running_.load())
{
Expand Down
15 changes: 11 additions & 4 deletions src/cpp/rtps/DataSharing/DataSharingNotification.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,17 @@ class DataSharingNotification
*/
inline void notify()
{
std::unique_lock<Segment::mutex> lock(notification_->notification_mutex);
notification_->new_data.store(true);
lock.unlock();
notification_->notification_cv.notify_all();
try
{
std::unique_lock<Segment::mutex> lock(notification_->notification_mutex);
notification_->new_data.store(true);
lock.unlock();
notification_->notification_cv.notify_all();
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
}
}

/**
Expand Down
59 changes: 44 additions & 15 deletions src/cpp/rtps/transport/shared_mem/SharedMemGlobal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,12 +670,19 @@ class SharedMemGlobal
void close_listener(
std::atomic<bool>* is_listener_closed)
{
try
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
is_listener_closed->exchange(true);
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
is_listener_closed->exchange(true);
}
node_->empty_cv.notify_all();
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
}

node_->empty_cv.notify_all();
}

/**
Expand Down Expand Up @@ -782,17 +789,25 @@ class SharedMemGlobal
bool get_and_remove_blocked_processing(
BufferDescriptor& buffer_descriptor)
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
for (uint32_t i = 0; i < PortNode::LISTENERS_STATUS_SIZE; i++)
try
{
if (node_->listeners_status[i].is_in_use &&
node_->listeners_status[i].is_processing)
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
for (uint32_t i = 0; i < PortNode::LISTENERS_STATUS_SIZE; i++)
{
buffer_descriptor = node_->listeners_status[i].descriptor;
listener_processing_stop(i);
return true;
if (node_->listeners_status[i].is_in_use &&
node_->listeners_status[i].is_processing)
{
buffer_descriptor = node_->listeners_status[i].descriptor;
listener_processing_stop(i);
return true;
}
}
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
}

return false;
}

Expand All @@ -805,10 +820,17 @@ class SharedMemGlobal
uint32_t listener_index,
const BufferDescriptor& buffer_descriptor)
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
try
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);

node_->listeners_status[listener_index].descriptor = buffer_descriptor;
node_->listeners_status[listener_index].is_processing = true;
node_->listeners_status[listener_index].descriptor = buffer_descriptor;
node_->listeners_status[listener_index].is_processing = true;
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
}
}

/**
Expand All @@ -818,9 +840,16 @@ class SharedMemGlobal
void listener_processing_stop(
uint32_t listener_index)
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);
try
{
std::lock_guard<SharedMemSegment::mutex> lock(node_->empty_cv_mutex);

node_->listeners_status[listener_index].is_processing = false;
node_->listeners_status[listener_index].is_processing = false;
}
catch (const boost::interprocess::interprocess_exception& /*e*/)
{
// Timeout when locking
}
}

/**
Expand Down
5 changes: 2 additions & 3 deletions src/cpp/rtps/transport/shared_mem/SharedMemManager.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,9 @@ class SharedMemManager :
throw std::runtime_error("");
}

// Read and pop descriptor
SharedMemGlobal::BufferDescriptor buffer_descriptor = head_cell->data();
global_port_->pop(*global_listener_, was_cell_freed);

auto segment = shared_mem_manager_->find_segment(buffer_descriptor.source_segment_id);
auto buffer_node =
Expand All @@ -730,9 +732,6 @@ class SharedMemManager :
buffer_node,
buffer_descriptor.validity_id);

// If the cell has been read by all listeners
global_port_->pop(*global_listener_, was_cell_freed);

if (buffer_ref)
{
global_port_->listener_processing_start(listener_index_, buffer_descriptor);
Expand Down
Loading