Skip to content

Fix c++11 build for Ubuntu 14.04 #446

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

Open
lo-simon wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix c++11 build for Ubuntu 14.04 #446

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1376150
Add <condition_variable> include for std::unique_lock
lo-simon Apr 24, 2025
e812ebd
Fix for ubuntu 14.04 (C++11)
lo-simon Apr 24, 2025
dc8c3d5
Include <mutex> for std::unique_lock
lo-simon Apr 24, 2025
b92723b
Merge branch 'sony:master' into fix-c++11-build
lo-simon Apr 24, 2025
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
1 change: 1 addition & 0 deletions Development/nmos/mutex.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef NMOS_MUTEX_H
#define NMOS_MUTEX_H

#include <condition_variable>
Copy link
Copy Markdown
Contributor

@garethsb garethsb Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This header should come from bst/shared_mutex.h and if there's a case where it should be but isn't, the fix belongs there, I think?

Copy link
Copy Markdown
Collaborator Author

@lo-simon lo-simon Apr 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The <condition_variable> header only comes from bst/shared_mutex. h when BST_THREAD_BOOST is not defined. We have the BST_THREAD_BOOST set as the default in the build, i.e., we always use boost as the default.

we should include the for std::unique_lock instead of the <condition_variable>

#include "bst/shared_mutex.h"

namespace nmos
Expand Down
12 changes: 6 additions & 6 deletions Development/nmos/test/condition_variable_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "bst/test/test.h"

namespace
namespace test_condition_variable
{
struct test_model
{
Expand Down Expand Up @@ -89,27 +89,27 @@ namespace
////////////////////////////////////////////////////////////////////////////////////////////
BST_TEST_CASE(testConditionVariableWait)
{
const auto max_threads{ 500 };
const int max_threads{ 500 };

// start a wait thread
std::thread wait_thread(wait);
std::thread wait_thread(test_condition_variable::wait);

// start a large number of lock_then_unlock threads to exhaust the lock limit
std::vector<std::thread> threads;
for (auto idx = 0; idx < max_threads; idx++)
{
threads.push_back(std::thread(lock_then_unlock));
threads.push_back(std::thread(test_condition_variable::lock_then_unlock));
}

// send a lot of notifications to wake up the wait thread
// to wake the wait thread when lock limit is exhausted
for (auto idx = 0; idx < 100; idx++)
{
model.notify();
test_condition_variable::model.notify();
}

// start the thread to pause 1 second before signal a shutdown
std::thread shutdown_thread(shutdown, std::chrono::seconds{ 1 });
std::thread shutdown_thread(test_condition_variable::shutdown, std::chrono::seconds{ 1 });

shutdown_thread.join();
wait_thread.join();
Expand Down
Loading