From patchwork Thu Dec 22 17:17:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seija Kijin X-Patchwork-Id: 13080199 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E01A7C4332F for ; Thu, 22 Dec 2022 17:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230207AbiLVRRq (ORCPT ); Thu, 22 Dec 2022 12:17:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229524AbiLVRRi (ORCPT ); Thu, 22 Dec 2022 12:17:38 -0500 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F2ED114D02 for ; Thu, 22 Dec 2022 09:17:36 -0800 (PST) Received: by mail-wr1-x42d.google.com with SMTP id o5so2335084wrm.1 for ; Thu, 22 Dec 2022 09:17:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=egx8Tc1dl4FS7rrBDx3AVHu2d0Z6g+EfiY3hLnF+dWE=; b=DoID0s0FX5p1xreohhe1SSl8hnzJ2QhKh3xxcf2bLqHTsoI+UlsVgb84MUXKH2IgCU wACjd+oawtMYiOeS792+xOT9hIn6sVWnJXmSu/GL7w23eO7xhXmqr4GSQNxO6bv9w8MZ K10yfOrkEdZpPQKqgJ+E7mmfeMz25IH09lRuFbztYCnW6zNUnWRdKDNwo6IxFYgBZMh/ RgOfumxcx4KkhB+/kYzfCBUlT3DTQzY2mgVEVbmFlyY3uc1U3QUZGFOlUhoOAMur2imw IDsqXQV/xRJxwjPKn2V90W9sIWfLpGmXB1wj4Z3CCXlBv7FMAzcjrSNcCKETQ9e6hmZB hbfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=egx8Tc1dl4FS7rrBDx3AVHu2d0Z6g+EfiY3hLnF+dWE=; b=Yk2Rj5DHNcfNzJX3pKDkbVFQOSdwIXNmyAyCPMxlU8FoAoomq7WDHAK4paMalKyBF/ VEe2ypQQ/kElYQLZXekjLSrr25VZgKNbBjIv8SXRUHsrCEXFdGa+8Jb0DxYDz4xP28vP Cs+rz8IxjKDto2m0u24HQCTTXx1WS59bB5XEazO3SFtj4NH7jNxsegbzswXs+VncaE04 X6PXxzjFL8OS0R/V0pGyC/QjyT1ZKTt9ppH5MSgRFTeVEV+M2IDnjpmXSJAgVFk1JAEB N8Y3+0zlBP0YG/zT0czhIgVbcNGdOjXN2ggis/4ao+Wl0eIWCCAnjyuDXgxcJvQ/anTL HFQA== X-Gm-Message-State: AFqh2kpfoaZrcvUSLNIjATWpA+1k66YyoEgOGORmSOh+c+fvKebEZlEy QaXJIchqqJ1gXqRYf2RvmN47vDU6wEM= X-Google-Smtp-Source: AMrXdXuH5CVOa9uzVPtbiw2sg3pxoJizu4viCwbyegT5lRiu9UywxEr+rCt82C00FKEwW3tju45RAw== X-Received: by 2002:a5d:4104:0:b0:268:cb75:53ee with SMTP id l4-20020a5d4104000000b00268cb7553eemr4488649wrp.37.1671729455329; Thu, 22 Dec 2022 09:17:35 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m9-20020a056000008900b00225307f43fbsm1016676wrx.44.2022.12.22.09.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 09:17:34 -0800 (PST) Message-Id: In-Reply-To: References: Date: Thu, 22 Dec 2022 17:17:32 +0000 Subject: [PATCH v9 1/2] win32: close handles of threads that have been joined Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Sixt , Rose <83477269+AtariDreams@users.noreply.github.com>, Seija Kijin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Seija Kijin From: Seija Kijin After the thread terminates, the handle to the original thread should be closed. This change makes win32_pthread_join POSIX compliant. Signed-off-by: Seija Kijin --- compat/win32/pthread.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c index 2e7eead42cb..81178ed93b7 100644 --- a/compat/win32/pthread.c +++ b/compat/win32/pthread.c @@ -42,10 +42,13 @@ int win32_pthread_join(pthread_t *thread, void **value_ptr) case WAIT_OBJECT_0: if (value_ptr) *value_ptr = thread->arg; + CloseHandle(thread->handle); return 0; case WAIT_ABANDONED: + CloseHandle(thread->handle); return EINVAL; default: + /* the wait failed, so do not detach */ return err_win_to_posix(GetLastError()); } } From patchwork Thu Dec 22 17:17:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seija Kijin X-Patchwork-Id: 13080198 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F01A4C4167B for ; Thu, 22 Dec 2022 17:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229835AbiLVRRm (ORCPT ); Thu, 22 Dec 2022 12:17:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229731AbiLVRRi (ORCPT ); Thu, 22 Dec 2022 12:17:38 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CD7E140D0 for ; Thu, 22 Dec 2022 09:17:37 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id ay40so1919836wmb.2 for ; Thu, 22 Dec 2022 09:17:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=C5M+ztR5Lzk/WKMqBRcgXTwHixFN1UErlOmmw73fm9o=; b=JkvgjT888xGiNzcB+UPt7+dMdsPTAqORFC19y73l8hJvac6hnrORazAPDUb+r4VkT0 3ayIXOIo/owqbLfgYBL+KtkR/zgi77PpUmShOM0u4VqU0gzpX4+H909deK9OQdE6zPA2 wuVwXe7kSHALzyhYSELn5Y8mDz6KvtdMTDQ+T7vSP1vBEgd+lBf2Q5/dCjHHRXIhxTNu B7q4/Q19DnLFxqpiXJYr7fQqjECO6fKhLNTgTA6XUYQxRyTDKbTBnTDOv+UnB6uR8AG9 edI27UhKnBfBWtNCouaRpuBGcXBZTyQRPxYPGtGRR3NjoNy5ApufmgXMHIFuLQFmntqF UdWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C5M+ztR5Lzk/WKMqBRcgXTwHixFN1UErlOmmw73fm9o=; b=NmmPdpOeiC8CqX5BFdl1gRgiAbDyCzwhZf5GTeXufaqFuNJ6rFLQV8bimuUqexRd4u YR2HpTHpBL8xKIygbdgQ1MwI0c1HHevQ2seAUs7DDOlZ/6DuuKTRhn+sZxfNIPTUk8Gk dc0sC5uHs6GBfr0tjfcb1qoe/85CZRBbDRiewylmtEHqLvrWX4RATYPUEs5s5Mjyhcn5 s81gtJwYL8fUAUPiJ+/ddsWN1j7aZiOoo/2PNz06Ym/WiL47umYtXMtfRXqxyc4wUmqr cp8zMv/yGCfm4Q1tolJ+pWLXE7rCX46+1o+cAqFwhRlqzoHfPCH6LED5RA9/FjpgY7qa 3Nfg== X-Gm-Message-State: AFqh2kr4wN4KNHe+nkx15spFeohW7ijfq8ldxDgijgcm3Rvbj90pvE2e zomKmI1WPmWI+MBDXO7raneNp/5T7i4= X-Google-Smtp-Source: AMrXdXu3LJRPAbHeUvDAsNClL0+IcGqVSmzioyD1eE9MYP3plLyMuf/KJLHGyOOgA/7wEFpHjsY7ZQ== X-Received: by 2002:a05:600c:4191:b0:3d7:9ae7:e4f2 with SMTP id p17-20020a05600c419100b003d79ae7e4f2mr5138201wmh.35.1671729456062; Thu, 22 Dec 2022 09:17:36 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id m16-20020adffe50000000b00241bd7a7165sm1288837wrs.82.2022.12.22.09.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 09:17:35 -0800 (PST) Message-Id: <4c82a16a9950b67416530249157332a6b2afa839.1671729453.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 22 Dec 2022 17:17:33 +0000 Subject: [PATCH v9 2/2] prep: reformat pthread.c to fit coding guidelines Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Sixt , Rose <83477269+AtariDreams@users.noreply.github.com>, Seija Kijin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Seija Kijin From: Seija Kijin The motivation for this change is that the post-image better fits the coding guidelines, especially since this file was changed. Signed-off-by: Seija Kijin --- compat/win32/pthread.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/compat/win32/pthread.c b/compat/win32/pthread.c index 81178ed93b7..83e088dff0a 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; @@ -37,19 +37,18 @@ int pthread_create(pthread_t *thread, const void *unused, 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; - CloseHandle(thread->handle); - return 0; - case WAIT_ABANDONED: - CloseHandle(thread->handle); - return EINVAL; - default: - /* the wait failed, so do not detach */ - return err_win_to_posix(GetLastError()); + switch (WaitForSingleObject(thread->handle, INFINITE)) { + case WAIT_OBJECT_0: + if (value_ptr) + *value_ptr = thread->arg; + CloseHandle(thread->handle); + return 0; + case WAIT_ABANDONED: + CloseHandle(thread->handle); + return EINVAL; + default: + /* the wait failed, so do not detach */ + return err_win_to_posix(GetLastError()); } }