From patchwork Tue Jul 22 14:58:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dora, Sunil Kumar" X-Patchwork-Id: 116781 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 42367385B532 for ; Tue, 22 Jul 2025 15:01:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42367385B532 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by sourceware.org (Postfix) with ESMTPS id 9659F3858C41 for ; Tue, 22 Jul 2025 14:58:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9659F3858C41 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=windriver.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=windriver.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 9659F3858C41 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=205.220.178.238 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1753196324; cv=pass; b=nexmqxVlzPMerHpM9lVlECIOiuu5y+qnbNcyVwT+7ZuTwWGVuVd+PF6wrVNWvNGBc/X/N2Le2X3pKBY7lNhMGe7K0MVBHXAWs+5ezVOYvyzYE+s2rVCO7QPhHwI7NGD/lpJGQx+lQc8RiGjUZ8SOEM/aqWfS6xxAtoPUMzbwMWA= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1753196324; c=relaxed/simple; bh=DlIGhqvbIZ6FJeFRu1eZVwY86mb3bNO+cgnVU5vai0E=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=GToz7aVWHNXDRuOK7ncR9gB9e2+iaoD29MQrZNHolCt55mPx+CoT45qUxBcPOBM58jQNfxyZ5sy6w4Rk/BwrHxLQefXRMJcthF36rE5zIU0x9V15RMPu5QDlFwqBq5TnUkzVh4NA3u7h+tJCzUNk/OR1XwIcnBovgQU/NbmBK4A= ARC-Authentication-Results: i=2; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9659F3858C41 Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.8/8.18.1.8) with ESMTP id 56M5f5wZ3558072; Tue, 22 Jul 2025 14:58:42 GMT Received: from nam12-mw2-obe.outbound.protection.outlook.com (mail-mw2nam12on2062.outbound.protection.outlook.com [40.107.244.62]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 481vqu8xc9-5 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 22 Jul 2025 14:58:42 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X5OjYPWPfh52jLCF/kcDxgDQ12ckKqPftX1dBlaWn/lzg29ops/OC4ROSAxN2Z5SLgtnmBHypo5verNWD1TYbYZxV1KHDy+JeK9C/8h75C8uX7a0rNQ+oSt3OoJFUdLZh+bZu84sEuIRugUTZ/U1jwkOjxrGMjqDZJObwkTQtmCsme9hg8DDqr74OrXzvV8hyK5fTBJyuHnr4NxNkIwt7W5u4H/kGMpbAWKo/22VS4LxCo5iewNzksqMdX+SDb2o/dGXgB3Wh4wrS97D2hunGVgIWuSk3SI/irVB5zjf4865lnak6a+HRxw4nlEUvpYGQl6DxBoqCkce2vkDiyZ1Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=AF+ZbBx5niUDHGknJN4sNqqhQMTq0G5L4LqNo61qlPQ=; b=cxN2DE9rFbe+MVU0sILjhHOm+N5rQozf1SZelCeBUOVMcdAPOF0dB+q6Gn+ErLEbsfqQOzRpi0FdJtTOxdNvZryS283fGFRzuEBpJjnLtkj07GfgkTXrn//s5mf4asZM5Vfh53bTcIusSK2JigCvzrbkl4DSHRDmp+dKrnEUFM/olibWmCqmr5t4qFr9OQZLvcK3E0nZXqD3N+w+5j2+7ttKDXLUnCx4iHMY7XESIe03iABqw9KCycKJWKKYeOCjkIAbQuNeZdaSjIzD4o4LHCGD3RJvYaxSClHtOHKV9QuGp6c7a0miSUxSBcyIsNGVGViY58TzaXKTbDSO5WwYlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) by BL3PR11MB6313.namprd11.prod.outlook.com (2603:10b6:208:3b0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8943.29; Tue, 22 Jul 2025 14:58:38 +0000 Received: from DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::9fa:eb3f:cf26:264d]) by DS0PR11MB7901.namprd11.prod.outlook.com ([fe80::9fa:eb3f:cf26:264d%3]) with mapi id 15.20.8943.029; Tue, 22 Jul 2025 14:58:38 +0000 From: sunilkumar.dora@windriver.com To: libc-alpha@sourceware.org Cc: sunilkumar.dora@windriver.com, carlos@redhat.com, fweimer@redhat.com, Sundeep.Kokkonda@windriver.com Subject: [PATCH 05/10] [2.36] nptl: Remove g_refs from condition variables Date: Tue, 22 Jul 2025 07:58:16 -0700 Message-ID: <20250722145821.2214847-6-sunilkumar.dora@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250722145821.2214847-1-sunilkumar.dora@windriver.com> References: <20250722145821.2214847-1-sunilkumar.dora@windriver.com> X-ClientProxiedBy: SJ0PR13CA0232.namprd13.prod.outlook.com (2603:10b6:a03:2c1::27) To DS0PR11MB7901.namprd11.prod.outlook.com (2603:10b6:8:f4::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7901:EE_|BL3PR11MB6313:EE_ X-MS-Office365-Filtering-Correlation-Id: a020923d-5885-49c2-9f68-08ddc9303da0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: IzuHIRU8zOWuUDZGTwJgWDBADFZAKBWhqtcA/jZih3tCof9lWwGu2kLcWV3PexrjJ0pNlfeAT2JVuTZHYeIcJmad7Ks4GnUVOspC/KfT7MsKCgjP8EBTy8qVi/D2rSsNOEolOOcKuqlpwf0OaqgnOb7L+oCe8Q/fBAUFk3MlBH9Z+q7XE23yAH8qVgE4jqQ7eqY9Je84uBn7hSsxc2GDpdS0ExpgpBwtAGp2PFTZv6CD+7POTHGFwqzLylokSTOp83fiiparDL1AP/jZQrU84IYQE97hWlYozxhhPKd1NUlGcXIsOlGKjwJmfXD+bZyEh40W9Ma/Tvk/KvphXU3aA+lrNbv/zorisgfYG7W03kaWFDK/LPygaVt8FltGUJx507MvZWdXRC6jMoyLnj9B1amrQV9ow0/WCSEkhD6NflYRZh/xm+fllzKQRZ2O3gvVv1w0od4PwdRGS8V/QbZGpZ3vO7mV16RJXtZL1auW/J41hvjkEnieoqQXxdUJowLPCB8VFBicFztjPJQkWIAaDborSaxBnyADs2Tm3l+xoseC9tPGombrqaAfZCmVawO17L+VQ/ilmPGXcPPlBiYLouFKjMquCWQE8vzAM/YJXozLEXAhwVjGSxP5tus72XP3WUsCEjuFGbNNZnN1x/B/D+exKhC9Ux8CJQ+jsKb0xbVg6NRpCg4x9YAAqnpktB4MzjEeLGpCZ4IvCdlXyIgih7Znm5u7gEZqfu26vdNCgEFyYdvv7ZkWrG7GIUoRPo9finZ7+gJs/bU8gGebzhm4oisF4IAi2Go1kEFR9CNSQgtBNxOqi9yX3d/jefQ+qooZ3fl7kxrBAkusdOzkaa00WgsE1KLIz/ADqdBbHEvTBybZ9Ba/E7Ml6KfzP5eLztMqDJCqfprGaTYeMQCwvxG7LSooLR2kLazUnUUFT0k3Dza3P0r72yHd0IKdbznjn+w8PeAApCEpD15b3wcGSD/o0Ykmtsr+YdQ/BDpmJ+ecZne2dx9Kzx/sq6QllVitDFwbJoMWmvw6mLslwYdj9QKplUXdsN4Gk3CRoTMRcmB+YmCECkeX1fgqRs8LVlwOYQEA4Wtn2UYzYTz4SgDY/yFUpYSb6ZvvvHbbuTgkMlPFxb5f27835ErJNBGfOGojSf+YMRu7V1vWBGio9cWSZR12vLfiHfsLlEiiorgGacy925C9SPyk8oOOMzgDik/xEbCol9LGV7JD4Cqmff6fv3Qv0GJ4k12WLtJaq4PEio2di2LXNUnfV05J9fPbzBjFA161hnqpp5Xpa8mQmagnQcuZyBhqz2tjzI/WoD+2MfgP2NfnmdvyXfgK32jnLh288OUUNd7qYzCc3nVPUQU9TWd4umsbwWnDd332hDmnbYWkSeeYoYB///WXbQJctnkh68bpvyAQpL2mmNu2Sg88aJtSztK36GsvrLiqgOG7AZbFdFuTfEoYG/+PdJopZL7u5z9SiiytPXm16AmuO+4+Y+f6mw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DS0PR11MB7901.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xQ3jpKYfgGxsQF8qD0ULmA8tsiEo5PLgQkkdYYDq37RAiEzQAiHvFser+iYWOcWcYwkU5UWEH6YRH1OjTJS4VpZ4TzVj/294R4TlVfS92uXpskwqKshaBqCooX5MkUMNaovZqHfMSmod8gZdztXiTtxW6wk5F356xgOleMXhI1evRLdr0iUtPsNoRiA4Wps+mM/i7bjrMoCrBmTSNlFpwDUe8d2le1cbrgvHcQnilgs6OGUUzS0miP7t3dPx3ZZG8JVDJ+QvrcTqWnfKlLPfQ4s6yqlM/nlHOkvPmD3J++wtj53U8LiulsyYLXcD0cvKz43PqNp1eu809t9QXj6hAsFOjHtqpA5+jgYFZv0w58oGvMhdXY7LCBz6s9M5+uivn3ZAwF6nAdRq5I5dUx8N7VVqJYZplcQ6vIEmy84FOsWpwLpiYaoScmz8o5pCFuscUY+90vT6Yky1T7Fl29XFKymXPHJTiuZH36BFfITn5a5AJeclQVRNNINzZMVHAtFl8Cj2AdOXbsn8zeCkFA/IF7S7MhqFNIqy6VqePF9IIc5sY/VA95KC7A6hcN/UMYyk1CDVZa3q3g5FI0oad9h72T1s/Cm2Vb2DQI1faaUOVAQt7uOjrbWGCdz6KlS8mt1kimTPskzQtPrztsRXfPA5y+/qmrc6oZLPXW7jjHv2cokc2T3FHvFRB+vGTelT4am6vhgRTPDdcn63For3Xg35VWbJw6eJ55hz7FqFw0GSt8SAWIsG4298H4jpOyr9HthEAB8d6iY0kwCeH7rDYXkmjxE1uxmzX9OVfiLLojE8RM3HIcIUQVosmQg2M47avse/E6c0jpDHdoMgCpekWQQDWGQaDf/epxfN5M3+9DvTNnWxeQ9sLFpS2fwVSLnGydLy1Ugd8gd4A+itrRPcFVZrwMVaX3Ru8eYarN0v2l6D/SAheNvQovEBAxa4vDs1SLZfUsdihO97sefPxhITM8u203zI0fP4AIzFCF8dfxpYcwJ1V5M9ZLM7ZBuHFSmY2iVY3qOHzwIY5NagR8s2kogrR7zH8jMzXklSAzxdWKWsnKSvnmIxdopC9w6XyDRFZhr4Pdg0R/GhEpye+VAtPrub9NvR7MaLzjQ9VMV1iNlZUM+KD8DQrnv4O8SyAYlfMVLvxxjtYOShobMN8KV1n3g4hQ+TLqIe4d1HTgRzKQaO5frISJcXg93jnwHxgVAEltBqCcXgXb7BaWBmcMUJUZ+nHTQ2pHKD1l1p+051i9aPCQP/Z2WcqqFYz/9UAbrts78Dsi0QUQDmTCT+wr3H6f75Rrf00MAnagZ41nM+ST4slT7nld45O47J9BZEyqLc4GB79idZUBIxHx2jmSse3NcLVKnk5WNBGatg2DjcNdpYtAL8g4t1s6Zsu52CunBQvuu1r7VxokYR5K5Tr/Jw7rwOjxpffdTCxT276DUF8rUHCBL5NS5dGH/wGitydVTYxR+MAear+nO+u9gDpV869IH+r/XCgnQb8/DoX/kl55l8HjMYQNYdP583/4pf0NCY7ZjSnz6bd6uy7vfLXob0Ncc60WStr+zxHfaNKIobd4ffiCPPweP+oy2fzIyhx/X3CfLL2EfS4mwUF8MNPtKfus3kug== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: a020923d-5885-49c2-9f68-08ddc9303da0 X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7901.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2025 14:58:38.7717 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 06Xs3k24VMTbLAPqy/WudpMkgXcKJuHH0h2LqLzQ3xO/XF7y6d5TOu70YPfSu1zb5bz79nwDsgYdFP4SsB7PgHbmEZBJLSkPi9ox88p+GVI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR11MB6313 X-Proofpoint-GUID: aa4zdZmbwThX9v_9by-ztKLS30mLp7pR X-Proofpoint-ORIG-GUID: aa4zdZmbwThX9v_9by-ztKLS30mLp7pR X-Authority-Analysis: v=2.4 cv=AbqxH2XG c=1 sm=1 tr=0 ts=687fa722 cx=c_pps a=7j0Ltmo+QGRCGvpdpD29zg==:117 a=6eWqkTHjU83fiwn7nKZWdM+Sl24=:19 a=lCpzRmAYbLLaTzLvsPZ7Mbvzbb8=:19 a=wKuvFiaSGQ0qltdbU6+NXLB8nM8=:19 a=Ol13hO9ccFRV9qXi2t6ftBPywas=:19 a=xqWC_Br6kY4A:10 a=Wb1JkmetP80A:10 a=t7CeM3EgAAAA:8 a=g5cTviEHbg7wfX6xL70A:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNzIyMDEyNCBTYWx0ZWRfX9itnzAV/cuyl JTciGrNUKeOEU9hr1ExqJgMQO8XM9R9PJoFNYnleT+Ani+JnTB8IBM1l1OC4yTrbZavMepg7dn7 LkzzYp4+syjp+khOlgMIuBZ4RKz1DshZ9EdqCHQvMbqtqQoj/gBeJSe130GMNHt2V/bvLhCXkaK iFrmz1CLNwyoeOHwkmMBMD/FH2He3Q4xqLSkkQ3ZLFR1Wy2YbOi6oGlCiZv0XeGnhPEV36GEbEG a30aUCxi6iSPhnH0SDtFnhg00npxpbwnB8vw1Q66z2omF10QvXtk53Hki7+eHz6iIK7Bbj8io6S dKt8p5hvENlB5zNpdycwY2pzuvd3L/AeQ+YgVtwrd6fNgM2mPRHpTIhryu9xf2iQB2kc8QW3j4s DoPGUQE2 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-07-22_02,2025-07-21_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 malwarescore=0 suspectscore=0 spamscore=0 phishscore=0 bulkscore=0 priorityscore=1501 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2507210000 definitions=main-2507210183 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Malte Skarupke [BZ #25847] This variable used to be needed to wait in group switching until all sleepers have confirmed that they have woken. This is no longer needed. Nothing waits on this variable so there is no need to track how many threads are currently asleep in each group. (cherry picked from commit c36fc50781995e6758cae2b6927839d0157f213c) Signed-off-by: Sunil Dora --- nptl/pthread_cond_wait.c | 52 +------------------------ nptl/tst-cond22.c | 12 +++--- sysdeps/nptl/bits/thread-shared-types.h | 3 +- sysdeps/nptl/pthread.h | 2 +- 4 files changed, 9 insertions(+), 60 deletions(-) diff --git a/nptl/pthread_cond_wait.c b/nptl/pthread_cond_wait.c index 47e834cade..8a9219e064 100644 --- a/nptl/pthread_cond_wait.c +++ b/nptl/pthread_cond_wait.c @@ -143,23 +143,6 @@ __condvar_cancel_waiting (pthread_cond_t *cond, uint64_t seq, unsigned int g, } } -/* Wake up any signalers that might be waiting. */ -static void -__condvar_dec_grefs (pthread_cond_t *cond, unsigned int g, int private) -{ - /* Release MO to synchronize-with the acquire load in - __condvar_quiesce_and_switch_g1. */ - if (atomic_fetch_add_release (cond->__data.__g_refs + g, -2) == 3) - { - /* Clear the wake-up request flag before waking up. We do not need more - than relaxed MO and it doesn't matter if we apply this for an aliased - group because we wake all futex waiters right after clearing the - flag. */ - atomic_fetch_and_relaxed (cond->__data.__g_refs + g, ~(unsigned int) 1); - futex_wake (cond->__data.__g_refs + g, INT_MAX, private); - } -} - /* Clean-up for cancellation of waiters waiting for normal signals. We cancel our registration as a waiter, confirm we have woken up, and re-acquire the mutex. */ @@ -171,8 +154,6 @@ __condvar_cleanup_waiting (void *arg) pthread_cond_t *cond = cbuffer->cond; unsigned g = cbuffer->wseq & 1; - __condvar_dec_grefs (cond, g, cbuffer->private); - __condvar_cancel_waiting (cond, cbuffer->wseq >> 1, g, cbuffer->private); /* FIXME With the current cancellation implementation, it is possible that a thread is cancelled after it has returned from a syscall. This could @@ -327,15 +308,6 @@ __condvar_cleanup_waiting (void *arg) sufficient because if a waiter can see a sufficiently large value, it could have also consume a signal in the waiters group. - It is essential that the last field in pthread_cond_t is __g_signals[1]: - The previous condvar used a pointer-sized field in pthread_cond_t, so a - PTHREAD_COND_INITIALIZER from that condvar implementation might only - initialize 4 bytes to zero instead of the 8 bytes we need (i.e., 44 bytes - in total instead of the 48 we need). __g_signals[1] is not accessed before - the first group switch (G2 starts at index 0), which will set its value to - zero after a harmless fetch-or whose return value is ignored. This - effectively completes initialization. - Limitations: * This condvar isn't designed to allow for more than @@ -440,21 +412,6 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, if ((int)(signals - lowseq) >= 2) break; - /* No signals available after spinning, so prepare to block. - We first acquire a group reference and use acquire MO for that so - that we synchronize with the dummy read-modify-write in - __condvar_quiesce_and_switch_g1 if we read from that. In turn, - in this case this will make us see the advancement of __g_signals - to the upcoming new g1_start that occurs with a concurrent - attempt to reuse the group's slot. - We use acquire MO for the __g_signals check to make the - __g1_start check work (see spinning above). - Note that the group reference acquisition will not mask the - release MO when decrementing the reference count because we use - an atomic read-modify-write operation and thus extend the release - sequence. */ - atomic_fetch_add_acquire (cond->__data.__g_refs + g, 2); - // Now block. struct _pthread_cleanup_buffer buffer; struct _condvar_cleanup_buffer cbuffer; @@ -471,18 +428,11 @@ __pthread_cond_wait_common (pthread_cond_t *cond, pthread_mutex_t *mutex, if (__glibc_unlikely (err == ETIMEDOUT || err == EOVERFLOW)) { - __condvar_dec_grefs (cond, g, private); - /* If we timed out, we effectively cancel waiting. Note that - we have decremented __g_refs before cancellation, so that a - deadlock between waiting for quiescence of our group in - __condvar_quiesce_and_switch_g1 and us trying to acquire - the lock during cancellation is not possible. */ + /* If we timed out, we effectively cancel waiting. */ __condvar_cancel_waiting (cond, seq, g, private); result = err; goto done; } - else - __condvar_dec_grefs (cond, g, private); /* Reload signals. See above for MO. */ signals = atomic_load_acquire (cond->__data.__g_signals + g); diff --git a/nptl/tst-cond22.c b/nptl/tst-cond22.c index 1336e9c79d..bdcb45c536 100644 --- a/nptl/tst-cond22.c +++ b/nptl/tst-cond22.c @@ -106,13 +106,13 @@ do_test (void) status = 1; } - printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n", + printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n", c.__data.__wseq.__value32.__high, c.__data.__wseq.__value32.__low, c.__data.__g1_start.__value32.__high, c.__data.__g1_start.__value32.__low, - c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0], - c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1], + c.__data.__g_signals[0], c.__data.__g_size[0], + c.__data.__g_signals[1], c.__data.__g_size[1], c.__data.__g1_orig_size, c.__data.__wrefs); if (pthread_create (&th, NULL, tf, (void *) 1l) != 0) @@ -152,13 +152,13 @@ do_test (void) status = 1; } - printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u/%u, %u/%u/%u, %u, %u }\n", + printf ("cond = { 0x%x:%x, 0x%x:%x, %u/%u, %u/%u, %u, %u }\n", c.__data.__wseq.__value32.__high, c.__data.__wseq.__value32.__low, c.__data.__g1_start.__value32.__high, c.__data.__g1_start.__value32.__low, - c.__data.__g_signals[0], c.__data.__g_refs[0], c.__data.__g_size[0], - c.__data.__g_signals[1], c.__data.__g_refs[1], c.__data.__g_size[1], + c.__data.__g_signals[0], c.__data.__g_size[0], + c.__data.__g_signals[1], c.__data.__g_size[1], c.__data.__g1_orig_size, c.__data.__wrefs); return status; diff --git a/sysdeps/nptl/bits/thread-shared-types.h b/sysdeps/nptl/bits/thread-shared-types.h index 5653507e55..6f17afa473 100644 --- a/sysdeps/nptl/bits/thread-shared-types.h +++ b/sysdeps/nptl/bits/thread-shared-types.h @@ -95,8 +95,7 @@ struct __pthread_cond_s { __atomic_wide_counter __wseq; __atomic_wide_counter __g1_start; - unsigned int __g_refs[2] __LOCK_ALIGNMENT; - unsigned int __g_size[2]; + unsigned int __g_size[2] __LOCK_ALIGNMENT; unsigned int __g1_orig_size; unsigned int __wrefs; unsigned int __g_signals[2]; diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index dedad4ec86..bbb365407e 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -152,7 +152,7 @@ enum /* Conditional variable handling. */ -#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, {0, 0}, 0, 0, {0, 0} } } +#define PTHREAD_COND_INITIALIZER { { {0}, {0}, {0, 0}, 0, 0, {0, 0} } } /* Cleanup buffers */