From: "AZero13 via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: AZero13 <gfunni234@gmail.com>, Greg Funni <gfunni234@gmail.com>
Subject: [PATCH v2] win32: return error if SleepConditionVariableCS fails
Date: Tue, 18 Nov 2025 15:41:54 +0000 [thread overview]
Message-ID: <pull.2104.v2.git.git.1763480514065.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.2104.git.git.1763427591884.gitgitgadget@gmail.com>
From: Greg Funni <gfunni234@gmail.com>
If it fails, return an error.
Signed-off-by: Greg Funni <gfunni234@gmail.com>
---
win32: return error if SleepConditionVariableCS fails
If it fails, return an error.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2104%2FAZero13%2Fsleep-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2104/AZero13/sleep-v2
Pull-Request: https://github.com/git/git/pull/2104
Range-diff vs v1:
1: 35384a6aa3 ! 1: 7bdcd55664 win32: return error if SleepConditionVariableCS fails
@@
## Metadata ##
-Author: AZero13 <gfunni234@gmail.com>
+Author: Greg Funni <gfunni234@gmail.com>
## Commit message ##
win32: return error if SleepConditionVariableCS fails
compat/win32/pthread.c | 7 +++++++
compat/win32/pthread.h | 3 ++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
index 58980a529c..7e93146963 100644
--- a/compat/win32/pthread.c
+++ b/compat/win32/pthread.c
@@ -59,3 +59,10 @@ pthread_t pthread_self(void)
t.tid = GetCurrentThreadId();
return t;
}
+
+int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex)
+{
+ if (SleepConditionVariableCS(cond, mutex, INFINITE) == 0)
+ return err_win_to_posix(GetLastError());
+ return 0;
+}
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
index e2b5c4f64c..859e1d9021 100644
--- a/compat/win32/pthread.h
+++ b/compat/win32/pthread.h
@@ -36,7 +36,6 @@ typedef int pthread_mutexattr_t;
#define pthread_cond_init(a,b) InitializeConditionVariable((a))
#define pthread_cond_destroy(a) do {} while (0)
-#define pthread_cond_wait(a,b) return_0(SleepConditionVariableCS((a), (b), INFINITE))
#define pthread_cond_signal WakeConditionVariable
#define pthread_cond_broadcast WakeAllConditionVariable
@@ -64,6 +63,8 @@ int win32_pthread_join(pthread_t *thread, void **value_ptr);
#define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
pthread_t pthread_self(void);
+int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
+
static inline void NORETURN pthread_exit(void *ret)
{
_endthreadex((unsigned)(uintptr_t)ret);
base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
--
gitgitgadget
prev parent reply other threads:[~2025-11-18 15:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-18 0:59 [PATCH] win32: return error if SleepConditionVariableCS fails AZero13 via GitGitGadget
2025-11-18 15:41 ` AZero13 via GitGitGadget [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.2104.v2.git.git.1763480514065.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=gfunni234@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.