From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 102590 invoked by alias); 20 Nov 2017 16:35:17 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 102547 invoked by uid 89); 20 Nov 2017 16:35:17 -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=irw 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:15 +0000 Received: from ESESSHC016.ericsson.se (Unknown_Domain [153.88.183.66]) by sesbmg23.ericsson.net (Symantec Mail Security) with SMTP id DA.FE.08439.B34031A5; Mon, 20 Nov 2017 17:35:07 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.66) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 20 Nov 2017 17:35:06 +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:05 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 03/19] Remove usages of find_inferior in linux-mips-low.c Date: Mon, 20 Nov 2017 16:35:00 -0000 Message-ID: <1511195683-2055-4-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 Content-Type: text/plain 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: c1e9c093-9678-4f34-551b-08d53034a83e 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:D2Ayds0dD4Lp8zn24vO/arW3gtNloUaYyHJ7qdoEeZ9o3Hts5922tA1j4rRx6OibC77cQq3ROW6KWAY+oB4yggPKpvu9ry3N3pSY78dyoU1DCPJYXNpG4nXj6TFQq/gURDYhawZiI8/3PGQY38HoAblDezJN+yAx1hnao+qoZeYb2jz+sDvmY6xEJVJYbVEfjrW6fipG5dygLJO/IyTwrZOH+JMQbzLkxh8uuYHmJ/0iDF4mZtTVunu6UtvRosQw;25:azzug31hH03ec+W0PAG1agUQLS797xGeJ9WK7q1R698OMjrOfiHK7Txwu7/osUqn6iUIoJjil7xUlWqyGuDuybjjYeJkrstnXmkt6mqhhxR6ISVuDbTOM2AKzAvXohk7c+BcWp/iHBEyf5iSIURfNaasJaIGhg6EIfnuSbdq/DD8rt/Z7lDhyFWqZXuBCYrZP777BiP7lhQ/D5peDUdsnUTrPpSFd94CXo8837zvIUbLEBcL1CT+GCFVd2OyT49qwTSa7alutVqoCnbQbG/mKYjcwkknyPpu52IPXijDMrfTR8A4czO8nRcd+/TVm45FRiYtFnJoTaNPKyxyESzkFQnj2mqWwupGz6p/ehdSDRQ=;31:UOel6yJtlUWFLnDPzTzQ+EihxRhJhXZHHuZWM1CV0yLxPnE+DkPv9VMFq7g14fXdTmlzWIfmENRNubG6ogOiUnL+AVscdgXuWNvdPZcXiet4MLrzrh4NynBR5QTQdvoZG+cVBYLu0WbuWqGhvpthCjRa4LqmKuWU8Du7hm3k4TQ0kh+Mq4N+yMZGqEd/FE4LcicUDI7ELh3ahZHpu7YT29OFZY2tlIq4Ajob2FlHa1E= X-MS-TrafficTypeDiagnostic: AMSPR07MB310: X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;20:+xm/hw8kG+amkFPTg/SUg0Zth8i2Df1HdEaPZz10IJ0Lu3XHoned0gaozm5LMgF7pJLT/he8PfYu/E1B410gOV/tzQJIaIJP7mKn4Y2g/0WFTgoBrgv/4QxERaMW1oyeRpvMXiqx9h8bcq34dIzP6tA7Zy3J5jW6x9xNOY6+b9YgXm8k69i8XVvI2U8hGe7Ddn9X+RavOa6IsWNj+Apbg9DnvtIBfbq5u9l29CjMdzZZ91Hg0p7b3N8SUbBOvYLdITAObvcEVbYigc6bVVRk3ZXSYSCcAHabXN3JLvw8KFCTj7Q/3ioTf+/NXzRor7BEtKtwFMoPrKDLOGNLXCGDxqGTHLDaLMBJ8lkP9pLUegSn88E9qqLgIXQnreswpi3hVVumJ72NJ2mm4MIPkPqCixBYQe9RggbpBTzU+NXHJbMLeUD+DPtPUB2yfGd3tAyZx6tI10PIQECrpH/3V28EBCsopLM5goDfzONLwHK+SiWeOKK05oWdDcQslVG1EybI;4:CdFRlou40qJ3a1dtF7CcFRRcCnhc0xPLPv+WKHJfh5nCS3PuYCFb/2J2BesZtVYzNecUtTgHt2E6OdNVbeurN3u2tN9WQVXWmI1IJDZtgfX3CNeTI/OP19iKRYOI76snLi5yR+Vww62lChbuL6/ih0OY8dzDlhjPaltYw9+bOQMCLgiPTnR2X5+6PD/2J7LlAcIf89iALWD5tzH5/lZLFMoHPKlrQh5PdBsG9g/gdTsuHur47+NzxXYWo44DfVdTWeQrOCgvv7uvIXsq8NT/U9moc0+M/q9Rd7vBtYQEewzUPwsqdKXa4GIQ+JAL4D2S 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)(230783001)(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:dAFP5qaT5iqNQWwu82lYgklhwUe26lYynCZiHWUcMv?= =?us-ascii?Q?EsbBUc/0hkF0NST2GV2TnF9RS+hicfh2ZXRM0oTX7gan3hTez3viaYcfAScQ?= =?us-ascii?Q?dhAjjBo67YFN17qbgDNSht1E6KVQzdQ1BxH2F+CgvDQYv7NulWv9qGB4BznN?= =?us-ascii?Q?yat7RyFsWDFwkiQETqQtU1bS0hv+81GyjsUp+RF5ni/GWM01IE1g9gOztc25?= =?us-ascii?Q?h6wJiCJkJK2C1uwfl3vryjHSBKdo5errKlgqehVttcGXETyOeJ5ALWOE+8Xt?= =?us-ascii?Q?FZKdMQsVAIAZHsfMeW2opW3g9aCAFnb1EPJkvb53Qa8NCTAuisInw2JgyqyT?= =?us-ascii?Q?RWcd9Ex1ylWyqSdPOUO4Y343mZG+xNoglO/G03jE2pvTd0+jKpupAyl1GQ3U?= =?us-ascii?Q?oM9iPOadKfOLgGTqozAcdpCTnfALzYCPY2DPDmxAUhyjYDE13Y69jmFkgLIN?= =?us-ascii?Q?wpOixQxv2jXV/aGdP/AvNDSe7eWZWqZMtHZLltuoLzHHGhQSnzEoyHM0Rsdp?= =?us-ascii?Q?UvEgCvxx33G6kcwBhq4ea+HcFKMaZlxnA7Nv21dc9TxODzQXuiEAnBahixjv?= =?us-ascii?Q?cIoZSLeI3ONyYSEoXJKFSw7tJcI78x61nbzPeSkjWeolGgAHSniWgzf0Tc9q?= =?us-ascii?Q?7PetUX4m/ixRf5I7049tO9EbZdWEWE7Zb9/3CdlvZIu7CKWvdpYhLBKRa+Oa?= =?us-ascii?Q?5arFZ8h7ZeHRtcf/rKaPO6MRqUXQdslAiO43/3c17dwolSDtAjaUze0YM15q?= =?us-ascii?Q?G9WeHBl6F+kvImnKfZDj4R1n0E2yzNcZcB3kvyvytnTZsMgc+vpm1zs387bT?= =?us-ascii?Q?4It0P8hDHZOHWvVvPAAJNZvSbh2rIMnY2D+T1KOhZslGPpF4jOfOqqpU5UOp?= =?us-ascii?Q?9yOT2pC4Iy0pTdsLJopShmKJ97/m3mM3lxUBlTBWUbXEL7yFdV09oQhMUZJ5?= =?us-ascii?Q?y7xkunohUT67c4UC9oK/eA0kQ6nnoJlLxzfZhRwOyMsd6h9zoL/7YXHqqEdz?= =?us-ascii?Q?qiQ+9lEUSLKoOS9divVcVhGFPmtd4Z9vJIh+GfHh1UZB9YKmWixe+Qc58Fwe?= =?us-ascii?Q?wv/EsbbwP/OeszePA3lG0/3ha4yNerQ77t002+5C9lKu22Nm+t//8XwQA2El?= =?us-ascii?Q?ThkZFlX1YnDBG/bsbbxrhw89DvaL9kYUPp5FOwhb8kINZXhc0cRg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;6:Y1kh7czvGZqE0ktPMM3wLn004hv8TugI8tK7/F8xDcmUHdsQQPrE+0HWG0d5rAPgcJXsqNcXsLaEWagQC8deAqtfGmt2aSezvILVqdJoWuaJTf1aZvtXVSVrdeZekdJ3j6dTHaguFn40+mS0LvPodtcZtPZ00MVh7zNnbCZEiRyIa6520MYoWxchQRJjuMsFJa//li57molXVBKFLx15pvxdLPkxgnKI3EQWsg+M+0zApBnS2gzC+J3WKK6n/IGq7A5JJuHRVgejpNu5i8+SYiseQbNkqYH3yq+tMut1q77zfWpADMhxOd3fqaWYuBeW0nBKQGNLthAkQYO/WKaWeJmwbmBGeff5SxT16LVRyl0=;5:q7JFv/lz1dc7cmN5wd4M55PGScBBIrF+x24TgWCKsd+c93UO+tQedQmo/Jvw32HxC1kYZTh8vxtPG5OoulqP+/m4xpfNXu7anwK6ncyBvRnwkHuZ+xdky6qTID2QqFhA0YosV3cr0oYtprstDzFF1ARWUeUfZF6PAeC+UkTq0eg=;24:PlxLCklJX4a0cgnVF0YJ0a9p6jkGqt7BUHhLGcznyWDArkUJQD+0twOKv1t21MjB5qKKtwkqKaMZY//iyNuoGE9mxMzgUF3ra0ctZ+4mGuQ=;7:XwS+I4L8XfWtPdOw3W3danTkREYugcsB7nOnqI/rirm88vrpy7M95HwaVLzF6rhfZSXD/7c0jKxV0yNOYxliXHtxGIRIyVkSYTBY1JMzteXW3Dapx3Fg9f9UOJFHK1vH0SktA7yBv10sL2CdwIp11R/wcimh25AqPnzfcSSishftMXEV3u900K1t2K8FPYBQkKICifyao12YpfpxGBl77QQP9v4dOtlrC2NVi6YT0Op3bJacfiXtVmxP4qCeceb2 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:35:05.3914 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1e9c093-9678-4f34-551b-08d53034a83e 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 X-SW-Source: 2017-11/txt/msg00414.txt.bz2 From: Simon Marchi Replace with for_each_thread with pid filtering. This allows simplifying the callback a little bit. gdb/gdbserver/ChangeLog: * linux-mips-low.c (update_watch_registers_callback): Return void, remove pid_p parameter, don't check for pid. (mips_insert_point, mips_remove_point): Use for_each_thread. --- gdb/gdbserver/linux-mips-low.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 07becd6..7298e16 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -289,29 +289,21 @@ mips_breakpoint_at (CORE_ADDR where) return 0; } -/* Mark the watch registers of lwp, represented by ENTRY, as changed, - if the lwp's process id is *PID_P. */ +/* Mark the watch registers of lwp, represented by ENTRY, as changed. */ -static int -update_watch_registers_callback (thread_info *thread, void *pid_p) +static void +update_watch_registers_callback (thread_info *thread) { struct lwp_info *lwp = get_thread_lwp (thread); - int pid = *(int *) pid_p; - /* Only update the threads of this process. */ - if (pid_of (thread) == pid) - { - /* The actual update is done later just before resuming the lwp, - we just mark that the registers need updating. */ - lwp->arch_private->watch_registers_changed = 1; - - /* If the lwp isn't stopped, force it to momentarily pause, so - we can update its watch registers. */ - if (!lwp->stopped) - linux_stop_lwp (lwp); - } + /* The actual update is done later just before resuming the lwp, + we just mark that the registers need updating. */ + lwp->arch_private->watch_registers_changed = 1; - return 0; + /* If the lwp isn't stopped, force it to momentarily pause, so + we can update its watch registers. */ + if (!lwp->stopped) + linux_stop_lwp (lwp); } /* This is the implementation of linux_target_ops method @@ -471,7 +463,6 @@ mips_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, struct process_info *proc = current_process (); struct arch_process_info *priv = proc->priv->arch_private; struct pt_watch_regs regs; - int pid; long lwpid; enum target_hw_bp_type watch_type; uint32_t irw; @@ -502,8 +493,7 @@ mips_insert_point (enum raw_bkpt_type type, CORE_ADDR addr, priv->watch_mirror = regs; /* Only update the threads of this process. */ - pid = pid_of (proc); - find_inferior (&all_threads, update_watch_registers_callback, &pid); + for_each_thread (proc->pid, update_watch_registers_callback); return 0; } @@ -519,7 +509,6 @@ mips_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, struct arch_process_info *priv = proc->priv->arch_private; int deleted_one; - int pid; enum target_hw_bp_type watch_type; struct mips_watchpoint **pw; @@ -553,8 +542,8 @@ mips_remove_point (enum raw_bkpt_type type, CORE_ADDR addr, &priv->watch_mirror); /* Only update the threads of this process. */ - pid = pid_of (proc); - find_inferior (&all_threads, update_watch_registers_callback, &pid); + for_each_thread (proc->pid, update_watch_registers_callback); + return 0; } -- 2.7.4