Submitter | Jun Wu |
---|---|
Date | July 28, 2016, 8:50 p.m. |
Message ID | <3e52c87875599106cd17.1469739007@x1c> |
Download | mbox | patch |
Permalink | /patch/16001/ |
State | Rejected |
Delegated to: | Yuya Nishihara |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 5F6EE2C467; Thu, 28 Jul 2016 16:51:20 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 67RVpEiER0ji; Thu, 28 Jul 2016 16:51:20 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id 0AB762C15D; Thu, 28 Jul 2016 16:51:20 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 66DDA2C161 for <mercurial-devel@mercurial-scm.org>; Thu, 28 Jul 2016 16:51:18 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id y3uUQ8HP7OIl for <mercurial-devel@mercurial-scm.org>; Thu, 28 Jul 2016 16:51:18 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by mercurial-scm.org (Postfix) with ESMTPS id F36412C14F for <mercurial-devel@mercurial-scm.org>; Thu, 28 Jul 2016 16:51:17 -0400 (EDT) Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.11/8.16.0.11) with SMTP id u6SKouId012011 for <mercurial-devel@mercurial-scm.org>; Thu, 28 Jul 2016 13:51:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=content-type : mime-version : content-transfer-encoding : subject : message-id : in-reply-to : references : date : from : to; s=facebook; bh=Hx+Comqypdxd55/NybuVH5Tm8TrGOqLlgcwWtXlSIwo=; b=WPHuBP1B0VXnM8a+PkMefaHIB87LsKUjfQh5TmV820VlIdSq273sztldKMif4e9JzAQ6 EfW1fGDFs40x+rHsGUYiiQVNVJfu93O9CuKeeiqlb02eZG5AO5sNwV0TgR0Y0EgGF8RM KqT2sSammCwXKJ/nR3E6xvIWprar91/QqEM= Received: from maileast.thefacebook.com ([199.201.65.23]) by m0089730.ppops.net with ESMTP id 24frfkgbr7-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Thu, 28 Jul 2016 13:51:16 -0700 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (192.168.183.28) by o365-in.thefacebook.com (192.168.177.32) with Microsoft SMTP Server (TLS) id 14.3.294.0; Thu, 28 Jul 2016 16:51:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=DxgoFXAYHkzXKBFIJZAGGwJok96apzUsvKD7zpYPtjc=; b=bG+gzLhzxB28q3Qh1JjQLtTNjhXz++sceAThMEubsQPvApoXm2n1SVvCG7fAhI7dHMF4KA1DAqodj4p/9FH0apX4DqxJjFMNcaBMWm3fg8Rzs91NyAUncMINmzQbQjzD6h9XMrh5V4eMTiB74tFM0in7PrLEpEKkl2kAwXqdago= Received: from [10.0.2.15] (199.201.66.3) by CO1PR15MB0983.namprd15.prod.outlook.com (10.166.30.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Thu, 28 Jul 2016 20:50:54 +0000 MIME-Version: 1.0 Subject: [PATCH 4 of 5 STABLE V2] worker: make waitforworkers reentrant X-Mercurial-Node: 3e52c87875599106cd17b264df93c903a3876dfb X-Mercurial-Series-Index: 4 X-Mercurial-Series-Total: 5 Message-ID: <3e52c87875599106cd17.1469739007@x1c> X-Mercurial-Series-Id: <391a26627ecf994c767c.1469739004@x1c> In-Reply-To: <391a26627ecf994c767c.1469739004@x1c> References: <391a26627ecf994c767c.1469739004@x1c> User-Agent: Mercurial-patchbomb/3.8.3+274-8bf84295e59b Date: Thu, 28 Jul 2016 21:50:07 +0100 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.3] X-ClientProxiedBy: YQBPR01CA0067.CANPRD01.PROD.OUTLOOK.COM (10.169.139.35) To CO1PR15MB0983.namprd15.prod.outlook.com (10.166.30.7) X-MS-Office365-Filtering-Correlation-Id: 8c103a21-c677-4680-7608-08d3b728de99 X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0983; 2:3zWZrqxCqXu2yfwiyB5Dvq1aMd+l5hzOzUcnbbl5ierbZGJPbhaKLgNaPMnGUxIX19tAstTaLYFs1b/BGMH9EH0ewVu6BjaoFi3mEtR3GD9pl2sFdHkt4gWKJzSjsGLeZVv7aQYwGzVjCrIi+jaB9mYcEtjKGbx7PpQPJZiO8GioLbgsMqRbyd1BleC6q34d; 3:pB6fg3mRma90W8IKCus626Wq8r8GVIsF75BCWNV3oivxO0k5ZaxNa6Yc9zfBANRCVKQnqCIa0zm3nwCg5hn7WYwKNl8s5YYdYBo+3NwXfoC7zHeFfYOJEQC6bifVMxmr; 25:yFvd2GAJG97oEPlo1SZ50A2N9AnRmLkxf/1Wyl3tQ22iTjybV3yLkoPJDKwdE5pawYYsRZ9dswPP6jEubxwIUKOMjiTbTVtzZyIZ2A+ml7cRZCwTJGrLwCaU9fovX27evPX6tWReYLWG72h33p8a9lO6+WhiU8p+396bJt/9+4gofXrLgYsYJtKnq8fny7fOAB8khKnsfoV9xR7hwLoSWT4SnP47SPhslUuQkJKcSTvG1M2iolQLh8fwgwIq2QkyTldy4NLIw0j69Rv45KLb5k4/Gv1clJ8G6JihEc4NFFyuZtQkNTD75soya7umBZDo6ZT/oaVhqQ73xZkX8Xm/Q8YfzrwG4BqeS9JXG6Oc4FwieJYID0qCLmbZ5fQY2IHxlPk8fSRZ1OXqXyqwZlqWx73PtsAhs1JDzT6ptCCKeQs= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CO1PR15MB0983; X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0983; 31:RqRW7OKuLUzk4hZDMDVrWFuDLRkUvmbhnW38ha3rKAwF1TupAbChf6zmT9+khyEaB+vPuu7yyoRfRf6VIFrjxjDdbcFAtFspc4sXJ4z1m/W20lYEb1pgj+EGFK/hKLpORqqslMhaMOvBGtDFIC5qVe3Y42RXUpfQN2huRFUsfsxtbeI1w+DNiU2yCPqSOcVeEcZCXuH88DkjPeAraNGJdLTj5zTVV6d/yaLtBfduQYc=; 20:sDsMhRHxq4PSAEbleCHpygm9lZBYLSGpHigFLaNghBuWBi2n63Cif8Ml/7Zz1i21QFkkCVnyTBBjmWHUUh2/a1qFQHsa/ikI2DL5qoTum8eeYRjkz+0atmxiAOfCkz8zgohaP253Ix6onL/0YnF+i+K6dGI633GrAk8ooXKZkAc=; 4:JGOf6p583F5NLmV10nQUOC1rBk8eXQg7VCdYXazlPfJJO7HZS4nV81epApsEHzTX89yDErMPkkukKR7XCezM/684z9Rj8ptp8U5nGYdmDjxQEwDpd8cSqHh7KedXJNUU8gPUoTzMGmhrDiVqvo13DZWMvei61xJXnpid6Hy/v43rdTJ5Xeh55/3mJDjc0uTrhxX6aK1bUZ7h/IT0rtVS4k/sfciuzLjZ2sUHOII2AlIuIAdiqqI84GC5i5/NH0A5LrAsBeNHF0l9z9X3+48ibtacUvlGRcaKZPEOqV0ecLaHtt6fXcuay/kfWemY3H0dYfQSQxNxh1Fy3lQQ89aDKz45Dn11nEiCMolp8aimoAEl0cujjV8H3/MKNa8kiMrFOJkWpqMvb5P1Vr+DEiz1DbvR6pTm1IZODr/F2r9f0a0M9AyVLYyVviHUtk+qLhhB X-Microsoft-Antispam-PRVS: <CO1PR15MB0983210E23FC3E7BC383EC82CD000@CO1PR15MB0983.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(63843785518722); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:CO1PR15MB0983; BCL:0; PCL:0; RULEID:; SRVR:CO1PR15MB0983; X-Forefront-PRVS: 00179089FD X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(189002)(199003)(110136002)(54356999)(76176999)(107886002)(586003)(7736002)(230700001)(50986999)(3846002)(6116002)(23726003)(305945005)(50466002)(450100001)(46406003)(2950100001)(4001350100001)(7846002)(2906002)(66066001)(8676002)(81166006)(33716001)(19580405001)(19580395003)(86362001)(68736007)(189998001)(106356001)(77096005)(97736004)(229853001)(15975445007)(42186005)(2351001)(105586002)(33646002)(9686002)(47776003)(101416001)(92566002)(97756001)(81156014)(83506001); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR15MB0983; H:[10.0.2.15]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO1PR15MB0983; 23:8GLtABL8uaYpMSc33VJ4X9klJadOoOCUnnNz22u87?= =?us-ascii?Q?JTyiuzO6ACQVWzMS7J2IIY9SPUgs/G/DqKDSHG/4U6NGfhEdLxA22JETJOdT?= =?us-ascii?Q?YUG7oKzDGr3dzrhRyYsPZ5NZ9hArx2krloqkIW7mA0w4y8qP3MJ6Uni5wmfp?= =?us-ascii?Q?JWBsIIDe9PfMfRCrSDX+EE3yPNPeXQs+A4IN7rDnn1odhE4GAHDb5iq0EgDO?= =?us-ascii?Q?LKT+aT3RqaWGrhV0WroYSFQ3KFhFYjaUJplpXN/weYp7M7BAsjvnnDD4P541?= =?us-ascii?Q?pzmiU4xwTQXF4e+7x4DggqCGmhLTCbpHCum/N9mMy6o0hRFitLJDzUs30ce+?= =?us-ascii?Q?M2AYZPMCKw5MyqX4pAaToGNvRPkj+q8i9yqIT4Z3VWqYhq3O7wTRv/a5WRgc?= =?us-ascii?Q?AuErhoyIFoaD5YgArJcrIkICeAiz9XmTUmMLbtjdqvjR1sFcBznC4btnIqWg?= =?us-ascii?Q?2AcOEpplqqEUbVUzgSxnCOe5eA39TMFf8Wr27QWUloE0jTltbm6ItkQwmglV?= =?us-ascii?Q?khtggRcJC+lGflxWIj9vq4j4ZPcP6KRf774NlqM19KDnh0xx4+6hUthLOMMT?= =?us-ascii?Q?1x9UmVgcretrN8YQyclyXY1mTRJJw9BqopCdWxpLleSdKPnezZLx5L8NJvV7?= =?us-ascii?Q?sbe/9U7PDnTC33Cb0FDhS9QVbU2RzYCsMfkX2Xk7GydY0M8u8oH1SCSpVhbI?= =?us-ascii?Q?jb3eT+efWHfSWipZmxWKFrMeOrxsXzMJ8Gd1XYc0kBPQ/plDlknOjjtBi8nE?= =?us-ascii?Q?CpXX7LWGkBUdGPsHnzPVgU7Esr6OLheT6FjDuiBG5HOL44F9Db0n2hgIMaGf?= =?us-ascii?Q?Qs5zc24SrMVDDIOkTalsaPJEkXzLL55aVdiu2JMr5Oue5BSh8Qt310cijzBa?= =?us-ascii?Q?IY7Ekm9Cd1iWg55puOmulNakv2sOVSE2dmJNF6k10/c11iYEXQ3Vs5nsR3Ey?= =?us-ascii?Q?5W3Beenv3/M+HbOey8UjYhMzxMwK2Yozx6ldY6VebYzSCa914Xh8Xk3EvyGN?= =?us-ascii?Q?DxC4UDA2M+47Ms6Revu+SKuN4BGY1HoyhbNnHtkDZdzSm+kz3Qj2DRAL9caF?= =?us-ascii?Q?MaZvxueUzU93DIUXu3VPcrlh8OVCTK7chrqUMSDD10wq/Z6qnRHMtgx4LsoE?= =?us-ascii?Q?YZL0l3+tuo3kOT35zCO/IsQ3k3fky9w8WDSOZRY+To2vFrW5BL/UE6adQHm8?= =?us-ascii?Q?8MY2dZpH0b/WuICJ1bUltDPtRyIxFtkCAK9ZOksCBTUUBl77rGLg2yhW+y/a?= =?us-ascii?Q?I3mX9De/B4QoK4+QY0=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0983; 6:fpgPjGO1fiZd344cPvBUBj1Qu0JLuuAoQ61Wk12qH0ZqKBmhkxxQEmC154Km8giAwlswXHIOwOqZ4Koef440P895SmI7xqaVynQEyYbHBUlg6sgHY4VEQEiQR8RKRUq9amGJ6yCXwoNdaIURGkgOHh8v9kkU0brV8AA1c4ER2mF6RoTGBTtXICVgknCmgt+fK+44U+VHrxZlS39A73KPgSqxAIz4El+iQP2r0lXBXWC1YHlBNCr5SS6o/BOTVHh9mw9yLaWyd8gjAGl4aowj8QhKW8Ja63JTBn6Ktnn2f5c=; 5:SI4CPpqJBvO32qHFlArvWWBteQssmJZYh/JAYoW3zKCVFQQtgrnvVjvMZ3zKfFkFGNgyqahHQocqxElfpMMIYby1aDq7BIFCZ7F4lc1Hpf9FCwZZw4ak2htEwGx9OWPCuLnZbvFeTIBiFlCWITFxvA==; 24:vuvYHVdLwQDN1LMl3UFljnixx8TbFKumQjGj899UUV7FVbOheJDrCb0WW3NSJyHuwDgbs355Ay+rDPSIye9tBWcWQlsKNrbnd8oNRmxnlRQ=; 7:MTKHoeSymPHQJCzTVe3iXcQyhXkJj0+xjtfWECSYlKI5QiHJDlrHJCJ4+mlM8lvuojXi52MCCbl2dn44vYPa9CDgBvkk0juxhb9Yr/roQmZ1c5OAbTUh8M4Uf78oLXCmBb1+X6l4jEEjVMA2dRG/tjgWJAvplC9MgFT/d7sdXAj1kZRNpDSKA0suddvn0tsrmPaO2UdLtoxk422EyCUHso9zKvTOjTG6Q5aGGj03EUiKlS+tciWLzt0dlxdAPfWX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO1PR15MB0983; 20:Lm0sMUFOeRLpO/saAMYRU1Fn3mvebgEXai/O6ih26F34p5biWYLHllBymeXiDcACNfgMrqKTXc3eborFpb6mQotZGcHPjcfXkEbE59SZv6vQ4DFBqX/3xP4uF3p6NkQchyUk5w3LQ0uDCXUHopkexgZYQ5AzXf3c4zgZLjbksfI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jul 2016 20:50:54.4170 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB0983 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-28_12:, , signatures=0 X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Jun Wu - July 28, 2016, 8:50 p.m.
Patch
diff --git a/mercurial/worker.py b/mercurial/worker.py --- a/mercurial/worker.py +++ b/mercurial/worker.py @@ -96,7 +96,15 @@ def _posixworker(ui, func, staticargs, a raise def waitforworkers(blocking=True): for pid in pids: - p, st = os.waitpid(pid, 0 if blocking else os.WNOHANG) + p = st = 0 + while True: + try: + p, st = os.waitpid(pid, 0 if blocking else os.WNOHANG) + except OSError as e: + if e.errno == errno.EINTR: + continue + # otherwise it's ECHILD and is ignored + break if p: st = _exitstatus(s) if st and not problem[0]: