Skip to content

gh-125716: Use A Global Mutex When Initializing Global State For The _interpqueues Module #125803

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
ericsnowcurrently merged 10 commits into from
Oct 21, 2024
Merged

gh-125716: Use A Global Mutex When Initializing Global State For The _interpqueues Module #125803

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7d8b9f9
Raise an exception if _globals_init() fails.
ericsnowcurrently Oct 18, 2024
2579a3a
Free the mutex in _globals_fini().
ericsnowcurrently Oct 21, 2024
98d2a7d
Use atomic operations for the module count.
ericsnowcurrently Oct 21, 2024
8921291
Check the mutex in queues/channels_init().
ericsnowcurrently Oct 21, 2024
202b75d
Use a static initializer init queues/channels_init()/_fini().
ericsnowcurrently Oct 21, 2024
2822ada
Use a global lock around _globals_init() and _globals_fini().
ericsnowcurrently Oct 21, 2024
27fcb3c
Update the summary of global state.
ericsnowcurrently Oct 21, 2024
cf4e106
Change an incref to a decref.
ericsnowcurrently Oct 21, 2024
9c4c1f2
Decrement the module count if _globals_init() fails.
ericsnowcurrently Oct 21, 2024
3714bbf
Merge branch 'main' into fix-queues-null-mutex
ericsnowcurrently Oct 21, 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
Next Next commit
Use a static initializer init queues/channels_init()/_fini().
  • Loading branch information
@ericsnowcurrently
ericsnowcurrently committed Oct 21, 2024
commit 202b75d8d2d120c18c6ff3f388bd12e92b9849b7
20 changes: 14 additions & 6 deletions Modules/_interpchannelsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,19 +1351,27 @@ _channels_init(_channels *channels, PyThread_type_lock mutex)
{
assert(mutex != NULL);
assert(channels->mutex == NULL);
channels->mutex = mutex;
channels->head = NULL;
channels->numopen = 0;
channels->next_id = 0;
*channels = (_channels){
.mutex = mutex,
.head = NULL,
.numopen = 0,
.next_id = 0,
};
}

static void
_channels_fini(_channels *channels, PyThread_type_lock *p_mutex)
{
PyThread_type_lock mutex = channels->mutex;
assert(mutex != NULL);

PyThread_acquire_lock(mutex, WAIT_LOCK);
assert(channels->numopen == 0);
assert(channels->head == NULL);
*p_mutex = channels->mutex;
channels->mutex = NULL;
*channels = (_channels){0};
PyThread_release_lock(mutex);

*p_mutex = mutex;
}

static int64_t
Expand Down
30 changes: 16 additions & 14 deletions Modules/_interpqueuesmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -847,27 +847,29 @@ _queues_init(_queues *queues, PyThread_type_lock mutex)
{
assert(mutex != NULL);
assert(queues->mutex == NULL);
queues->mutex = mutex;
queues->head = NULL;
queues->count = 0;
queues->next_id = 1;
*queues = (_queues){
.mutex = mutex,
.head = NULL,
.count = 0,
.next_id = 1,
};
}

static void
_queues_fini(_queues *queues, PyThread_type_lock *p_mutex)
{
assert(queues->mutex != NULL);
PyThread_type_lock mutex = queues->mutex;
assert(mutex != NULL);

PyThread_acquire_lock(mutex, WAIT_LOCK);
if (queues->count > 0) {
PyThread_acquire_lock(queues->mutex, WAIT_LOCK);
assert((queues->count == 0) != (queues->head != NULL));
_queueref *head = queues->head;
queues->head = NULL;
queues->count = 0;
PyThread_release_lock(queues->mutex);
_queuerefs_clear(head);
assert(queues->head != NULL);
_queuerefs_clear(queues->head);
}
*p_mutex = queues->mutex;
queues->mutex = NULL;
*queues = (_queues){0};
PyThread_release_lock(mutex);

*p_mutex = mutex;
}

static int64_t
Expand Down