From: Seija Kijin <doremylover123@xxxxxxxxx>
Use _beginthreadex instead of CreateThread
since we use the Windows CRT.
Finally, check for NULL handles, not "INVALID_HANDLE,"
as _beginthreadex guarantees a valid handle in most cases
Signed-off-by: Seija Kijin <doremylover123@xxxxxxxxx>
---
win32: fix thread usage for win32
Use pthread_exit instead of async_exit.
This means we do not have to deal with Windows's implementation
requiring an unsigned exit coded despite the POSIX exit code requiring a
signed exit code.
Use _beginthreadex instead of CreateThread since we use the Windows CRT.
Finally, check for NULL handles, not "INVALID_HANDLE," as _beginthreadex
guarantees a valid handle in most cases
Signed-off-by: Seija Kijin doremylover123@xxxxxxxxx
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1440%2FAtariDreams%2FCreateThread-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1440/AtariDreams/CreateThread-v2
Pull-Request: https://github.com/git/git/pull/1440
Range-diff vs v1:
1: f5de6bfb759 ! 1: 4a2c3da9d4c win32: fix thread usage for win32
@@ Metadata
## Commit message ##
win32: fix thread usage for win32
- Use pthread_exit instead of async_exit.
-
- This means we do not have
- to deal with Windows's implementation
- requiring an unsigned exit coded
- despite the POSIX exit code requiring
- a signed exit code.
-
Use _beginthreadex instead of CreateThread
since we use the Windows CRT.
@@ compat/winansi.c: void winansi_init(void)
/* schedule cleanup routine */
if (atexit(winansi_exit))
-
- ## run-command.c ##
-@@ run-command.c: static void *run_thread(void *data)
- return (void *)ret;
- }
-
-+int in_async(void)
-+{
-+ if (!main_thread_set)
-+ return 0; /* no asyncs started yet */
-+ return !pthread_equal(main_thread, pthread_self());
-+}
-+
- static NORETURN void die_async(const char *err, va_list params)
- {
- report_fn die_message_fn = get_die_message_routine();
-@@ run-command.c: static int async_die_is_recursing(void)
- return ret != NULL;
- }
-
--int in_async(void)
--{
-- if (!main_thread_set)
-- return 0; /* no asyncs started yet */
-- return !pthread_equal(main_thread, pthread_self());
--}
--
--static void NORETURN async_exit(int code)
--{
-- pthread_exit((void *)(intptr_t)code);
--}
--
- #else
-
- static struct {
-@@ run-command.c: int in_async(void)
- return process_is_async;
- }
-
--static void NORETURN async_exit(int code)
--{
-- exit(code);
--}
--
- #endif
-
- void check_pipe(int err)
- {
- if (err == EPIPE) {
-- if (in_async())
-- async_exit(141);
-+ if (in_async()) {
-+#ifdef NO_PTHREADS
-+ exit(141);
-+#else
-+ pthread_exit((void *)141);
-+#endif
-+ }
-
- signal(SIGPIPE, SIG_DFL);
- raise(SIGPIPE);
compat/mingw.c | 2 +-
compat/winansi.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compat/mingw.c b/compat/mingw.c
index e433740381b..715f1c87e11 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2291,7 +2291,7 @@ static int start_timer_thread(void)
timer_event = CreateEvent(NULL, FALSE, FALSE, NULL);
if (timer_event) {
timer_thread = (HANDLE) _beginthreadex(NULL, 0, ticktack, NULL, 0, NULL);
- if (!timer_thread )
+ if (!timer_thread)
return errno = ENOMEM,
error("cannot start timer thread");
} else
diff --git a/compat/winansi.c b/compat/winansi.c
index 3abe8dd5a27..be65b27bd75 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -340,7 +340,7 @@ enum {
TEXT = 0, ESCAPE = 033, BRACKET = '['
};
-static DWORD WINAPI console_thread(LPVOID unused)
+static unsigned int WINAPI console_thread(LPVOID unused)
{
unsigned char buffer[BUFFER_SIZE];
DWORD bytes;
@@ -643,9 +643,9 @@ void winansi_init(void)
die_lasterr("CreateFile for named pipe failed");
/* start console spool thread on the pipe's read end */
- hthread = CreateThread(NULL, 0, console_thread, NULL, 0, NULL);
- if (hthread == INVALID_HANDLE_VALUE)
- die_lasterr("CreateThread(console_thread) failed");
+ hthread = (HANDLE)_beginthreadex(NULL, 0, console_thread, NULL, 0, NULL);
+ if (!hthread)
+ die_lasterr("_beginthreadex(console_thread) failed");
/* schedule cleanup routine */
if (atexit(winansi_exit))
base-commit: 56c8fb1e95377900ec9d53c07886022af0a5d3c2
--
gitgitgadget
