# [PATCH] win32: pthread_cond_wait should return a value 6 messages from 2025-11-18 to 2025-12-07. Participants: AZero13 via GitGitGadget, Junio C Hamano. Thread: https://gitlist.dev/t/64502 ## AZero13 via GitGitGadget, 2025-11-18 00:59 Subject: [PATCH] win32: pthread_cond_wait should return a value Message-ID: URL: https://gitlist.dev/e/pull.2103.git.git.1763427599300.gitgitgadget%40gmail.com ``` From: AZero13 This value is not checked, but it must return to match POSIX Signed-off-by: Greg Funni --- win32: pthread_cond_wait should return a value This value is not checked, but it must return to match POSIX Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2103%2FAZero13%2Fpthread-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2103/AZero13/pthread-v1 Pull-Request: https://github.com/git/git/pull/2103 compat/win32/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index e2b5c4f64c..000604cdf6 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -34,7 +34,7 @@ typedef int pthread_mutexattr_t; #define pthread_cond_t CONDITION_VARIABLE -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) #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 base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed -- gitgitgadget ``` ## AZero13 via GitGitGadget, 2025-11-18 15:42 Subject: [PATCH v2] win32: pthread_cond_wait should return a value Message-ID: URL: https://gitlist.dev/e/pull.2103.v2.git.git.1763480546981.gitgitgadget%40gmail.com In-Reply-To: ``` From: Greg Funni This value is not checked, but it must return to match POSIX Signed-off-by: Greg Funni --- win32: pthread_cond_wait should return a value This value is not checked, but it must return to match POSIX Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2103%2FAZero13%2Fpthread-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2103/AZero13/pthread-v2 Pull-Request: https://github.com/git/git/pull/2103 Range-diff vs v1: 1: 643a9b7eae ! 1: a2d9ec97f1 win32: pthread_cond_wait should return a value @@ ## Metadata ## -Author: AZero13 +Author: Greg Funni ## Commit message ## win32: pthread_cond_wait should return a value compat/win32/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index e2b5c4f64c..000604cdf6 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -34,7 +34,7 @@ typedef int pthread_mutexattr_t; #define pthread_cond_t CONDITION_VARIABLE -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) #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 base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed -- gitgitgadget ``` ## Junio C Hamano, 2025-11-18 18:17 Subject: Re: [PATCH v2] win32: pthread_cond_wait should return a value Message-ID: URL: https://gitlist.dev/e/xmqqms4jdx3c.fsf%40gitster.g In-Reply-To: ``` "AZero13 via GitGitGadget" writes: > Subject: Re: [PATCH v2] win32: pthread_cond_wait should return a value Is this mistitled? The patch text talks about cond_init(), not cond_wait(), which is the theme for the other patch around SleepConditionVariableCS(). > From: Greg Funni > > This value is not checked, but it must return to match POSIX > > Signed-off-by: Greg Funni > --- > ... > diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h > index e2b5c4f64c..000604cdf6 100644 > --- a/compat/win32/pthread.h > +++ b/compat/win32/pthread.h > @@ -34,7 +34,7 @@ typedef int pthread_mutexattr_t; > > #define pthread_cond_t CONDITION_VARIABLE > > -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) > +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) > #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 > > base-commit: 9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed ``` ## AZero13 via GitGitGadget, 2025-11-20 21:43 Subject: [PATCH v3] win32: pthread_cond_init should return a value Message-ID: URL: https://gitlist.dev/e/pull.2103.v3.git.git.1763675016637.gitgitgadget%40gmail.com In-Reply-To: ``` From: Greg Funni This value is not checked, but it must return to match POSIX Signed-off-by: Greg Funni --- win32: pthread_cond_init should return a value This value is not checked, but it must return to match POSIX Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2103%2FAZero13%2Fpthread-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2103/AZero13/pthread-v3 Pull-Request: https://github.com/git/git/pull/2103 Range-diff vs v2: 1: a2d9ec97f1 ! 1: 19ce5aca70 win32: pthread_cond_wait should return a value @@ Metadata Author: Greg Funni ## Commit message ## - win32: pthread_cond_wait should return a value + win32: pthread_cond_init should return a value This value is not checked, but it must return to match POSIX compat/win32/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h index e2b5c4f64c..000604cdf6 100644 --- a/compat/win32/pthread.h +++ b/compat/win32/pthread.h @@ -34,7 +34,7 @@ typedef int pthread_mutexattr_t; #define pthread_cond_t CONDITION_VARIABLE -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) #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 base-commit: 5e6e4854e086ba0025bc7dc11e6b475c92a2f556 -- gitgitgadget ``` ## Junio C Hamano, 2025-11-21 01:46 Subject: Re: [PATCH v3] win32: pthread_cond_init should return a value Message-ID: URL: https://gitlist.dev/e/xmqqecps5f8u.fsf%40gitster.g In-Reply-To: ``` "AZero13 via GitGitGadget" writes: > From: Greg Funni > > This value is not checked, but it must return to match POSIX > > Signed-off-by: Greg Funni > --- > win32: pthread_cond_init should return a value > > This value is not checked, but it must return to match POSIX > ... > -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) > +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) This is tricky and I like it. Because InitializeConditionVariable() returns void, and return_0() is defined as such: static inline int return_0(int i) { return 0; } you cannot directly pass InitializeConditionVariable() to it, so you use a comma operator and pass 0 to return_0(). Because the type of the comma operator with mixed operands is the type of the rightmost operand, the type of "InitializeConditionVariable((a)), 0" is type of "0", so return_0() would happily take it as an int, and returns 0. This should work correctly, but it still is tricky and yucky. You may not have to use return_0(), but OK. Will queue. Thanks. ``` ## Junio C Hamano, 2025-12-07 00:18 Subject: Re: [PATCH v3] win32: pthread_cond_init should return a value Message-ID: URL: https://gitlist.dev/e/xmqqwm2znnzc.fsf%40gitster.g In-Reply-To: ``` Junio C Hamano writes: > "AZero13 via GitGitGadget" writes: > >> From: Greg Funni >> >> This value is not checked, but it must return to match POSIX >> >> Signed-off-by: Greg Funni >> --- >> win32: pthread_cond_init should return a value >> >> This value is not checked, but it must return to match POSIX >> ... >> -#define pthread_cond_init(a,b) InitializeConditionVariable((a)) >> +#define pthread_cond_init(a,b) return_0((InitializeConditionVariable((a)), 0)) > > This is tricky and I like it. > > Because InitializeConditionVariable() returns void, and return_0() > is defined as such: > > static inline int return_0(int i) { return 0; } > > you cannot directly pass InitializeConditionVariable() to it, so you > use a comma operator and pass 0 to return_0(). Because the type of > the comma operator with mixed operands is the type of the rightmost > operand, the type of "InitializeConditionVariable((a)), 0" is type > of "0", so return_0() would happily take it as an int, and returns > 0. > > This should work correctly, but it still is tricky and yucky. > > You may not have to use return_0(), but OK. > > Will queue. Thanks. As I do not do Windows, I was hoping somebody more clueful than myself on the platform would give an Ack to this patch, but we saw nothing. I'll mark the topic for 'next'. I do not anticipate breakage but if there were something fishy, hopefully we will hear quickly enough. ```