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

Some of this code did not compile at all on G++ #13194

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+330 −323
Open

Some of this code did not compile at all on G++ #13194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0aceb6
Some of this code did not compile at all on G++
jackbergus Dec 6, 2024
f13e211
Concurrency changes: atomic_store_explicit are deprecated
jackbergus Dec 7, 2024
7d9ffe5
Merge branch 'facebook:main' into main
jackbergus Dec 26, 2024
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
28 changes: 17 additions & 11 deletions db/memtable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,15 @@ MemTable::MemTable(const InternalKeyComparator& cmp,
cached_range_tombstone_.AccessAtCore(i);
auto new_local_cache_ref = std::make_shared<
const std::shared_ptr<FragmentedRangeTombstoneListCache>>(new_cache);
std::atomic_store_explicit(
local_cache_ref_ptr,
std::shared_ptr<FragmentedRangeTombstoneListCache>(new_local_cache_ref,
new_cache.get()),
std::memory_order_relaxed);
std::atomic<std::shared_ptr<FragmentedRangeTombstoneListCache>> r(*local_cache_ref_ptr);
r.store(std::shared_ptr<FragmentedRangeTombstoneListCache>(new_local_cache_ref,
new_cache.get()),
std::memory_order_relaxed);
// std::atomic_store_explicit(
// local_cache_ref_ptr,
// std::shared_ptr<FragmentedRangeTombstoneListCache>(new_local_cache_ref,
// new_cache.get()),
// std::memory_order_relaxed);
}
const Comparator* ucmp = cmp.user_comparator();
assert(ucmp);
Expand Down Expand Up @@ -784,9 +788,12 @@ FragmentedRangeTombstoneIterator* MemTable::NewRangeTombstoneIteratorInternal(
}

// takes current cache
std::shared_ptr<FragmentedRangeTombstoneListCache> cache =
std::atomic_load_explicit(cached_range_tombstone_.Access(),
std::memory_order_relaxed);
std::atomic<std::shared_ptr<FragmentedRangeTombstoneListCache>> r(*cached_range_tombstone_.Access());
auto cache= r.load(std::memory_order_relaxed);

// std::shared_ptr<FragmentedRangeTombstoneListCache> cache =
// std::atomic_load_explicit(cached_range_tombstone_.Access(),
// std::memory_order_relaxed);
// construct fragmented tombstone list if necessary
if (!cache->initialized.load(std::memory_order_acquire)) {
cache->reader_mutex.lock();
Expand Down Expand Up @@ -1063,9 +1070,8 @@ Status MemTable::Add(SequenceNumber s, ValueType type,
// Each core will have a shared_ptr to a shared_ptr to the cached
// fragmented range tombstones, so that ref count is maintianed locally
// per-core using the per-core shared_ptr.
std::atomic_store_explicit(
local_cache_ref_ptr,
std::shared_ptr<FragmentedRangeTombstoneListCache>(
std::atomic<std::shared_ptr<FragmentedRangeTombstoneListCache>> r(*local_cache_ref_ptr);
r.store(std::shared_ptr<FragmentedRangeTombstoneListCache>(
new_local_cache_ref, new_cache.get()),
std::memory_order_relaxed);
}
Expand Down
Loading