mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 03:35:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.13] gh-128133: use relaxed atomics for hash of bytes (GH-128412) (#130022)

Browse source 
(cherry picked from commit 0706bab1c0)

Co-authored-by: Abhijeet <abhijeetsharma2002@gmail.com>
This commit is contained in:
Sam Gross 2025-02-11 20:45:02 -05:00 • committed by GitHub
parent ee12a3482d
commit e4d0303c1a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Objects/bytesobject.c
View file

@ -51,6 +51,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_ssize_relaxed(&a->ob_shash, hash);
#else
a->ob_shash = hash;
#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_atomic_load_ssize_relaxed(&a->ob_shash);
#else
return a->ob_shash;
#endif
_Py_COMP_DIAG_POP
}
/* /*
For PyBytes_FromString(), the parameter `str' points to a null-terminated For PyBytes_FromString(), the parameter `str' points to a null-terminated
string containing exactly `size' bytes. string containing exactly `size' bytes.
@ -98,10 +125,7 @@ _PyBytes_FromSize(Py_ssize_t size, int use_calloc)
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size); _PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH set_ob_shash(op, -1);
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
_Py_COMP_DIAG_POP
if (!use_calloc) { if (!use_calloc) {
op->ob_sval[size] = '\0'; op->ob_sval[size] = '\0';
} }
@ -165,10 +189,7 @@ PyBytes_FromString(const char *str)
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size); _PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH set_ob_shash(op, -1);
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
_Py_COMP_DIAG_POP
memcpy(op->ob_sval, str, size+1); memcpy(op->ob_sval, str, size+1);
return (PyObject *) op; return (PyObject *) op;
} }
@ -1475,10 +1496,7 @@ bytes_repeat(PyBytesObject *a, Py_ssize_t n)
return PyErr_NoMemory(); return PyErr_NoMemory();
} }
_PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size); _PyObject_InitVar((PyVarObject*)op, &PyBytes_Type, size);
_Py_COMP_DIAG_PUSH set_ob_shash(op, -1);
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
op->ob_shash = -1;
_Py_COMP_DIAG_POP
op->ob_sval[size] = '\0'; op->ob_sval[size] = '\0';
_PyBytes_Repeat(op->ob_sval, size, a->ob_sval, Py_SIZE(a)); _PyBytes_Repeat(op->ob_sval, size, a->ob_sval, Py_SIZE(a));
@ -1583,14 +1601,13 @@ bytes_richcompare(PyBytesObject *a, PyBytesObject *b, int op)
static Py_hash_t static Py_hash_t
bytes_hash(PyBytesObject *a) bytes_hash(PyBytesObject *a)
{ {
_Py_COMP_DIAG_PUSH Py_hash_t hash = get_ob_shash(a);
_Py_COMP_DIAG_IGNORE_DEPR_DECLS if (hash == -1) {
if (a->ob_shash == -1) {
/* Can't fail */ /* Can't fail */
a->ob_shash = _Py_HashBytes(a->ob_sval, Py_SIZE(a)); hash = _Py_HashBytes(a->ob_sval, Py_SIZE(a));
set_ob_shash(a, hash);
} }
return a->ob_shash; return hash;
_Py_COMP_DIAG_POP
} }
static PyObject* static PyObject*
@ -2970,10 +2987,7 @@ bytes_alloc(PyTypeObject *self, Py_ssize_t nitems)
if (obj == NULL) { if (obj == NULL) {
return NULL; return NULL;
} }
_Py_COMP_DIAG_PUSH set_ob_shash(obj, -1);
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
obj->ob_shash = -1;
_Py_COMP_DIAG_POP
return (PyObject*)obj; return (PyObject*)obj;
} }
@ -2990,11 +3004,8 @@ bytes_subtype_new(PyTypeObject *type, PyObject *tmp)
if (pnew != NULL) { if (pnew != NULL) {
memcpy(PyBytes_AS_STRING(pnew), memcpy(PyBytes_AS_STRING(pnew),
PyBytes_AS_STRING(tmp), n+1); PyBytes_AS_STRING(tmp), n+1);
_Py_COMP_DIAG_PUSH set_ob_shash((PyBytesObject *)pnew,
_Py_COMP_DIAG_IGNORE_DEPR_DECLS get_ob_shash((PyBytesObject *)tmp));
((PyBytesObject *)pnew)->ob_shash =
((PyBytesObject *)tmp)->ob_shash;
_Py_COMP_DIAG_POP
} }
return pnew; return pnew;
} }
@ -3186,10 +3197,7 @@ _PyBytes_Resize(PyObject **pv, Py_ssize_t newsize)
sv = (PyBytesObject *) *pv; sv = (PyBytesObject *) *pv;
Py_SET_SIZE(sv, newsize); Py_SET_SIZE(sv, newsize);
sv->ob_sval[newsize] = '\0'; sv->ob_sval[newsize] = '\0';
_Py_COMP_DIAG_PUSH set_ob_shash(sv, -1); /* invalidate cached hash value */
_Py_COMP_DIAG_IGNORE_DEPR_DECLS
sv->ob_shash = -1; /* invalidate cached hash value */
_Py_COMP_DIAG_POP
return 0; return 0;
} }