Windows: more pthreads functions

j6t · gitster · commit 912b26324dbc · 2010-03-07T00:37:36.000-08:00
This adds:

   pthread_self
   pthread_equal
   pthread_exit
   pthread_key_create
   pthread_setspecific
   pthread_getspecific

Signed-off-by: Johannes Sixt &lt;j6t@kdbg.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
@@ -16,6 +16,7 @@
 static unsigned __stdcall win32_start_routine(void *arg)
 {
 	pthread_t *thread = arg;
+	thread->tid = GetCurrentThreadId();
 	thread->arg = thread->start_routine(thread->arg);
 	return 0;
 }
@@ -49,6 +50,13 @@ int win32_pthread_join(pthread_t *thread, void **value_ptr)
 	}
 }
 
+pthread_t pthread_self(void)
+{
+	pthread_t t = { 0 };
+	t.tid = GetCurrentThreadId();
+	return t;
+}
+
 int pthread_cond_init(pthread_cond_t *cond, const void *unused)
 {
 	cond->waiters = 0;
diff --git a/compat/win32/pthread.h b/compat/win32/pthread.h
@@ -52,6 +52,7 @@ typedef struct {
 	HANDLE handle;
 	void *(*start_routine)(void*);
 	void *arg;
+	DWORD tid;
 } pthread_t;
 
 extern int pthread_create(pthread_t *thread, const void *unused,
@@ -65,4 +66,28 @@ extern int pthread_create(pthread_t *thread, const void *unused,
 
 extern int win32_pthread_join(pthread_t *thread, void **value_ptr);
 
+#define pthread_equal(t1, t2) ((t1).tid == (t2).tid)
+extern pthread_t pthread_self(void);
+
+static inline int pthread_exit(void *ret)
+{
+	ExitThread((DWORD)ret);
+}
+
+typedef DWORD pthread_key_t;
+static inline int pthread_key_create(pthread_key_t *keyp, void (*destructor)(void *value))
+{
+	return (*keyp = TlsAlloc()) == TLS_OUT_OF_INDEXES ? EAGAIN : 0;
+}
+
+static inline int pthread_setspecific(pthread_key_t key, const void *value)
+{
+	return TlsSetValue(key, (void *)value) ? 0 : EINVAL;
+}
+
+static inline void *pthread_getspecific(pthread_key_t key)
+{
+	return TlsGetValue(key);
+}
+
 #endif /* PTHREAD_H */

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`static unsigned __stdcall win32_start_routine(void *arg)`
`17`	`17`	`{`
`18`	`18`	`pthread_t *thread = arg;`
	`19`	`+ thread->tid = GetCurrentThreadId();`
`19`	`20`	`thread->arg = thread->start_routine(thread->arg);`
`20`	`21`	`return 0;`
`21`	`22`	`}`
`@@ -49,6 +50,13 @@ int win32_pthread_join(pthread_t thread, void *value_ptr)`
`49`	`50`	`}`
`50`	`51`	`}`
`51`	`52`
	`53`	`+pthread_t pthread_self(void)`
	`54`	`+{`
	`55`	`+ pthread_t t = { 0 };`
	`56`	`+ t.tid = GetCurrentThreadId();`
	`57`	`+ return t;`
	`58`	`+}`
	`59`	`+`
`52`	`60`	`int pthread_cond_init(pthread_cond_t cond, const void unused)`
`53`	`61`	`{`
`54`	`62`	`cond->waiters = 0;`