Skip to content

Avoid std::atomic_init deprecated by P0883. #140

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

Merged
merged 2 commits into from
Jan 28, 2020
Merged

Avoid std::atomic_init deprecated by P0883. #140

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65840ee
Avoid std::atomic_init deprecated by P0883.
BillyONeal Jan 28, 2020
6d866f9
Restore initialization of the array in multi_producer_sequencer.hpp.
BillyONeal Jan 28, 2020
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
2 changes: 2 additions & 0 deletions include/cppcoro/multi_producer_sequencer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,11 +508,13 @@ namespace cppcoro
constexpr unsigned_diff_t maxSize = static_cast<unsigned_diff_t>(std::numeric_limits<diff_t>::max());
assert(bufferSize <= maxSize);

#ifndef __cpp_lib_atomic_value_initialization
Copy link
Owner

Choose a reason for hiding this comment

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

This loop still needs to run to initialise the elements of the array.
Each element is initialised to a different value (notice that seq is incremented inside the while condition).

Maybe something like this:

 SEQUENCE seq = initialSequence - (bufferSize - 1);
 do
 {
+#if __cpp_lib_atomic_value_initialization
+    m_published[seq & m_sequenceMask].store(seq, std::memory_order_relaxed);
+#else
     std::atomic_init(&m_published[seq & m_sequenceMask], seq);
+#endif
 } while (seq++ != initialSequence);

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed up, thank you!

SEQUENCE seq = initialSequence - (bufferSize - 1);
do
{
std::atomic_init(&m_published[seq & m_sequenceMask], seq);
} while (seq++ != initialSequence);
#endif // !__cpp_lib_atomic_value_initialization
}

template<typename SEQUENCE, typename TRAITS>
Expand Down
21 changes: 11 additions & 10 deletions lib/cancellation_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,13 @@ cppcoro::detail::cancellation_registration_list_chunk::allocate(std::uint32_t en
throw std::bad_alloc{};
}

std::atomic_init(&chunk->m_nextChunk, static_cast<cancellation_registration_list_chunk*>(nullptr));
::new (&chunk->m_nextChunk) std::atomic<cancellation_registration_list_chunk*>(nullptr);
chunk->m_prevChunk = nullptr;
std::atomic_init(&chunk->m_approximateFreeCount, static_cast<std::int32_t>(entryCount - 1));
::new (&chunk->m_approximateFreeCount) std::atomic<int32_t>(static_cast<std::int32_t>(entryCount - 1));
chunk->m_entryCount = entryCount;
for (std::uint32_t i = 0; i < entryCount; ++i)
{
std::atomic_init(&chunk->m_entries[i], static_cast<cancellation_registration*>(nullptr));
::new (&chunk->m_entries[i]) std::atomic<cancellation_registration*>(nullptr);
}

return chunk;
Expand All @@ -112,14 +112,15 @@ cppcoro::detail::cancellation_registration_list::allocate()
throw std::bad_alloc{};
}

std::atomic_init(&bucket->m_approximateTail, &bucket->m_headChunk);
std::atomic_init(&bucket->m_headChunk.m_nextChunk, static_cast<cancellation_registration_list_chunk*>(nullptr));
::new (&bucket->m_approximateTail) std::atomic<cancellation_registration_list_chunk*>(&bucket->m_headChunk);
::new (&bucket->m_headChunk.m_nextChunk) std::atomic<cancellation_registration_list_chunk*>(nullptr);
bucket->m_headChunk.m_prevChunk = nullptr;
std::atomic_init(&bucket->m_headChunk.m_approximateFreeCount, static_cast<std::int32_t>(initialChunkSize - 1));
::new (&bucket->m_headChunk.m_approximateFreeCount)
std::atomic<int32_t>(static_cast<std::int32_t>(initialChunkSize - 1));
bucket->m_headChunk.m_entryCount = initialChunkSize;
for (std::uint32_t i = 0; i < initialChunkSize; ++i)
{
std::atomic_init(&bucket->m_headChunk.m_entries[i], static_cast<cancellation_registration*>(nullptr));
::new (&bucket->m_headChunk.m_entries[i]) std::atomic<cancellation_registration*>(nullptr);
}

return bucket;
Expand Down Expand Up @@ -158,7 +159,7 @@ cppcoro::detail::cancellation_registration_state::allocate()
state->m_listCount = listCount;
for (std::uint32_t i = 0; i < listCount; ++i)
{
std::atomic_init(&state->m_lists[i], static_cast<cancellation_registration_list*>(nullptr));
::new (&state->m_lists[i]) std::atomic<cancellation_registration_list*>(nullptr);
}

return state;
Expand Down Expand Up @@ -187,7 +188,7 @@ cppcoro::detail::cancellation_registration_state::add_registration(
// Pre-claim the first slot.
registration->m_chunk = &newList->m_headChunk;
registration->m_entryIndex = 0;
std::atomic_init(&newList->m_headChunk.m_entries[0], registration);
::new (&newList->m_headChunk.m_entries[0]) std::atomic<cancellation_registration*>(registration);

if (listPtr.compare_exchange_strong(
list,
Expand Down Expand Up @@ -305,7 +306,7 @@ cppcoro::detail::cancellation_registration_state::add_registration(
// Pre-allocate first slot.
registration->m_chunk = newChunk;
registration->m_entryIndex = 0;
std::atomic_init(&newChunk->m_entries[0], registration);
::new (&newChunk->m_entries[0]) std::atomic<cancellation_registration*>(registration);

cancellation_registration_list_chunk* oldNext = nullptr;
if (lastChunk->m_nextChunk.compare_exchange_strong(
Expand Down