From: "Seija Kijin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Sixt" <j6t@kdbg.org>,
Rose <83477269+AtariDreams@users.noreply.github.com>,
"Seija Kijin" <doremylover123@gmail.com>
Subject: [PATCH v4 2/2] prep
Date: Tue, 20 Dec 2022 20:04:01 +0000 [thread overview]
Message-ID: <2cb4d5c70072b3e3a4bfb85fe486b78b231a2a8c.1671566641.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1406.v4.git.git.1671566641.gitgitgadget@gmail.com>
From: Seija Kijin <doremylover123@gmail.com>
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
compat/win32/pthread.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c
index 89e89c3fe00..0831ffbc3ae 100644
--- a/compat/win32/pthread.c
+++ b/compat/win32/pthread.c
@@ -22,12 +22,12 @@ static unsigned __stdcall win32_start_routine(void *arg)
}
int pthread_create(pthread_t *thread, const void *unused,
- void *(*start_routine)(void*), void *arg)
+ void *(*start_routine)(void *), void *arg)
{
thread->arg = arg;
thread->start_routine = start_routine;
- thread->handle = (HANDLE)
- _beginthreadex(NULL, 0, win32_start_routine, thread, 0, NULL);
+ thread->handle = (HANDLE)_beginthreadex(NULL, 0, win32_start_routine,
+ thread, 0, NULL);
if (!thread->handle)
return errno;
@@ -39,19 +39,19 @@ int win32_pthread_join(pthread_t *thread, void **value_ptr)
{
DWORD result = WaitForSingleObject(thread->handle, INFINITE);
switch (result) {
- case WAIT_OBJECT_0:
- if (value_ptr)
- *value_ptr = thread->arg;
- /* detach the thread once the join succeeds */
- CloseHandle(thread->handle);
- return 0;
- case WAIT_ABANDONED:
- /* either thread is not joinable or another thread is
- * waiting on this, so do not detatch */
- return EINVAL;
- default:
- /* the function failed, so do not detach */
- return err_win_to_posix(GetLastError());
+ case WAIT_OBJECT_0:
+ if (value_ptr)
+ *value_ptr = thread->arg;
+ /* detach the thread once the join succeeds */
+ CloseHandle(thread->handle);
+ return 0;
+ case WAIT_ABANDONED:
+ /* either thread is not joinable or another thread is
+ * waiting on this, so do not detatch */
+ return EINVAL;
+ default:
+ /* the function failed, so do not detach */
+ return err_win_to_posix(GetLastError());
}
}
--
gitgitgadget
next prev parent reply other threads:[~2022-12-20 20:04 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-19 18:34 [PATCH] win32: close handles of threads that have been joined Rose via GitGitGadget
2022-12-19 18:40 ` Ævar Arnfjörð Bjarmason
2022-12-20 7:53 ` Johannes Sixt
2022-12-20 18:57 ` [PATCH v2] " Rose via GitGitGadget
2022-12-20 19:00 ` [PATCH v3] " Rose via GitGitGadget
2022-12-20 20:03 ` [PATCH v4 0/2] " Rose via GitGitGadget
2022-12-20 20:04 ` [PATCH v4 1/2] " Seija Kijin via GitGitGadget
2022-12-20 20:04 ` Seija Kijin via GitGitGadget [this message]
2022-12-20 21:18 ` [PATCH v5] " Rose via GitGitGadget
2022-12-20 22:06 ` Johannes Sixt
2022-12-21 4:35 ` [PATCH v6 0/2] " Rose via GitGitGadget
2022-12-21 4:35 ` [PATCH v6 1/2] " Seija Kijin via GitGitGadget
2022-12-21 4:35 ` [PATCH v6 2/2] prep Seija Kijin via GitGitGadget
2022-12-21 4:46 ` [PATCH v7 0/2] win32: close handles of threads that have been joined Rose via GitGitGadget
2022-12-21 4:46 ` [PATCH v7 1/2] " Seija Kijin via GitGitGadget
2022-12-22 7:52 ` Johannes Sixt
2022-12-21 4:46 ` [PATCH v7 2/2] prep Seija Kijin via GitGitGadget
2022-12-22 16:01 ` [PATCH v8] win32: close handles of threads that have been joined Rose via GitGitGadget
2022-12-22 17:17 ` [PATCH v9 0/2] " Rose via GitGitGadget
2022-12-22 17:17 ` [PATCH v9 1/2] " Seija Kijin via GitGitGadget
2022-12-22 17:17 ` [PATCH v9 2/2] prep: reformat pthread.c to fit coding guidelines Seija Kijin via GitGitGadget
2022-12-23 1:51 ` Junio C Hamano
2022-12-23 19:15 ` [PATCH v10 0/2] win32: close handles of threads that have been joined Rose via GitGitGadget
2022-12-23 19:15 ` [PATCH v10 1/2] win32-pthread: prepare pthread.c for change by formatting Seija Kijin via GitGitGadget
2022-12-23 19:15 ` [PATCH v10 2/2] win32: close handles of threads that have been joined Seija Kijin via GitGitGadget
2022-12-23 19:19 ` [PATCH v11 0/2] " Rose via GitGitGadget
2022-12-23 19:19 ` [PATCH v11 1/2] win32-pthread: prepare pthread.c for change by formatting Seija Kijin via GitGitGadget
2022-12-23 19:19 ` [PATCH v11 2/2] win32: close handles of threads that have been joined Seija Kijin via GitGitGadget
2022-12-24 7:50 ` René Scharfe
2022-12-25 1:40 ` [PATCH v12 0/2] " Rose via GitGitGadget
2022-12-25 1:40 ` [PATCH v12 1/2] win32-pthread: prepare pthread.c for change by formatting Seija Kijin via GitGitGadget
2022-12-26 1:32 ` Junio C Hamano
2022-12-25 1:40 ` [PATCH v12 2/2] win32: close handles of threads that have been joined Seija Kijin via GitGitGadget
2022-12-26 2:07 ` Junio C Hamano
2023-01-03 16:20 ` [PATCH v13 0/2] " Rose via GitGitGadget
2023-01-03 16:20 ` [PATCH v13 1/2] win32: prepare pthread.c for change by formatting Seija Kijin via GitGitGadget
2023-01-03 16:20 ` [PATCH v13 2/2] win32: close handles of threads that have been joined Seija Kijin via GitGitGadget
2023-01-05 15:44 ` [PATCH v14 0/2] " Rose via GitGitGadget
2023-01-05 15:44 ` [PATCH v14 1/2] win32: prepare pthread.c for change by formatting Seija Kijin via GitGitGadget
2023-01-05 15:44 ` [PATCH v14 2/2] win32: close handles of threads that have been joined Seija Kijin via GitGitGadget
2023-01-06 12:28 ` [PATCH v14 0/2] " Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2cb4d5c70072b3e3a4bfb85fe486b78b231a2a8c.1671566641.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=83477269+AtariDreams@users.noreply.github.com \
--cc=avarab@gmail.com \
--cc=doremylover123@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).