Skip to content

Fix pool_mutex initialization order on Windows #1107

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
raphael-proust merged 2 commits into from
Apr 20, 2026
+13 −2
Merged

Fix pool_mutex initialization order on Windows #1107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f088441
Fix pool_mutex initialization order on Windows
mtelvers Mar 1, 2026
3d41302
CHANGES
raphael-proust Apr 20, 2026
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
6 changes: 6 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
===== 6.1.2 =====

====== Fixes ======

* fix initialisation of lock on Windows. (Mark Elvers, David Allsopp, #1103, #1107, #1104)

===== 6.1.1 =====

====== Fixes ======
Expand Down
9 changes: 7 additions & 2 deletions src/unix/lwt_unix_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,13 @@ CAMLprim value lwt_unix_start_job(value val_job, value val_async_method) {
lwt_unix_async_method async_method = Int_val(val_async_method);
int done = 0;

/* Ensure threading is initialized before using pool_mutex.
On Windows, CRITICAL_SECTION must be initialized before use;
unlike pthreads, zero-initialized CRITICAL_SECTIONs are invalid. */
if (async_method != LWT_UNIX_ASYNC_METHOD_NONE) {
initialize_threading();
}

/* Fallback to synchronous call if there is no worker available and
we can not launch more threads. */
if (async_method != LWT_UNIX_ASYNC_METHOD_NONE) {
Expand All @@ -1087,8 +1094,6 @@ CAMLprim value lwt_unix_start_job(value val_job, value val_async_method) {

case LWT_UNIX_ASYNC_METHOD_DETACH:
case LWT_UNIX_ASYNC_METHOD_SWITCH:
initialize_threading();

lwt_unix_mutex_init(&job->mutex);

lwt_unix_mutex_lock(&pool_mutex);
Expand Down
Loading