Commit 5d03db81469b871065baecdee2965e2e9d708724

Patrick Steinhardt 2016-06-20T18:21:42

win32: rename pthread.{c,h} to thread.{c,h} The old pthread-file did re-implement the pthreads API with exact symbol matching. As the thread-abstraction has now been split up between Unix- and Windows-specific files within the `git_` namespace to avoid symbol-clashes between libgit2 and pthreads, the rewritten wrappers have nothing to do with pthreads anymore. Rename the Windows-specific pthread-files to honor this change.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
diff --git a/src/common.h b/src/common.h
index 9abd605..51fb918 100644
--- a/src/common.h
+++ b/src/common.h
@@ -45,7 +45,7 @@
 # include "win32/error.h"
 # include "win32/version.h"
 # ifdef GIT_THREADS
-#	include "win32/pthread.h"
+#	include "win32/thread.h"
 # endif
 # if defined(GIT_MSVC_CRTDBG)
 #   include "win32/w32_stack.h"
diff --git a/src/thread-utils.h b/src/thread-utils.h
index f75e440..f016198 100644
--- a/src/thread-utils.h
+++ b/src/thread-utils.h
@@ -41,7 +41,7 @@ typedef git_atomic git_atomic_ssize;
 #ifdef GIT_THREADS
 
 #ifdef GIT_WIN32
-#   include "win32/pthread.h"
+#   include "win32/thread.h"
 #else
 #   include "unix/pthread.h"
 #endif
diff --git a/src/win32/precompiled.h b/src/win32/precompiled.h
index 33ce106..10ca0b8 100644
--- a/src/win32/precompiled.h
+++ b/src/win32/precompiled.h
@@ -16,7 +16,7 @@
 #include <io.h>
 #include <direct.h>
 #ifdef GIT_THREADS
- #include "win32/pthread.h"
+ #include "win32/thread.h"
 #endif
 
 #include "git2.h"
diff --git a/src/win32/pthread.c b/src/win32/pthread.c
deleted file mode 100644
index 80329b2..0000000
--- a/src/win32/pthread.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "pthread.h"
-#include "../global.h"
-
-#define CLEAN_THREAD_EXIT 0x6F012842
-
-/* The thread procedure stub used to invoke the caller's procedure
- * and capture the return value for later collection. Windows will
- * only hold a DWORD, but we need to be able to store an entire
- * void pointer. This requires the indirection. */
-static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
-{
-	git_thread *thread = lpParameter;
-
-	thread->result = thread->proc(thread->param);
-
-	git__free_tls_data();
-
-	return CLEAN_THREAD_EXIT;
-}
-
-int git_thread_create(
-	git_thread *GIT_RESTRICT thread,
-	void *(*start_routine)(void*),
-	void *GIT_RESTRICT arg)
-{
-	thread->result = NULL;
-	thread->param = arg;
-	thread->proc = start_routine;
-	thread->thread = CreateThread(
-		NULL, 0, git_win32__threadproc, thread, 0, NULL);
-
-	return thread->thread ? 0 : -1;
-}
-
-int git_thread_join(
-	git_thread *thread,
-	void **value_ptr)
-{
-	DWORD exit;
-
-	if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0)
-		return -1;
-
-	if (!GetExitCodeThread(thread->thread, &exit)) {
-		CloseHandle(thread->thread);
-		return -1;
-	}
-
-	/* Check for the thread having exited uncleanly. If exit was unclean,
-	 * then we don't have a return value to give back to the caller. */
-	if (exit != CLEAN_THREAD_EXIT) {
-		assert(false);
-		thread->result = NULL;
-	}
-
-	if (value_ptr)
-		*value_ptr = thread->result;
-
-	CloseHandle(thread->thread);
-	return 0;
-}
-
-int git_mutex_init(git_mutex *GIT_RESTRICT mutex)
-{
-	InitializeCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_free(git_mutex *mutex)
-{
-	DeleteCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_lock(git_mutex *mutex)
-{
-	EnterCriticalSection(mutex);
-	return 0;
-}
-
-int git_mutex_unlock(git_mutex *mutex)
-{
-	LeaveCriticalSection(mutex);
-	return 0;
-}
-
-int git_cond_init(git_cond *cond)
-{
-	/* This is an auto-reset event. */
-	*cond = CreateEventW(NULL, FALSE, FALSE, NULL);
-	assert(*cond);
-
-	/* If we can't create the event, claim that the reason was out-of-memory.
-	 * The actual reason can be fetched with GetLastError(). */
-	return *cond ? 0 : ENOMEM;
-}
-
-int git_cond_free(git_cond *cond)
-{
-	BOOL closed;
-
-	if (!cond)
-		return EINVAL;
-
-	closed = CloseHandle(*cond);
-	assert(closed);
-	GIT_UNUSED(closed);
-
-	*cond = NULL;
-	return 0;
-}
-
-int git_cond_wait(git_cond *cond, git_mutex *mutex)
-{
-	int error;
-	DWORD wait_result;
-
-	if (!cond || !mutex)
-		return EINVAL;
-
-	/* The caller must be holding the mutex. */
-	error = git_mutex_unlock(mutex);
-
-	if (error)
-		return error;
-
-	wait_result = WaitForSingleObject(*cond, INFINITE);
-	assert(WAIT_OBJECT_0 == wait_result);
-	GIT_UNUSED(wait_result);
-
-	return git_mutex_lock(mutex);
-}
-
-int git_cond_signal(git_cond *cond)
-{
-	BOOL signaled;
-
-	if (!cond)
-		return EINVAL;
-
-	signaled = SetEvent(*cond);
-	assert(signaled);
-	GIT_UNUSED(signaled);
-
-	return 0;
-}
-
-
-typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);
-
-static win32_srwlock_fn win32_srwlock_initialize;
-static win32_srwlock_fn win32_srwlock_acquire_shared;
-static win32_srwlock_fn win32_srwlock_release_shared;
-static win32_srwlock_fn win32_srwlock_acquire_exclusive;
-static win32_srwlock_fn win32_srwlock_release_exclusive;
-
-int git_rwlock_init(git_rwlock *GIT_RESTRICT lock)
-{
-	if (win32_srwlock_initialize)
-		win32_srwlock_initialize(&lock->native.srwl);
-	else
-		InitializeCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_rdlock(git_rwlock *lock)
-{
-	if (win32_srwlock_acquire_shared)
-		win32_srwlock_acquire_shared(&lock->native.srwl);
-	else
-		EnterCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_rdunlock(git_rwlock *lock)
-{
-	if (win32_srwlock_release_shared)
-		win32_srwlock_release_shared(&lock->native.srwl);
-	else
-		LeaveCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_wrlock(git_rwlock *lock)
-{
-	if (win32_srwlock_acquire_exclusive)
-		win32_srwlock_acquire_exclusive(&lock->native.srwl);
-	else
-		EnterCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_wrunlock(git_rwlock *lock)
-{
-	if (win32_srwlock_release_exclusive)
-		win32_srwlock_release_exclusive(&lock->native.srwl);
-	else
-		LeaveCriticalSection(&lock->native.csec);
-
-	return 0;
-}
-
-int git_rwlock_free(git_rwlock *lock)
-{
-	if (!win32_srwlock_initialize)
-		DeleteCriticalSection(&lock->native.csec);
-	git__memzero(lock, sizeof(*lock));
-	return 0;
-}
-
-int win32_pthread_initialize(void)
-{
-	HMODULE hModule = GetModuleHandleW(L"kernel32");
-
-	if (hModule) {
-		win32_srwlock_initialize = (win32_srwlock_fn)
-			GetProcAddress(hModule, "InitializeSRWLock");
-		win32_srwlock_acquire_shared = (win32_srwlock_fn)
-			GetProcAddress(hModule, "AcquireSRWLockShared");
-		win32_srwlock_release_shared = (win32_srwlock_fn)
-			GetProcAddress(hModule, "ReleaseSRWLockShared");
-		win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
-			GetProcAddress(hModule, "AcquireSRWLockExclusive");
-		win32_srwlock_release_exclusive = (win32_srwlock_fn)
-			GetProcAddress(hModule, "ReleaseSRWLockExclusive");
-	}
-
-	return 0;
-}
diff --git a/src/win32/pthread.h b/src/win32/pthread.h
deleted file mode 100644
index 977d2df..0000000
--- a/src/win32/pthread.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#ifndef GIT_PTHREAD_H
-#define GIT_PTHREAD_H
-
-#include "../common.h"
-
-#if defined (_MSC_VER)
-#	define GIT_RESTRICT __restrict
-#else
-#	define GIT_RESTRICT __restrict__
-#endif
-
-typedef struct {
-	HANDLE thread;
-	void *(*proc)(void *);
-	void *param;
-	void *result;
-} git_thread;
-
-typedef CRITICAL_SECTION git_mutex;
-typedef HANDLE git_cond;
-
-typedef struct { void *Ptr; } GIT_SRWLOCK;
-
-typedef struct {
-	union {
-		GIT_SRWLOCK srwl;
-		CRITICAL_SECTION csec;
-	} native;
-} git_rwlock;
-
-int git_thread_create(git_thread *GIT_RESTRICT,
-	void *(*) (void *),
-	void *GIT_RESTRICT);
-int git_thread_join(git_thread *, void **);
-
-int git_mutex_init(git_mutex *GIT_RESTRICT mutex);
-int git_mutex_free(git_mutex *);
-int git_mutex_lock(git_mutex *);
-int git_mutex_unlock(git_mutex *);
-
-int git_cond_init(git_cond *);
-int git_cond_free(git_cond *);
-int git_cond_wait(git_cond *, git_mutex *);
-int git_cond_signal(git_cond *);
-
-int git_rwlock_init(git_rwlock *GIT_RESTRICT lock);
-int git_rwlock_rdlock(git_rwlock *);
-int git_rwlock_rdunlock(git_rwlock *);
-int git_rwlock_wrlock(git_rwlock *);
-int git_rwlock_wrunlock(git_rwlock *);
-int git_rwlock_free(git_rwlock *);
-
-extern int win32_pthread_initialize(void);
-
-#endif
diff --git a/src/win32/thread.c b/src/win32/thread.c
new file mode 100644
index 0000000..8222c65
--- /dev/null
+++ b/src/win32/thread.c
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include "thread.h"
+#include "../global.h"
+
+#define CLEAN_THREAD_EXIT 0x6F012842
+
+/* The thread procedure stub used to invoke the caller's procedure
+ * and capture the return value for later collection. Windows will
+ * only hold a DWORD, but we need to be able to store an entire
+ * void pointer. This requires the indirection. */
+static DWORD WINAPI git_win32__threadproc(LPVOID lpParameter)
+{
+	git_thread *thread = lpParameter;
+
+	thread->result = thread->proc(thread->param);
+
+	git__free_tls_data();
+
+	return CLEAN_THREAD_EXIT;
+}
+
+int git_thread_create(
+	git_thread *GIT_RESTRICT thread,
+	void *(*start_routine)(void*),
+	void *GIT_RESTRICT arg)
+{
+	thread->result = NULL;
+	thread->param = arg;
+	thread->proc = start_routine;
+	thread->thread = CreateThread(
+		NULL, 0, git_win32__threadproc, thread, 0, NULL);
+
+	return thread->thread ? 0 : -1;
+}
+
+int git_thread_join(
+	git_thread *thread,
+	void **value_ptr)
+{
+	DWORD exit;
+
+	if (WaitForSingleObject(thread->thread, INFINITE) != WAIT_OBJECT_0)
+		return -1;
+
+	if (!GetExitCodeThread(thread->thread, &exit)) {
+		CloseHandle(thread->thread);
+		return -1;
+	}
+
+	/* Check for the thread having exited uncleanly. If exit was unclean,
+	 * then we don't have a return value to give back to the caller. */
+	if (exit != CLEAN_THREAD_EXIT) {
+		assert(false);
+		thread->result = NULL;
+	}
+
+	if (value_ptr)
+		*value_ptr = thread->result;
+
+	CloseHandle(thread->thread);
+	return 0;
+}
+
+int git_mutex_init(git_mutex *GIT_RESTRICT mutex)
+{
+	InitializeCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_free(git_mutex *mutex)
+{
+	DeleteCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_lock(git_mutex *mutex)
+{
+	EnterCriticalSection(mutex);
+	return 0;
+}
+
+int git_mutex_unlock(git_mutex *mutex)
+{
+	LeaveCriticalSection(mutex);
+	return 0;
+}
+
+int git_cond_init(git_cond *cond)
+{
+	/* This is an auto-reset event. */
+	*cond = CreateEventW(NULL, FALSE, FALSE, NULL);
+	assert(*cond);
+
+	/* If we can't create the event, claim that the reason was out-of-memory.
+	 * The actual reason can be fetched with GetLastError(). */
+	return *cond ? 0 : ENOMEM;
+}
+
+int git_cond_free(git_cond *cond)
+{
+	BOOL closed;
+
+	if (!cond)
+		return EINVAL;
+
+	closed = CloseHandle(*cond);
+	assert(closed);
+	GIT_UNUSED(closed);
+
+	*cond = NULL;
+	return 0;
+}
+
+int git_cond_wait(git_cond *cond, git_mutex *mutex)
+{
+	int error;
+	DWORD wait_result;
+
+	if (!cond || !mutex)
+		return EINVAL;
+
+	/* The caller must be holding the mutex. */
+	error = git_mutex_unlock(mutex);
+
+	if (error)
+		return error;
+
+	wait_result = WaitForSingleObject(*cond, INFINITE);
+	assert(WAIT_OBJECT_0 == wait_result);
+	GIT_UNUSED(wait_result);
+
+	return git_mutex_lock(mutex);
+}
+
+int git_cond_signal(git_cond *cond)
+{
+	BOOL signaled;
+
+	if (!cond)
+		return EINVAL;
+
+	signaled = SetEvent(*cond);
+	assert(signaled);
+	GIT_UNUSED(signaled);
+
+	return 0;
+}
+
+
+typedef void (WINAPI *win32_srwlock_fn)(GIT_SRWLOCK *);
+
+static win32_srwlock_fn win32_srwlock_initialize;
+static win32_srwlock_fn win32_srwlock_acquire_shared;
+static win32_srwlock_fn win32_srwlock_release_shared;
+static win32_srwlock_fn win32_srwlock_acquire_exclusive;
+static win32_srwlock_fn win32_srwlock_release_exclusive;
+
+int git_rwlock_init(git_rwlock *GIT_RESTRICT lock)
+{
+	if (win32_srwlock_initialize)
+		win32_srwlock_initialize(&lock->native.srwl);
+	else
+		InitializeCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_rdlock(git_rwlock *lock)
+{
+	if (win32_srwlock_acquire_shared)
+		win32_srwlock_acquire_shared(&lock->native.srwl);
+	else
+		EnterCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_rdunlock(git_rwlock *lock)
+{
+	if (win32_srwlock_release_shared)
+		win32_srwlock_release_shared(&lock->native.srwl);
+	else
+		LeaveCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_wrlock(git_rwlock *lock)
+{
+	if (win32_srwlock_acquire_exclusive)
+		win32_srwlock_acquire_exclusive(&lock->native.srwl);
+	else
+		EnterCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_wrunlock(git_rwlock *lock)
+{
+	if (win32_srwlock_release_exclusive)
+		win32_srwlock_release_exclusive(&lock->native.srwl);
+	else
+		LeaveCriticalSection(&lock->native.csec);
+
+	return 0;
+}
+
+int git_rwlock_free(git_rwlock *lock)
+{
+	if (!win32_srwlock_initialize)
+		DeleteCriticalSection(&lock->native.csec);
+	git__memzero(lock, sizeof(*lock));
+	return 0;
+}
+
+int win32_pthread_initialize(void)
+{
+	HMODULE hModule = GetModuleHandleW(L"kernel32");
+
+	if (hModule) {
+		win32_srwlock_initialize = (win32_srwlock_fn)
+			GetProcAddress(hModule, "InitializeSRWLock");
+		win32_srwlock_acquire_shared = (win32_srwlock_fn)
+			GetProcAddress(hModule, "AcquireSRWLockShared");
+		win32_srwlock_release_shared = (win32_srwlock_fn)
+			GetProcAddress(hModule, "ReleaseSRWLockShared");
+		win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
+			GetProcAddress(hModule, "AcquireSRWLockExclusive");
+		win32_srwlock_release_exclusive = (win32_srwlock_fn)
+			GetProcAddress(hModule, "ReleaseSRWLockExclusive");
+	}
+
+	return 0;
+}
diff --git a/src/win32/thread.h b/src/win32/thread.h
new file mode 100644
index 0000000..f5dd41b
--- /dev/null
+++ b/src/win32/thread.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef INCLUDE_win32_thread_h__
+#define INCLUDE_win32_thread_h__
+
+#include "../common.h"
+
+#if defined (_MSC_VER)
+#	define GIT_RESTRICT __restrict
+#else
+#	define GIT_RESTRICT __restrict__
+#endif
+
+typedef struct {
+	HANDLE thread;
+	void *(*proc)(void *);
+	void *param;
+	void *result;
+} git_thread;
+
+typedef CRITICAL_SECTION git_mutex;
+typedef HANDLE git_cond;
+
+typedef struct { void *Ptr; } GIT_SRWLOCK;
+
+typedef struct {
+	union {
+		GIT_SRWLOCK srwl;
+		CRITICAL_SECTION csec;
+	} native;
+} git_rwlock;
+
+int git_thread_create(git_thread *GIT_RESTRICT,
+	void *(*) (void *),
+	void *GIT_RESTRICT);
+int git_thread_join(git_thread *, void **);
+
+int git_mutex_init(git_mutex *GIT_RESTRICT mutex);
+int git_mutex_free(git_mutex *);
+int git_mutex_lock(git_mutex *);
+int git_mutex_unlock(git_mutex *);
+
+int git_cond_init(git_cond *);
+int git_cond_free(git_cond *);
+int git_cond_wait(git_cond *, git_mutex *);
+int git_cond_signal(git_cond *);
+
+int git_rwlock_init(git_rwlock *GIT_RESTRICT lock);
+int git_rwlock_rdlock(git_rwlock *);
+int git_rwlock_rdunlock(git_rwlock *);
+int git_rwlock_wrlock(git_rwlock *);
+int git_rwlock_wrunlock(git_rwlock *);
+int git_rwlock_free(git_rwlock *);
+
+extern int win32_pthread_initialize(void);
+
+#endif /* INCLUDE_win32_thread_h__ */