From patchwork Mon Nov 20 16:34:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24381 Received: (qmail 104280 invoked by alias); 20 Nov 2017 16:35:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 104236 invoked by uid 89); 20 Nov 2017 16:35:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: sesbmg23.ericsson.net Received: from sesbmg23.ericsson.net (HELO sesbmg23.ericsson.net) (193.180.251.37) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 16:35:25 +0000 Received: from ESESSHC013.ericsson.se (Unknown_Domain [153.88.183.57]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id E8.0F.08439.844031A5; Mon, 20 Nov 2017 17:35:20 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.57) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 20 Nov 2017 17:35:20 +0100 Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AMSPR07MB310.eurprd07.prod.outlook.com (2a01:111:e400:802f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.2; Mon, 20 Nov 2017 16:35:16 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 12/19] Remove usage of find_inferior in linux_stabilize_threads Date: Mon, 20 Nov 2017 11:34:36 -0500 Message-ID: <1511195683-2055-13-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1511195683-2055-1-git-send-email-simon.marchi@ericsson.com> References: <1511195683-2055-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: CY4PR03CA0075.namprd03.prod.outlook.com (2603:10b6:910:4d::16) To AMSPR07MB310.eurprd07.prod.outlook.com (2a01:111:e400:802f::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ed71d732-9a4c-4906-a3b2-08d53034af03 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AMSPR07MB310; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB310; 3:s0U6B25XVqcrsO+IeVnpDTGt3QQa8PC42n2OetPEAI7g2VgPqWdWBRJbamFDmaAMqQSlDhLyvNXUh8BnlqKm0Umqt9FCB4xAbJVQUeNBNGUB6hRZeWBNX5BdRYTjkvbh6vTLlkjl5zd6JT5lrZGs2i6DmaVSBs+7tpvwj2ZWa62u78BPj0NxO+ilCX7lJuatzcrCKzTh2puLDAH8x+wHt02jEgKuzIBHYbPwWhDLKS5ini2HgHn+uKNzMTEwL+3K; 25:KkeCxvwFcmgYtwtCDWfpmvRYk1NHGjsLbCEg32wSE1TMuwF4/RV3TlcqYGYHeV03lruqnM4gEJsLwprWfhFBm6I18V6HOhRcaFGbiW6RkjDlcCyHaPYObNC5NMAhakaqSE7Z/W3NVJ6dxbckX6zZcIQabUtH85z1GgY5FtBjlkzQH+SWiuWMonsZNGO2piSGiyjLkYiE8wsERNIhruFYxwTEan13AftzCW8UfVXXDpV7ilGbCgz3Juu1SuocoK9pSwq3n3LTdDBmYoAkzmlHJ06mdKRITsugK1VbRdfG2Im3AgvfmV1FZbQMajY4jF5MywJwmFPK+TlQ8vDUTpK9qk3lGHYEd1tmkNxqpNdhZQY=; 31:eVTUspyTlAuCdtvHKm22Cqcj/m7oTuAPil8UkUmq5lSNtW9QNU1JFDcb7ymtAxJG+HGUWoEawpj+zGcXXXaxIRfhAv4MR/cpVvDRjDMem6BlRfH3Y71zLyPeUUmkDiTSmJiKyohkVBlCWoD63x4DD0rMpIksV4JjpCxCljnt+ffpbo5+nhU8I7MSnO7FbpxP8ipdZQHvXgQJnlw/Ut3FamUQbeAyAweQX3Mh0/FwJjc= X-MS-TrafficTypeDiagnostic: AMSPR07MB310: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB310; 20:MwoytjjrSF0pMves7uAGl2Hf7DWCyBhHxqxwSRTD1RV6SPI+8f7+3gB9wg6EhqLcuvkyaEiDwhfPfPOzH7TqBDFjc5UQ4dpr1FK5RkS+jGrrL3mlcmXFdqLu/y7sSV6pTDgAbILixuj5yHD5O6Gp0gcYNZ/geKesIWZdUJGKKQ4bRDU4V/wen2LKbNeHkVaNvW/nfAYv3s+gqblRzQLPl9TnNf/gbuOGW0XzdU3eU1sCgdCHYofASUtaafI2iHrHnGtkUfxGLT1sIAQ0nfZgDF7wrW5C7t0nlmKvmEu1tG1acA/WTFFQRPp9hIZTgkERxvoaldSXmGLt/w63/JeHZ4OXHXOWBDdw5ui4EWMxH8beQ335jAEbG+1zAUxSHY0opdjymKLOiPm4aKk3QCmwYAFZYiZd9y95cR9nw2yNRnV+g0fK2tilB48BipPnihJ7tYjieyxSChgtOEN/ywa5W9aIPMnGKnnn/Hi7HvkhOAIIeUX7u5Rj/xJTf7/RUTqj; 4:AgCTyh2mrtaRZ6fHTwbbs2oLIgGiJGJX4ZishlzT/Ls1TL4CW+Dw0W55vBzZ2SLUWAgtIh/YJRShEHUYCCpw47Hl0+7PKdM6FJhCyKmMA/btyntOdgGN6QCLDuE9sPC4eXj3/k1zQ7OATuFvBhKZW4E9HmXINKZgsLGnGs4UuXhkBGGu4nIibKq24Otgd1cTJJJRyU63SYOV1YKYlQ7xqB+aRiafNVZ08v6mZ4kCOhtgtYs4MjEpKJnV2eBn6DQpSvexDbz7ievdqYgpUObVuGN24uQbMlZoBh9Cr5v4VSiBUmQBZq/ta85RgpvXyi/i X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(3231022)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123560025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AMSPR07MB310; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AMSPR07MB310; X-Forefront-PRVS: 04976078F0 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(39860400002)(199003)(189002)(54534003)(3846002)(97736004)(66066001)(5003940100001)(33646002)(16526018)(50986999)(76176999)(6666003)(81156014)(305945005)(7736002)(81166006)(6512007)(5660300001)(316002)(6506006)(6486002)(16586007)(6916009)(2950100002)(101416001)(8676002)(2351001)(2906002)(105586002)(36756003)(47776003)(86362001)(50466002)(48376002)(50226002)(8936002)(106356001)(68736007)(2361001)(53936002)(478600001)(25786009)(6116002)(4326008)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:AMSPR07MB310; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AMSPR07MB310; 23:/0C3mPshmLbV+CtP8o4cJCrirPGVaPU37lBQKQYiG2?= =?us-ascii?Q?vdkI/exJGyCx+eX5ghJ+If395Ii/hzlfkEchvlMaSkX96a8/+oinibEGy9zZ?= =?us-ascii?Q?R5/V0GLAmuh0mn0tmdIuZL7ITSZm1VSiXFT50n0BSZXR3r1zAdyHeZK6cdKk?= =?us-ascii?Q?AqbYS9R7UyTjjmKhmWq5YB/j8VSpF93Md9BmP790GsVUEzYKTgVfDKowpyjQ?= =?us-ascii?Q?DxhzvdrtxVsz+90XKy9A21RQqYXG9Fw2IFVGCIj7ZNKNZSkOet3O8ykZmVyR?= =?us-ascii?Q?gB/GUkq0nQHzUQ3LZj7O6PDNsgLazIrnxCH6ULDN7K3+gASEEkq5j6/F6olT?= =?us-ascii?Q?690eeTd4KwwppLKbeRhgLLotMrplOfwXYS4TTHiTuY9BsKZNJdyWH+wA/yAA?= =?us-ascii?Q?Ie0p+prcVbDzMCyRpkUQ2v8gT3/F0RW03/lejqVnhet7lgrffrmIV1TgZrEc?= =?us-ascii?Q?0jPIfztJH4Y11fWbNA8+R+ZXwPc3dMdGKnSzHIMkKzfbf5KkcadYxfSAzA2a?= =?us-ascii?Q?MyWIr3ZWL3o3w6X3Z3WcrJoHd5MbpepB3XNNNVAaov49+cn73YgBiXffJQjr?= =?us-ascii?Q?SgFg536/jtpeFnY5F+AVMqgL4ju04QzAuBm+FZ28vYf1EWIxee9AYClh+KZx?= =?us-ascii?Q?MwLJbCKr7JRIwUGMXjTQ5eGwLrnSoXI5OVo71L3UY0+c8fWaVGeyZ42D8v2V?= =?us-ascii?Q?n/uzydn+/ZxkfxMlp/gAGd6U0U32ceJC01dAdr/eehL0QRNa8RP3raEMIpc7?= =?us-ascii?Q?d6wL1kysg9skBDs8sCzPt6HmiJ8aIkDynpukll33ZcHvWNcrKgtd24ZxEhdn?= =?us-ascii?Q?qG77BVYC4H+JL2K8EC7KZkIM9gn16pBBrga58kPfD7J/4p020hG6+F1JJe8R?= =?us-ascii?Q?5L7BrnE+YY6TA7Hpswg6AepoMP7LdksHqy8NHcQHqLpJFoyDf4ht7zu/hBVn?= =?us-ascii?Q?lyyHEeTVzlnUegygf1TtuTh74ivLi4rZ10GPCcWpiAccyRGTf0yyd1KD5j6V?= =?us-ascii?Q?+9r+8GQsduMN4hkTBze+9lRZFUA0ySiOcoA1wDXJiPECj92JOkC6I/JknIAE?= =?us-ascii?Q?abi4kNBdV6jCeZwQxbhuFHELvLSES3Pq9rOfxJHSWl3vflihQYDnVrX4M8V5?= =?us-ascii?Q?HezVqacEVg35va4myJNUg3Kph93P0B?= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB310; 6:DkjgVjNxoaGD77Yhz+rS5yTytBoZITsaqkWbXfSDeCW4JLAJfaUO2ua8sYuR0jPIY46JmFyj4k4Hqaygypz4BSHZhSbwbOIGJ8FWceaW/2OHiHNL9C9hL3tD6Ux1jjzIEa6wPxB0s1ikJOQp2pPiJ4iyvn6skTMG5hPhj1Su8Q0z9G59icIrhYhz/ZatsBRJogNiHRdi8ih5Rv1zKvVdV1QaQmnYJJ0Y25GGjPWldlu3PvWee5HQSiXP4jknM4gTh3SpTk6b506V7yjZn0hSweGri7DV0z4fdAa6XlXXE04qemxb587dveiiTFwcav6WWL/nMeAOpQYSIggaR2z8ncxB6uXW4Ea3w5L89Mjfthk=; 5:ryI+8VYLv+1cKuaUSDpMVai92EC36FVUYo02wc/zo+T4jzShiWHitgm/rJBIBDUBaNmQVXt1TBVl8lIXP5VvToviCkNmPCNJ08uQZHcX6o7bAsPLs4XUPvBlE/1Re/oGoc4P2dTpvvjvyDUCGwphkcHN391jrEShY8UvVBFz3Zk=; 24:1W89px4MrMXhgz/coM/sRGoRUuSq47tSzcSM2o9szFraifg079zCjLUVF+NHtnCUuQLyGgEr6Hi1DgFKZgDLvSB+2koWjCdr/1lckHrL/M4=; 7:zj9ByT8E9KHM2ZkW2iXSYnY3v9VaH4HDox0AR6Ox68NAskDYLV6FdgVZxq3unE+HHzXEyqgcQJnrC9zy4bQmh+44sfhnT8ncqHd5CTFdTR16Nt3athzPk+XAnFNEbVVQzhg22eIjKiXGNtbbIlKbtnTA9K2euqzl89LXMiB+89p44wzJmGk0u8h92gbgwttGTaW/9RQS6wg0/0HnLp+FrlgdfWPonEmyiCnIX7k5q4XsfcplZ/x4ZAaRe22en587 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:35:16.7508 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed71d732-9a4c-4906-a3b2-08d53034af03 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB310 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi Replace with find_thread. gdb/gdbserver/ChangeLog: * linux-low.c (lwp_running): Return bool, remove unused argument. (linux_stabilize_threads): Use find_thread. --- gdb/gdbserver/linux-low.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index bffbc53..63a187e 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -2918,7 +2918,7 @@ unsuspend_all_lwps (struct lwp_info *except) static void move_out_of_jump_pad_callback (thread_info *thread); static bool stuck_in_jump_pad_callback (thread_info *thread); -static int lwp_running (thread_info *thread, void *data); +static bool lwp_running (thread_info *thread); static ptid_t linux_wait_1 (ptid_t ptid, struct target_waitstatus *ourstatus, int target_options); @@ -2974,7 +2974,7 @@ linux_stabilize_threads (void) for_each_inferior (&all_threads, move_out_of_jump_pad_callback); /* Loop until all are stopped out of the jump pads. */ - while (find_inferior (&all_threads, lwp_running, NULL) != NULL) + while (find_thread (lwp_running) != NULL) { struct target_waitstatus ourstatus; struct lwp_info *lwp; @@ -4120,16 +4120,15 @@ move_out_of_jump_pad_callback (thread_info *thread) current_thread = saved_thread; } -static int -lwp_running (thread_info *thread, void *data) +static bool +lwp_running (thread_info *thread) { struct lwp_info *lwp = get_thread_lwp (thread); if (lwp_is_marked_dead (lwp)) - return 0; - if (lwp->stopped) - return 0; - return 1; + return false; + + return !lwp->stopped; } /* Stop all lwps that aren't stopped yet, except EXCEPT, if not NULL.