Submitter | Jun Wu |
---|---|
Date | Aug. 4, 2016, 6:29 p.m. |
Message ID | <521d7fac970d711766e6.1470335344@x1c> |
Download | mbox | patch |
Permalink | /patch/16100/ |
State | Changes Requested |
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 393822C479; Thu, 4 Aug 2016 14:31:16 -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 0nNFOPC0rZ49; Thu, 4 Aug 2016 14:31:15 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id AAE102C491; Thu, 4 Aug 2016 14:31:08 -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 BA4792C475 for <mercurial-devel@mercurial-scm.org>; Thu, 4 Aug 2016 14:31:05 -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 5y6bcNwTR8B6 for <mercurial-devel@mercurial-scm.org>; Thu, 4 Aug 2016 14:31:05 -0400 (EDT) Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by mercurial-scm.org (Postfix) with ESMTPS id 4E7702C46F for <mercurial-devel@mercurial-scm.org>; Thu, 4 Aug 2016 14:31:04 -0400 (EDT) Received: from pps.filterd (m0044012.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u74IRAj6008340 for <mercurial-devel@mercurial-scm.org>; Thu, 4 Aug 2016 11:31:04 -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=eh2elGRhgqTVRfjoqApyBURPVmFBp8Tf4rThq1Yzqpg=; b=bgXvikZw2lGkLn3X4g8eTuyTDs2u6lOSn3k3aqvHpeu0D8riKlqEmGB/RiplsptnJDr2 QenKezhtmpDrS+o0NLdAS66e6ImOCATGv/w9Xvi60Er7yYe+nTRJGILV5i1t58jbpmC+ iVajdthM3K5vsFZ0rPaadRf1Qcsi+03gH4c= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 24magjg6xd-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for <mercurial-devel@mercurial-scm.org>; Thu, 04 Aug 2016 11:31:04 -0700 Received: from NAM03-BY2-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, 4 Aug 2016 14:31:02 -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=6RE3j1px1TW90QzS67j3K9kRvD/cyZCZaWWb89HcxaM=; b=HecOUj7W2YC7prSb6yQU3jI2Jv/YT0LM+AYgvZ0WPweS1cSxujfauSDwelJ7244uKGI5+1ZvvICaVv26fzza+awlZ62lVd/juOI/TKaYXG0XQi+ngFpZhKvbcErcs8HfDr0ALivS2GtHHo0+TotMouCZ4T+ode74JjaB0QJQU7k= Received: from [10.0.2.15] (199.201.66.3) by DM3PR15MB0988.namprd15.prod.outlook.com (10.166.160.8) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.549.15; Thu, 4 Aug 2016 18:30:55 +0000 MIME-Version: 1.0 Subject: [PATCH 3 of 7 V3] worker: allow waitforworkers to be non-blocking X-Mercurial-Node: 521d7fac970d711766e61b7b54d20ddefc4be406 X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 7 Message-ID: <521d7fac970d711766e6.1470335344@x1c> X-Mercurial-Series-Id: <f6d3fb7e8a53968a5be7.1470335342@x1c> In-Reply-To: <f6d3fb7e8a53968a5be7.1470335342@x1c> References: <f6d3fb7e8a53968a5be7.1470335342@x1c> User-Agent: Mercurial-patchbomb/3.8.3+274-8bf84295e59b Date: Thu, 4 Aug 2016 19:29:04 +0100 From: Jun Wu <quark@fb.com> To: <mercurial-devel@mercurial-scm.org> X-Originating-IP: [199.201.66.3] X-ClientProxiedBy: SN1PR05CA0008.namprd05.prod.outlook.com (10.163.68.146) To DM3PR15MB0988.namprd15.prod.outlook.com (10.166.160.8) X-MS-Office365-Filtering-Correlation-Id: f9b87f77-2f48-49a0-b8cb-08d3bc95793d X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0988; 2:6CsudAaC6Tbc2ScJ7lgWBCfEa5RmBkKa0leQ1Vl7tgIrypxjbgA0dTEBKsYZ3+HUQoJSb0rdFe6xcao6o5ZR2QCHHuJbb3KG1iOQPBJnjPim+20fnCK0y14exgmxAf/CNC25IwgtLdJyDrtcHZmhwR+hWX3lAOd4v7FbF5/P5u0R75SjEjtwv+51a7IZdjvo; 3:K2APbt5FSqKaxXYXfWzsGgrTjlqjRyMWOfXAWlEEBzccGdjLUD1rhY95YXhwKYhhr+fV5Mq0aaaWED5YeJZkKUHrqGJqwzNSu/eVj3V7Y6bNaE4m6FQX9lPQ9lJ7PLkY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM3PR15MB0988; X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0988; 25:PPnsayT2JCk0kartFoXOdIeV27cmp14nNG131BzKIvLolkxpH4P+REq/SW9A4und/y3MiYrNZxJ/7EGRR3l2w38umJ77lEC/0uy+3JN9JQcJcDBPP9AH3SBC0JBabFLTQ1FDAPL2k6rtU/Wqh0W0eKWPZPM7dtRA7mbOlOud1yTvukkdR4O1jAL4GMo24HlRJvdO7PvYSuTyN12f8BOdNOhSF0XBD8h56Bzy7AL23dZpf8JJrfDg9zipWCtkfWp/eemX/xRshIWp50SeOX8z9YhUVkwo6tODHSn3ZIt2KBH0vQ9ult04RuxQkFmdhRkdPkUFK2vBIq9D3TMEks2/I6tQ5DZ2ACWi9bF/xbL/4Mbfux4CoABCu3cZbuOB0IdX6FgpzkoEnPMD5SvKMD1SK6UA7eoXuExNSuhsKY/ZoD1FOymFLsvPUmeUi5XFH5jWeaDhMWzcz6+FtiiVVhsVvH4xoymUyVs9ZSSYIU57o07y1lpHd03rYqvB0ZmnumI7xLMbKauYvYkCpBFXXZOSaQ6mJeYnNVy2t2OZbkW9spAfRlj+MyP+VfKH85ntvTMFI24MP83SHbiq1V2dzqgbc8Gv2bUYys/QWsxOHOXvpcmDtRoY2N81JH4ThFKLzerGeVPYFM0UBSboIl1FKdXhRAqT8HhxEwior+ffUBP8kfwsiuk6RGqEizJHTXHD8Z+T3QCRYbLhPw4xgwablocJZQgjMh1mq8ZdI/GdXIWuuPuiunqmcgm1/vvUTDkxcb7JT/l4+IYGLix0KiJjlSs6OA7KPiDPWXSUZJ/96iIoF7OfjoGCFwb9sApeR2JAWRE+ X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0988; 31:DHXOZHsw0ICcGBiLH0JJ4MbPbkkl6pfiOVMUNGw1qgpu8TeOVrOYdGbWmYQO5gi0S1Ii7Xzf1Vd3hmlkQHw4/xlNygUZowxp52/mjq1Figz91NT4dSrh2hlvMOMzY6WRcviEE6aOy8qyQqHk02zzLtCoj9K01cmY0k9G3Puei7UmVodjB9bFjkJJyAM5opgKKX+QyadonaNeWNPCHM2quVXxV0V1xX/KG7CIAdDwYZo=; 20:LUtZiSh2ZKzJmck7NH5/waFbWmV/8ZsdROhdRLfyhDInVm85k73ikZjSPEw9+a7RHlY5FyhDodsjIDP4qfREkt53FUgp+jZJkGEe3qbrdhunNLsnJdYErI3AVBfvyyl/hjaOeppXrrJBjUtI8r9T8oCI+NVxjRS7RzKoYmTigek=; 4:NVGOVZrVMxYWu9LdIXkfPxJyIMqpNr3fLwh0SGk75HKKzbPqNyh5GpPkY2R0x4ZsP+yRwVOiAo3YhilGbVMLgJ6sicQDqriFhni/Yc5V2xlC2JAulGSeTAVI2rQjBpSpd17YCCCc5UzoJyYdEyratJ4iyV2bnRRaFJoDnX5IJaOzdgxwrH8yrMNV2mMPQ1jeYyivmSWL0GPtnt/IW8iHY6shrhJW9gWx5msB3lCLey1aPAaN5Or4aVAEGCidQ/3RmgWpMzue/Jr/5QIekf9M45lfLapYH/l0Z1RmN/ybhnbdRDT7bCfa4Xr+3g+KX9ueO8XyJsjWGATkXM3UclzpuvrbN2WPmPaR92DnwTwDayb8RjY1xa1cKbumXgsu3Mej//KRQ/a4Of7BI5Gz9QWBBcZ5rGZTs5fDav0zZ4KqklYA5j/QPOYTjLloF5CEduLPcONGp2ENeu4yocfOj5U0qg== X-Microsoft-Antispam-PRVS: <DM3PR15MB09884B6E89DDAC0CD9E4E768CD070@DM3PR15MB0988.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)(10201501046)(3002001); SRVR:DM3PR15MB0988; BCL:0; PCL:0; RULEID:; SRVR:DM3PR15MB0988; X-Forefront-PRVS: 00246AB517 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(97756001)(19580395003)(46406003)(50466002)(9686002)(8676002)(81166006)(81156014)(230700001)(42186005)(86362001)(586003)(92566002)(33716001)(105586002)(23726003)(6116002)(3846002)(77096005)(54356999)(110136002)(76176999)(15975445007)(50986999)(47776003)(450100001)(97736004)(229853001)(189998001)(83506001)(2351001)(4001350100001)(7736002)(107886002)(2950100001)(2906002)(7846002)(101416001)(66066001)(106356001)(19580405001)(305945005)(68736007)(33646002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM3PR15MB0988; 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; DM3PR15MB0988; 23:wpuaWnlYNL2w1gXL/5JxYuEUUefrC2QMze7laxAjw?= =?us-ascii?Q?oMiRLT7lrHN3eIxx8+oh+VXVGF9PbmpQLkDQGBuzg+mMK1KB3GhborWVHEtO?= =?us-ascii?Q?2D5IN7w3j1/QZYbe6siaXBOYj8sTqOViNsI788lc5Cxb+SOn6McwnA/PDIZX?= =?us-ascii?Q?YR7seA0P4wNtw+4a0LT93GispxET8wAYlBFQ5AuzH1as3FDpjKvVeyU8afdS?= =?us-ascii?Q?UCnkOMkn/OnZMvUf1dhqXe/f53WHmcNrci7je8DRvgJvK3r+LPvPrqCF7W/G?= =?us-ascii?Q?898bj+u3onbrTK6q7oYzaPGY45VVrDXHwaC7usUFdRy1ukKDFUIWc31UQ/+Y?= =?us-ascii?Q?kkWNjSmBZ7X+M5tEElDqAShQwP0SVA23YeQUTGyrmjf1IEvC2Q5wseVTpKU5?= =?us-ascii?Q?6mJcbt2L56K304HajVEkKm6i4zWrQPAhVOlppWbcoiS4RGmUHwKqFzup2y4V?= =?us-ascii?Q?tsY968OxXn7QAF+24htaKSsk02ESUYitpQTE/q6E3GxYNml0DPXUCir/pRMH?= =?us-ascii?Q?SvgD49jYgpi+eIPD7vsfv2rmxPsRPVc8FJYAOCK71sSfmHf1XEzuxbaGdCJI?= =?us-ascii?Q?uLpOWYFwXFw5To1ZaQ3lUOGkZbc09WkLUWiKOnfozCn0sg0KgmKMrTy+05+t?= =?us-ascii?Q?eAQkYc3aaffwdjguIUL4vkf6Y/XDmbBbp+bBpGlnzRrlMowdQ39LLNXjItP/?= =?us-ascii?Q?K2ohCztCHGH4c4KVOYFOfyU9AC0i55rRznYOQfckmNh1RH9Uel743dYmt961?= =?us-ascii?Q?MDZIYQZPKhWbukcH7w3JTF+NThDsO1GIogbwbfpNgB9RsxYxr87Mj65dFZ0m?= =?us-ascii?Q?iQ6J1bwOuAMjXcGIjE0rs/knKqaHDM2CuFX8/6iyYrAjWvsPyBC3pf78gAN5?= =?us-ascii?Q?3m08VbFkH5LQ7fdMEbYU42550kAiyNTNn/hh0i+KwvpdVqU/e6kJh9mk7/Pz?= =?us-ascii?Q?o6x6QUPArxLiKy6mvgy78OaDw+9u6bLJrD/aVQdXlk0zF6rojgeMbQgcMdA/?= =?us-ascii?Q?PNiclDU0SjhRwRhoEkfSz6TAY3If7wGlhnDM/ZZL7BOQpaqYECkr36MbftNQ?= =?us-ascii?Q?6/CVesyl4kiZTdySi7779qYE4fJ0vemBXLZICOpt1lX9Qf1dTNZ36cwwlzz2?= =?us-ascii?Q?70nH2eMRmxb186jCvBa0YwqIGG3/T+w55MCA4jxp+YYj0T/T/NGDH51x8mcB?= =?us-ascii?Q?9ZLC+vfe6wYDIWpN/XdkNr/yu1/MVCLrcI0cKsxlnST0OAeQw7yH/+neHa7z?= =?us-ascii?Q?DfQHpB8MPE0yUakoOw=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0988; 6:16eib040wIB7gbbVYEfGVpyAL1g8CApPSXTyzHR+x1yEiCsnhccjVk4QtpM0nn/wVTLeTDyBSMb3S56koUqfhCMQhhFNu7AhJmvLKQRO+SDeZQA0fBnNHh3BQqKroTd0DxQKfZ/CPjlf2/v8OeW6fMFcEqJnYHGKnKRZvPzFINVDzAJraJtECIWqN30Wvz2v8qmtEATt5z8c/Z5tqfBHkrAPU8Vfx+tpEkgZV4/4Y2i+53HCvVDwxmojiRM2+JRKwmQbhmrGDCgvcJAPLrftU9Fmk9GEeYOmB7bCllhbSrM=; 5:s9OcG3a1ed28SKdOTkQb9Jux0oLhO9MywFB8d1PbyQ4gPHO7pm6nxxltPTkcBtAn+PxWoXsHKQ1qMgzLRDnynwnbzUNx+7TKMffXIEtymQc9YvwE24UE7X7ugLILP+qjDA3O+PYsNVvJQWKQk4t27w==; 24:MclEpiGpGLChOy/xqMgNCd6Xa2y6UGcBheXNDPjpkwawNmExZw64odtb1j/RYOxEXy9ZWN6RaSixMY9KmkZ8sHILnDDJy49YL3Wr15dfMyk=; 7:jeI9t6G8Y0noOSk9XJjxJvkzPOKnWeQkakGrb4jJgL4UxO6PKJFEHgyWneSMnGGjUPrDemg+v7il0mzFM90evWiIdYa3OOG2bIy2BdRPAdVRdEjISkj/PHWzZxB6EOAYydOZUlEN/GUyBJjdouLHb0fM79Q0yvmDUSlIsE4xiLkhZfpVz4OQSMpflT3fL1YxjkREaaVLqiv8UOoj6OIjcOyukVb20WuBG+WDPldYsz0tZZaAlA3sPkwlyyPtWwUx SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB0988; 20:aCTC1zjc7sWU8kNcDDSZIK6zwhC10PhojPKhmC3n6srIql5ZfV5oeudccOcNqoSNFWf+oxZrHmcVfvUyLvBgitY1+KXBNzlj+3/3RKjX7VgkoYXTb7U35acQEmHY5KYHYHDk9Mkn76KbH6iAtnWoOr/xQtCDtYZ/JYoIOwulvzE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2016 18:30:55.4434 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR15MB0988 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-08-04_10:, , 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 - Aug. 4, 2016, 6:29 p.m.
Patch
diff --git a/mercurial/worker.py b/mercurial/worker.py --- a/mercurial/worker.py +++ b/mercurial/worker.py @@ -94,9 +94,11 @@ def _posixworker(ui, func, staticargs, a except OSError as err: if err.errno != errno.ESRCH: raise - def waitforworkers(): + def waitforworkers(blocking=True): for pid in pids: - st = _exitstatus(os.waitpid(pid, 0)[1]) + p, st = os.waitpid(pid, 0 if blocking else os.WNOHANG) + if p: + st = _exitstatus(st) if st and not problem[0]: problem[0] = st killworkers()