Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 0 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,24 +56,6 @@ jobs:
os: ubuntu-24.04
install: g++-14
supported: true
- toolset: clang
install: clang-10
compiler: clang++-10
cxxstd: "14,17,2a"
os: ubuntu-20.04
supported: true
- toolset: clang
install: clang-11
compiler: clang++-11
cxxstd: "14,17,2a"
os: ubuntu-20.04
supported: true
- toolset: clang
install: clang-12
compiler: clang++-12
cxxstd: "14,17,20"
os: ubuntu-20.04
supported: true
- toolset: clang
install: clang-13
compiler: clang++-13
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:


- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v17.0.2
rev: v20.1.0
hooks:
- id: clang-format
types_or: [c++, c, cuda]
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 3.5...3.16)
project(boost_lockfree VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)

option(BOOST_LOCKFREE_BUILD_TESTS "Build boost::lockfree tests" OFF)
option(BOOST_LOCKFREE_TESTS_STRESSTEST "Build boost::lockfree with more excessive stress tests" OFF)
option(BOOST_LOCKFREE_USE_FILE_SET "Use FILE_SET for boost::lockfree" OFF)

if (NOT DEFINED CMAKE_CXX_STANDARD)
Expand Down
2 changes: 1 addition & 1 deletion include/boost/lockfree/detail/atomic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ using detail::memory_order_consume;
using detail::memory_order_relaxed;
using detail::memory_order_release;

}} // namespace boost::lockfree
}} // namespace boost::lockfree

#endif /* BOOST_LOCKFREE_DETAIL_ATOMIC_HPP */
2 changes: 1 addition & 1 deletion include/boost/lockfree/detail/parameter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,6 @@ using extract_allow_multiple_reads

//----------------------------------------------------------------------------------------------------------------------

}}} // namespace boost::lockfree::detail
}}} // namespace boost::lockfree::detail

#endif /* BOOST_LOCKFREE_DETAIL_PARAMETER_HPP */
2 changes: 1 addition & 1 deletion include/boost/lockfree/detail/tagged_ptr_dcas.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,6 @@ class alignas( 2 * sizeof( void* ) ) tagged_ptr
tag_t tag;
};

}}} // namespace boost::lockfree::detail
}}} // namespace boost::lockfree::detail

#endif /* BOOST_LOCKFREE_TAGGED_PTR_DCAS_HPP_INCLUDED */
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,6 @@ class tagged_ptr
# error unsupported platform
#endif

}}} // namespace boost::lockfree::detail
}}} // namespace boost::lockfree::detail

#endif /* BOOST_LOCKFREE_TAGGED_PTR_PTRCOMPRESSION_HPP_INCLUDED */
2 changes: 1 addition & 1 deletion include/boost/lockfree/lockfree_forward.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class spsc_queue;
template < typename T, typename... Options >
struct spsc_value;

}} // namespace boost::lockfree
}} // namespace boost::lockfree

#endif // BOOST_DOXYGEN_INVOKED
#endif // BOOST_LOCKFREE_FORWARD_HPP_INCLUDED
2 changes: 1 addition & 1 deletion include/boost/lockfree/policies.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,6 @@ struct allow_multiple_reads;

#endif

}} // namespace boost::lockfree
}} // namespace boost::lockfree

#endif /* BOOST_LOCKFREE_POLICIES_HPP_INCLUDED */
4 changes: 2 additions & 2 deletions include/boost/lockfree/spsc_queue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class ringbuffer_base
return begin;

size_t input_count = std::distance( begin, end );
input_count = ( std::min )( input_count, avail );
input_count = (std::min)( input_count, avail );

size_t new_write_index = write_index + input_count;

Expand Down Expand Up @@ -229,7 +229,7 @@ class ringbuffer_base
if ( avail == 0 )
return 0;

output_count = ( std::min )( output_count, avail );
output_count = (std::min)( output_count, avail );

size_t new_read_index = read_index + output_count;

Expand Down
2 changes: 1 addition & 1 deletion include/boost/lockfree/stack.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -810,6 +810,6 @@ class stack
#endif
};

}} // namespace boost::lockfree
}} // namespace boost::lockfree

#endif /* BOOST_LOCKFREE_STACK_HPP_INCLUDED */
5 changes: 4 additions & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,11 @@ foreach(Test ${Tests})
)
set_target_properties( boost_lockfree-${Test} PROPERTIES CXX_STANDARD_REQUIRED 14)

if (BOOST_LOCKFREE_TESTS_STRESSTEST)
target_compile_definitions(boost_lockfree-${Test} PRIVATE BOOST_LOCKFREE_STRESS_TEST)
endif()

if (TARGET boost_lockfree-${Test})
add_dependencies(boost_lockfree_all_tests boost_lockfree-${Test} )
endif()

endforeach()
2 changes: 1 addition & 1 deletion test/test_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ struct queue_stress_tester
#ifndef BOOST_LOCKFREE_STRESS_TEST
static const long node_count = 5000;
#else
static const long node_count = 500000;
static const long node_count = 5000000;
#endif
const int reader_threads;
const int writer_threads;
Expand Down