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

gh-128133: Added relaxed atomics to bytes_hash #128412

Merged
merged 9 commits into from
Jan 3, 2025
Merged

gh-128133: Added relaxed atomics to bytes_hash #128412

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de26101
Added relaxed atomics to bytes_hash
abhijeetsharma200 Jan 2, 2025
af10ff1
suppresed deprecated warnings
abhijeetsharma200 Jan 2, 2025
15124c5
Changed back to _Py_atomic
abhijeetsharma200 Jan 2, 2025
59de33a
Merge branch 'main' into gh-128133-bytes_hash-atomics
abhijeetsharma200 Jan 2, 2025
9a27a3e
changes as per code comments
abhijeetsharma200 Jan 2, 2025
7405c5b
Merge remote-tracking branch 'upstream/main' into gh-128133-bytes_has…
abhijeetsharma200 Jan 2, 2025
0509a17
Used ssize instead of int in atomics
abhijeetsharma200 Jan 2, 2025
5c0226f
return hash instead of using getter
abhijeetsharma200 Jan 2, 2025
50d73cb
Merge branch 'main' into gh-128133-bytes_hash-atomics
abhijeetsharma200 Jan 2, 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
50 changes: 40 additions & 10 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "pycore_object.h" // _PyObject_GC_TRACK
#include "pycore_pymem.h" // PYMEM_CLEANBYTE
#include "pycore_strhex.h" // _Py_strhex_with_sep()
#include "pycore_pyatomic_ft_wrappers.h"
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved

#include <stddef.h>

Expand Down Expand Up @@ -51,6 +52,33 @@ static inline PyObject* bytes_get_empty(void)
}


static inline void
set_ob_shash(PyBytesObject *a, Py_hash_t hash)
{
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
#ifdef Py_GIL_DISABLED
_Py_atomic_store_int_relaxed((int *)&a->ob_shash, (int)hash);
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
#else
a->ob_shash = hash;
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
#endif
_Py_COMP_DIAG_POP
}

static inline Py_hash_t
get_ob_shash(PyBytesObject *a)
{
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
#ifdef Py_GIL_DISABLED
return (Py_hash_t)_Py_atomic_load_int_relaxed((int *)&a->ob_shash);
#else
return a->ob_shash;
#endif
_Py_COMP_DIAG_POP
}


/*
For PyBytes_FromString(), the parameter 'str' points to a null-terminated
string containing exactly 'size' bytes.
Expand Down Expand Up @@ -100,7 +128,7 @@ _PyBytes_FromSize(Py_ssize_t size, int use_calloc)
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
set_ob_shash(op, -1);
_Py_COMP_DIAG_POP
if (!use_calloc) {
op->ob_sval[size] = '\0';
Expand Down Expand Up @@ -167,7 +195,7 @@ PyBytes_FromString(const char *str)
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH
kumaraditya303 marked this conversation as resolved.
Show resolved Hide resolved
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
set_ob_shash(op, -1);
_Py_COMP_DIAG_POP
memcpy(op->ob_sval, str, size+1);
return (PyObject *) op;
Expand Down Expand Up @@ -1487,7 +1515,7 @@ bytes_repeat(PyObject *self, Py_ssize_t n)
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
set_ob_shash(op, -1);
_Py_COMP_DIAG_POP
op->ob_sval[size] = '\0';

Expand Down Expand Up @@ -1599,11 +1627,13 @@ bytes_hash(PyObject *self)
PyBytesObject *a = _PyBytes_CAST(self);
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
if (a->ob_shash == -1) {
Py_hash_t hash = get_ob_shash(a);
if (hash == -1) {
/* Can't fail */
a->ob_shash = Py_HashBuffer(a->ob_sval, Py_SIZE(a));
hash = Py_HashBuffer(a->ob_sval, Py_SIZE(a));
set_ob_shash(a, hash);
}
return a->ob_shash;
return hash;
ZeroIntensity marked this conversation as resolved.
Show resolved Hide resolved
_Py_COMP_DIAG_POP
}

Expand Down Expand Up @@ -3006,7 +3036,7 @@ bytes_alloc(PyTypeObject *self, Py_ssize_t nitems)
}
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
obj->ob_shash = -1;
set_ob_shash(obj, -1);
_Py_COMP_DIAG_POP
return (PyObject*)obj;
}
Expand All @@ -3026,8 +3056,8 @@ bytes_subtype_new(PyTypeObject *type, PyObject *tmp)
PyBytes_AS_STRING(tmp), n+1);
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
((PyBytesObject *)pnew)->ob_shash =
((PyBytesObject *)tmp)->ob_shash;
set_ob_shash((PyBytesObject *)pnew,
get_ob_shash((PyBytesObject *)tmp));
_Py_COMP_DIAG_POP
}
return pnew;
Expand Down Expand Up @@ -3223,7 +3253,7 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
sv->ob_sval[newsize] = '\0';
_Py_COMP_DIAG_PUSH
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
sv->ob_shash = -1; /* invalidate cached hash value */
set_ob_shash(sv, -1); /* invalidate cached hash value */
_Py_COMP_DIAG_POP
return 0;
}
Expand Down
Loading