win32: pthread_cond_wait should return a value
PATCH 1/1 win32: pthread_cond_wait should return a value
From: AZero13 <[email protected]>
This value is not checked, but it must return to match POSIX
---
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(-)
compat/win32/pthread.h +1 -1
@@ -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
Signature · 1 line
gitgitgadget
PATCH v2 1/1 win32: pthread_cond_wait should return a value
From: Greg Funni <[email protected]>
This value is not checked, but it must return to match POSIX
---
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 <[email protected]>
+Author: Greg Funni <[email protected]>
## Commit message ##
win32: pthread_cond_wait should return a value
compat/win32/pthread.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
compat/win32/pthread.h +1 -1
@@ -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
Signature · 1 line
gitgitgadget
Quoted 1 line · "AZero13 via GitGitGadget" <[email protected]> writes:
Subject: Re: [PATCH v2] win32:
pthread_cond_waitshould 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().
Quoted 22 lines
From: Greg Funni <[email protected]>
This value is not checked, but it must return to match POSIX
Signed-off-by Greg Funni <[email protected]>---
...compat/win32/pthread.h +1
-1@@ -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 WakeConditionVariablebase-commit:
9a2fb147f2c61d0cab52c883e7e26f5b7948e3ed
PATCH v3 1/1 win32: pthread_cond_init should return a value
In reply to AZero13 via GitGitGadgetFrom: Greg Funni <[email protected]>
This value is not checked, but it must return to match POSIX
---
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 <[email protected]>
## 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(-)
compat/win32/pthread.h +1 -1
@@ -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
Signature · 1 line
gitgitgadget
Re: [PATCH v3] win32: pthread_cond_init should return a value
compat/win32/pthread.h typedef int pthread_mutexattr_t; · line 37
Quoted 12 lines · "AZero13 via GitGitGadget" <[email protected]> writes:
From: Greg Funni <[email protected]>
This value is not checked, but it must return to match POSIX
Signed-off-by Greg Funni <[email protected]>---
win32:pthread_cond_initshould return a valueThis value is not checked, but it must return to match POSIX
...compat/win32/pthread.h +1
-1-#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.
Re: [PATCH v3] win32: pthread_cond_init should return a value
Quoted 29 lines · Junio C Hamano
compat/win32/pthread.h typedef int pthread_mutexattr_t; · line 37
Quoted 12 lines · "AZero13 via GitGitGadget" <[email protected]> writes:
From: Greg Funni <[email protected]>
This value is not checked, but it must return to match POSIX
Signed-off-by Greg Funni <[email protected]>---
win32:pthread_cond_initshould return a valueThis value is not checked, but it must return to match POSIX
...compat/win32/pthread.h +1
-1-#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, andreturn_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 toreturn_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", soreturn_0()would happily take it as an int, and returns 0.
Quoted 5 lines
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.