Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

gh-135239: simpler use of mutex in hashlib & co#135267

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.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
picnixz merged 45 commits intopython:mainfrompicnixz:perf/hashlib/mutex-135239
Jun 22, 2025
Merged
Changes from1 commit
Commits
Show all changes
45 commits
Select commitHold shift + click to select a range
5d8c093
add common object head for hashlib/hmac objects
picnixzJun 8, 2025
81e3046
simplify digest computation
picnixzJun 8, 2025
7f9f7b7
refactor update logic
picnixzJun 8, 2025
15a4f2f
refactor alloc() logic
picnixzJun 8, 2025
5cd828a
finalizing touches
picnixzJun 8, 2025
63db1de
correct mutex usage
picnixzJun 15, 2025
ea033a3
Revert 5cd828acdcfef753aee5eec7e13f07682af40f46
picnixzJun 15, 2025
77baa67
revert some constructor changes
picnixzJun 15, 2025
902759f
unconditionally lock when performing HASH updates
picnixzJun 16, 2025
dde68c4
Merge remote-tracking branch 'upstream/main' into perf/hashlib/mutex-…
picnixzJun 16, 2025
05c1e66
post-merge
picnixzJun 16, 2025
db57278
do not guard against empty buffers for now
picnixzJun 16, 2025
ead20a1
consistency fixes
picnixzJun 16, 2025
68a6bbc
remove unused import
picnixzJun 16, 2025
68f297e
correct naming for locked/unlocked versions
picnixzJun 16, 2025
9817c3d
debug?
picnixzJun 16, 2025
7c6842b
Merge remote-tracking branch 'upstream/main' into perf/hashlib/mutex-…
picnixzJun 16, 2025
c14c87d
simplify HMAC
picnixzJun 16, 2025
bfb5436
release the GIL for large buffers
picnixzJun 16, 2025
923c05f
restore GIL_MINSIZE
picnixzJun 16, 2025
55b2afa
correctly lock objects
picnixzJun 16, 2025
5cd60d1
improve tests
picnixzJun 16, 2025
a2fcbd5
fixup HMAC
picnixzJun 16, 2025
417cee1
fixup
picnixzJun 16, 2025
f350501
GIL protection
picnixzJun 16, 2025
5c4009d
show WASI errors
picnixzJun 16, 2025
8aec797
fix WASI
picnixzJun 16, 2025
6db58dc
fix compilation
picnixzJun 16, 2025
b1f9463
fix compilation
picnixzJun 16, 2025
491b922
fix warnings
picnixzJun 16, 2025
c048975
sync
picnixzJun 17, 2025
c9044d2
fixup format string
picnixzJun 17, 2025
6c08f0d
address review
picnixzJun 17, 2025
7fd1396
reudce diff
picnixzJun 20, 2025
f400a11
Merge remote-tracking branch 'upstream/main' into perf/hashlib/mutex-…
picnixzJun 20, 2025
5e2daa8
Merge remote-tracking branch 'upstream/main' into perf/hashlib/mutex-…
picnixzJun 20, 2025
4f9729e
Merge remote-tracking branch 'upstream/main' into perf/hashlib/mutex-…
picnixzJun 20, 2025
06aaee0
Merge branch 'main' into perf/hashlib/mutex-135239
picnixzJun 21, 2025
977c807
fixup
picnixzJun 21, 2025
6d66fef
fixup
picnixzJun 21, 2025
c9db0b1
make the test suite less slow
picnixzJun 21, 2025
6ffdd1c
fix test when GIL_MINSIZE is changed
picnixzJun 21, 2025
98ec915
defer cosmetics
picnixzJun 21, 2025
398ddb3
Update Lib/test/test_hashlib.py
picnixzJun 21, 2025
0ae70e9
improve test
picnixzJun 22, 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
PrevPrevious commit
NextNext commit
Revert5cd828a
  • Loading branch information
@picnixz
picnixz committedJun 15, 2025
commitea033a3f02b4318463b6fb976912bdc2f9ab7e81
114 changes: 59 additions & 55 deletionsModules/md5module.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,72 +24,76 @@
#include "hashlib.h"
#include "pycore_strhex.h" // _Py_strhex()

/*[clinic input]
module _md5
class MD5Type "MD5object *" "&PyType_Type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=6e5261719957a912]*/

/* The MD5 block size and message digest sizes, in bytes */

#define MD5_BLOCKSIZE 64
#define MD5_DIGESTSIZE 16

#include "_hacl/Hacl_Hash_MD5.h"


typedef struct {
PyObject_HEAD
HASHLIB_LOCK_HEAD
Hacl_Hash_MD5_state_t *state;
Hacl_Hash_MD5_state_t *hash_state;
} MD5object;

#define _MD5object_CAST(op) ((MD5object *)(op))

#include "clinic/md5module.c.h"


typedef struct {
PyTypeObject *md5_type;
}md5module_state;
PyTypeObject*md5_type;
}MD5State;

static inlinemd5module_state*
get_md5module_state(PyObject *module)
static inlineMD5State*
md5_get_state(PyObject *module)
{
void *state = PyModule_GetState(module);
assert(state != NULL);
return (md5module_state *)state;
return (MD5State *)state;
}

/*[clinic input]
module _md5
class MD5Type "MD5object *" "&PyType_Type"
[clinic start generated code]*/
/*[clinic end generated code: output=da39a3ee5e6b4b0d input=6e5261719957a912]*/

#include "clinic/md5module.c.h"

static MD5object *
newMD5object(md5module_state *st)
newMD5object(MD5State *st)
{
MD5object *self = PyObject_GC_New(MD5object, st->md5_type);
if (self == NULL) {
MD5object *md5 = PyObject_GC_New(MD5object, st->md5_type);
if (!md5) {
return NULL;
}
HASHLIB_INIT_MUTEX(self);
PyObject_GC_Track(self);
return self;
HASHLIB_INIT_MUTEX(md5);

PyObject_GC_Track(md5);
return md5;
}

/* Internal methods for a hash object */
static int
MD5_traverse(PyObject *op, visitproc visit, void *arg)
MD5_traverse(PyObject *ptr, visitproc visit, void *arg)
{
Py_VISIT(Py_TYPE(op));
Py_VISIT(Py_TYPE(ptr));
return 0;
}

static void
MD5_dealloc(PyObject *op)
{
MD5object *self = _MD5object_CAST(op);
Hacl_Hash_MD5_free(self->state);
MD5object *ptr = _MD5object_CAST(op);
Hacl_Hash_MD5_free(ptr->hash_state);
PyTypeObject *tp = Py_TYPE(op);
PyObject_GC_UnTrack(self);
PyObject_GC_Del(self);
PyObject_GC_UnTrack(ptr);
PyObject_GC_Del(ptr);
Py_DECREF(tp);
}


/* External methods for a hash object */

/*[clinic input]
Expand All@@ -104,28 +108,28 @@ static PyObject *
MD5Type_copy_impl(MD5object *self, PyTypeObject *cls)
/*[clinic end generated code: output=bf055e08244bf5ee input=d89087dcfb2a8620]*/
{
md5module_state *st = PyType_GetModuleState(cls);
MD5State *st = PyType_GetModuleState(cls);

MD5object *copy = newMD5object(st);
if (copy == NULL) {
MD5object *newobj;
if ((newobj = newMD5object(st)) == NULL) {
return NULL;
}

ENTER_HASHLIB(self);
copy->state = Hacl_Hash_MD5_copy(self->state);
newobj->hash_state = Hacl_Hash_MD5_copy(self->hash_state);
LEAVE_HASHLIB(self);
if (copy->state == NULL) {
Py_DECREF(copy);
if (newobj->hash_state == NULL) {
Py_DECREF(self);
return PyErr_NoMemory();
}
return (PyObject *)copy;
return (PyObject *)newobj;
}

static void
md5_digest_compute_cond_lock(MD5object *self, uint8_t *digest)
{
ENTER_HASHLIB(self);
Hacl_Hash_MD5_digest(self->state, digest);
Hacl_Hash_MD5_digest(self->hash_state, digest);
LEAVE_HASHLIB(self);
}

Expand DownExpand Up@@ -183,7 +187,7 @@ md5_update_state_with_lock(MD5object *self, uint8_t *buf, Py_ssize_t len)
{
Py_BEGIN_ALLOW_THREADS
PyMutex_Lock(&self->mutex); // unconditionally acquire a lock
_hacl_md5_update(self->state, buf, len);
_hacl_md5_update(self->hash_state, buf, len);
PyMutex_Unlock(&self->mutex);
Py_END_ALLOW_THREADS
}
Expand All@@ -192,7 +196,7 @@ static void
md5_update_state_cond_lock(MD5object *self, uint8_t *buf, Py_ssize_t len)
{
ENTER_HASHLIB(self); // conditionally acquire a lock
_hacl_md5_update(self->state, buf, len);
_hacl_md5_update(self->hash_state, buf, len);
LEAVE_HASHLIB(self);
}

Expand DownExpand Up@@ -240,7 +244,7 @@ static PyMethodDef MD5_methods[] = {
MD5TYPE_DIGEST_METHODDEF
MD5TYPE_HEXDIGEST_METHODDEF
MD5TYPE_UPDATE_METHODDEF
{NULL, NULL} /* sentinel */
{NULL,NULL} /* sentinel */
};

static PyObject *
Expand All@@ -265,20 +269,20 @@ static PyGetSetDef MD5_getseters[] = {
{"block_size", MD5_get_block_size, NULL, NULL, NULL},
{"name", MD5_get_name, NULL, NULL, NULL},
{"digest_size", md5_get_digest_size, NULL, NULL, NULL},
{NULL} /*sentinel */
{NULL}/*Sentinel */
};

static PyType_Slot md5_type_slots[] = {
{Py_tp_dealloc, MD5_dealloc},
{Py_tp_methods, MD5_methods},
{Py_tp_getset, MD5_getseters},
{Py_tp_traverse, MD5_traverse},
{0,0}
{0,0}
};

static PyType_Spec md5_type_spec = {
.name = "_md5.md5",
.basicsize = sizeof(MD5object),
.basicsize =sizeof(MD5object),
.flags = (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION |
Py_TPFLAGS_IMMUTABLETYPE | Py_TPFLAGS_HAVE_GC),
.slots = md5_type_slots
Expand DownExpand Up@@ -307,15 +311,15 @@ _md5_md5_impl(PyObject *module, PyObject *data, int usedforsecurity,
return NULL;
}

md5module_state *st = get_md5module_state(module);
MD5object *self =newMD5object(st);
if (self == NULL) {
MD5object *new;
MD5State *st =md5_get_state(module);
if ((new = newMD5object(st)) == NULL) {
return NULL;
}

self->state = Hacl_Hash_MD5_malloc();
if (self->state == NULL) {
Py_DECREF(self);
new->hash_state = Hacl_Hash_MD5_malloc();
if (new->hash_state == NULL) {
Py_DECREF(new);
return PyErr_NoMemory();
}

Expand All@@ -326,19 +330,19 @@ _md5_md5_impl(PyObject *module, PyObject *data, int usedforsecurity,
/* Do not use self->mutex here as this is the constructor
* where it is not yet possible to have concurrent access. */
Py_BEGIN_ALLOW_THREADS
_hacl_md5_update(self->state, buf.buf, buf.len);
_hacl_md5_update(new->hash_state, buf.buf, buf.len);
Py_END_ALLOW_THREADS
}
else {
_hacl_md5_update(self->state, buf.buf, buf.len);
_hacl_md5_update(new->hash_state, buf.buf, buf.len);
}
PyBuffer_Release(&buf);
}

return (PyObject *)self;
return (PyObject *)new;

error:
Py_XDECREF(self);
Py_XDECREF(new);
return NULL;
}

Expand All@@ -347,21 +351,21 @@ _md5_md5_impl(PyObject *module, PyObject *data, int usedforsecurity,

static struct PyMethodDef MD5_functions[] = {
_MD5_MD5_METHODDEF
{NULL, NULL} /*sentinel */
{NULL,NULL}/*Sentinel */
};

static int
_md5_traverse(PyObject *module, visitproc visit, void *arg)
{
md5module_state *state =get_md5module_state(module);
MD5State *state =md5_get_state(module);
Py_VISIT(state->md5_type);
return 0;
}

static int
_md5_clear(PyObject *module)
{
md5module_state *state =get_md5module_state(module);
MD5State *state =md5_get_state(module);
Py_CLEAR(state->md5_type);
return 0;
}
Expand All@@ -376,7 +380,7 @@ _md5_free(void *module)
static int
md5_exec(PyObject *m)
{
md5module_state *st =get_md5module_state(m);
MD5State *st =md5_get_state(m);

st->md5_type = (PyTypeObject *)PyType_FromModuleAndSpec(
m, &md5_type_spec, NULL);
Expand All@@ -402,7 +406,7 @@ static PyModuleDef_Slot _md5_slots[] = {
static struct PyModuleDef _md5module = {
PyModuleDef_HEAD_INIT,
.m_name = "_md5",
.m_size = sizeof(md5module_state),
.m_size = sizeof(MD5State),
.m_methods = MD5_functions,
.m_slots = _md5_slots,
.m_traverse = _md5_traverse,
Expand Down
Loading

[8]ページ先頭

©2009-2025 Movatter.jp