Skip to content

gh-115103: Implement delayed memory reclamation (QSBR) #115180

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
colesbury merged 9 commits into from
Feb 16, 2024
Merged

gh-115103: Implement delayed memory reclamation (QSBR) #115180

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ede08ee
gh-115103: Implement delayed memory reclamation (QSBR)
colesbury Feb 2, 2024
a33b739
Fix default build
colesbury Feb 8, 2024
39e3954
Mark function as static
colesbury Feb 8, 2024
f1c3740
Fix indentation in qsbr.c
colesbury Feb 8, 2024
35cbc0e
Merge branch 'main' into gh-115103-qsbr
colesbury Feb 12, 2024
b03c5ca
Merge branch 'main' into gh-115103-qsbr
colesbury Feb 14, 2024
94a95d5
Fix potential deadlock and other changes from review
colesbury Feb 15, 2024
69d5669
Add comment about QSBR_LT/QSBR_LEQ
colesbury Feb 15, 2024
be441dc
Merge branch 'main' into gh-115103-qsbr
colesbury Feb 16, 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
Prev Previous commit
Merge branch 'main' into gh-115103-qsbr
  • Loading branch information
@colesbury
colesbury committed Feb 16, 2024
commit be441dc3d042b1bfc9b17d9cbb957f220f8551ab
3 changes: 3 additions & 0 deletions Include/cpython/pyatomic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,9 @@ _Py_atomic_store_uint64_release(uint64_t *obj, uint64_t value);
static inline uint64_t
_Py_atomic_load_uint64_acquire(const uint64_t *obj);

static inline uint32_t
_Py_atomic_load_uint32_acquire(const uint32_t *obj);


// --- _Py_atomic_fence ------------------------------------------------------

Expand Down
3 changes: 3 additions & 0 deletions Include/cpython/pyatomic_gcc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,9 @@ static inline uint64_t
_Py_atomic_load_uint64_acquire(const uint64_t *obj)
{ return __atomic_load_n(obj, __ATOMIC_ACQUIRE); }

static inline uint32_t
_Py_atomic_load_uint32_acquire(const uint32_t *obj)
{ return __atomic_load_n(obj, __ATOMIC_ACQUIRE); }

// --- _Py_atomic_fence ------------------------------------------------------

Expand Down
11 changes: 11 additions & 0 deletions Include/cpython/pyatomic_msc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,17 @@ _Py_atomic_load_uint64_acquire(const uint64_t *obj)
#endif
}

static inline uint32_t
_Py_atomic_load_uint32_acquire(const uint32_t *obj)
{
#if defined(_M_X64) || defined(_M_IX86)
return *(uint32_t volatile *)obj;
#elif defined(_M_ARM64)
return (uint32_t)__ldar32((uint32_t volatile *)obj);
#else
# error "no implementation of _Py_atomic_load_uint32_acquire"
#endif
}

// --- _Py_atomic_fence ------------------------------------------------------

Expand Down
7 changes: 7 additions & 0 deletions Include/cpython/pyatomic_std.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,13 @@ _Py_atomic_load_uint64_acquire(const uint64_t *obj)
memory_order_acquire);
}

static inline uint32_t
_Py_atomic_load_uint32_acquire(const uint32_t *obj)
{
_Py_USING_STD;
return atomic_load_explicit((const _Atomic(uint32_t)*)obj,
memory_order_acquire);
}


// --- _Py_atomic_fence ------------------------------------------------------
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.