From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 105245 invoked by alias); 20 Nov 2017 16:35:34 -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 105204 invoked by uid 89); 20 Nov 2017 16:35:33 -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 autolearn=ham version=3.3.2 spammy= X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Nov 2017 16:35:32 +0000 Received: from ESESSHC021.ericsson.se (Unknown_Domain [153.88.183.81]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 09.BF.19528.054031A5; Mon, 20 Nov 2017 17:35:28 +0100 (CET) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.81) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 20 Nov 2017 17:35:27 +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:25 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 19/19] Remove for_each_inferior_with_data Date: Mon, 20 Nov 2017 16:35:00 -0000 Message-ID: <1511195683-2055-20-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: 0c19e31f-80f2-42d3-9e08-08d53034b490 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:hzoozpp8KKpVQnsauOZLVfZpbUKMXnaTU/3OEYp28CJxPugZ4daLZEvonvlzI+pr6Evs/GkR2eTau4Je+HBfXKFNneLG/dMz8REqDn+1Js7vt1iirSf/Mys4rPoD4uGxHAiaYXH1jdMJwyXajEf5Em3d22mPOvesjHJ40mkc/vIdUViG8odmuntE05eP+a6NUg7wxsMxVibLlHIYM95PRT9JiHnzETadBuzRtmmm7EWaF5pV1kdvIy0jVLX7J2IZ;25:azPCu/Zyco7zcl0xTQ2ieHdfu+XsrZ9RkGG0aa8FxkRiZ6ws/INe3yhUHu50hi4icdZTHynSMMsTY1QLe/hH5D5KerIFbjRSo8ps7/q5zfzc2xtfAnpTwt0mP5x7MT8uT7ArW2MJAVObPELBcxMzM6Lot0CfvxeFVhNvcZQCa+HW40OOOuO/AFwt69oJmktAuiG7WyaYmN47ILA2tx0Jlw+H2Y4gxdxa1M0T0sxlzt8/ZYWy66u+mC9sT46O5UxQIUp/zdsWziRmGKASgy6FXdlKRCtVMRassq4pofomQObXta8W2j0lJLFgDZiLxQ10eSrOsqS4ahfoqx6MHmAdoy+PY7I03ojeBXLcpQPXwJA=;31:Fu2dnbf1t+OLq2EE6Vb6NBtEwKI1bh1DCFvQHMDLG+knh905zH4u6P35V3D/+VEkW88DTR6WnpSvpg4uIR3AxRkFvyoSt02CfE6/7cVhsV/stM6CYVp2KHJI+wB/2eQfhVtMr8hsBla5njyu6ND4sc/57QDMsizBl5SrpWxbVqKweSoVwlk9UzmeNx2VjnRw30Ns3O+utu8AuGLONwzUo1pcHwbDmDHDlPSK8cfRXQU= X-MS-TrafficTypeDiagnostic: AMSPR07MB310: X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;20:RCjq6R7aw1YBWGwaQbKzb1ZKvXS+3dCJbdY0CVBsb5d1lfgoB+YmInKqYy8xHjEIkCkvRv+bf+Yat6+xMtT8BAcUnH0AewZkYbLXUXMqnNAFJbwFnvXn0mD8kvPphDwcanHS7jsaQzzMYIpNfJ6FFiHVLboYMRwJ3Q7HS0LdC50QvYsS4rwXT3e1zrmJm8Qz6Y5CVACfrSInFJTugp2dyceYoVcy3JHDfegtIkZMkGcNShX6qu7gsSxk3uK5/rZTsDHxfzgK3Iht4VRFXR54tk7/ZWE2XlfaM0RAmt0xx8AxW+6+fm+ts4X/xLpymSdpUw3xY2vfWaxqEnGyno4A8o1mW4FDqUxrO7i4TaozAzRcLcgZ3aNTpVW8sal039TeTKLc0Ru/jiIbViQNX6zlsnhNyJEMecfYmzDDbfCALLAK5LiS3W8F6LET4I4mLHWafsj+vwJ5NSEPDLMO2Uvkejq05ZFigyVS9RCQJ06hEbpzzQNzavfQ7fedJqT9fwZc;4:7UhrqaVcG3URdL6ew13ip/bQWFl3g5iNIPDCJoYbAncziqBgLGaDTpa+ZscPpEOdNFkUZLzoceBtzUAOJ87BS9oWms333gdBBp/B/+2/JernMK4vpD5Tp5U/D+7Rz0Hi1XmnRhouR2RiERqqwj7aEnfUTUCKHABqEBJPXsSheKpjlM3xIAoLhcjxilv3IbdkqDNIvI8TPuqmn4tEiAnBPpnbAuMqJekvXTPVVm0BuYrqM9x/eMwfxyhQ1QDxyS2QE2WrbBHv+MRtu3tqFJvmwg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; 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)(5890100001);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:kTfaVBbm2y0fOX6p8QOfWuuy6XnJolV9XKXLp93TFc?= =?us-ascii?Q?r23/bFTumFK9VM56R3cLjl4txKqeL3MEGc2yc7mmPEhVSj7V8rTYwBdqMeja?= =?us-ascii?Q?zTWOprSXEvR+v9+6vtS7dMF5hG80x0PV45ksmayEKUyT8zzw4x0maL/f+mel?= =?us-ascii?Q?NEymZU7UJvreN4l1OtyHpLY5nr9ofjHU5cJCt5dTb3LI/KIBnAW8fMjlqUzQ?= =?us-ascii?Q?5tFfwwPUEziL6P9Qd0bGo4f/NiNSmhxeCSmNNhBntoNlz8vpSrS7/u1bQ+Z3?= =?us-ascii?Q?bcm8kbR/2/ZdfQPEX0mwFmVzfqscKEKyl8ss1MTbHaZYx7jLbpaqjhKF6nmV?= =?us-ascii?Q?D58twDqvV6XeBic7B13lHM8/TGK6WhN6V1ASJ6Rim/I7m4yCJ0vKIZnppR5D?= =?us-ascii?Q?B9wFv1sDAv70iyfDztTXjsATCyj2UGCSi1If89VMozcIn+bc9pIClQDcCZVv?= =?us-ascii?Q?2sOHzbT5+g5FvuA7ySGQFsp+t/Qk1tWkC6v/wBDeIZ1oCV9B8rcWiFsYtNdA?= =?us-ascii?Q?8DNEpzqLvHaYNnplOKC0FFT+y86h9fXuSRlb/EOqBQ0so/9FfM2JwpNvqCgI?= =?us-ascii?Q?PcF27dnH/27cFI32XdaK+M/4hFskKKqlytm/cQEJK0N2wFbyodYTo97XbQCv?= =?us-ascii?Q?d19xj2NGR0VpOFn7gDuVStrT7pUvlLq9TnGvUjccnrvYsU4X4p3AJuhKKUa7?= =?us-ascii?Q?XW7qevRzzhixNLZeQyD9jXqQvhWM+o722Q/0u0QGJOZl6H6i0C89kYYaMreX?= =?us-ascii?Q?Ccj3AMmotVOl92HKMeQlyIgWRTj2UJtQlWYIWlQ46HpOc/Fa5Wgl8oWSnhr+?= =?us-ascii?Q?7v85adylo2ppncsbCFY/J1IrzTJa0GIp0nR4/ucVQ+ePS5478PCYxlUJxBT6?= =?us-ascii?Q?ffvdqKbhsU009SGLo/OlW6chu9CZC0mt4oEe03z6O+uGOk95PHXPFjwkCm0j?= =?us-ascii?Q?/f1dxXcGSfssSplcSbvVdkFCLmPB3f3tkZA8IxmWgzQSjnW/DZrVPOw6+Q/8?= =?us-ascii?Q?nQ5419MCqd5fplTxafKMukjNLjavbiIzKY/avBD0ZJuLk02ROH6vlehTURCU?= =?us-ascii?Q?Uzv1YsQoZU3CB98mPSWZ6y0DB91kC1Y/Kmx709C8c8VAJwk/jwMPqeF3096p?= =?us-ascii?Q?P7PfQwy/AhxcaJVv+z7iMDuR+BRRmfCD3uRHMUJYTYW5Qr83qxL3nmaa/B+Q?= =?us-ascii?Q?J+50ChznqCYn0=3D?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR07MB310;6:Y7xVhw7ucA+biGlpB/moMmm1vm45zqSgdaiMNEhwjLlo/gYUEYXU5V935Fjq3JbQ/jsZqEGZhC843HnQQXdjJjg9C1Jti3NC/A3eqohAvhB1lttZ9kTnoQsEiOm3QWLWD8WYt/u/IqfNrX0bSPKy3QI1t2c+uHsZTTk7q3JrdVsIcv90tiRR+pRBFz6T50vogblgqSLvY0koOK/62c9mc3fKIzqeOZvm/WQuMPYhxaxiN7vWPgl/p6r61DwHwshwfhOqBj+kmgCRoQCk/QtH0J+EdKIV86Y9Yd90d+kP61y5uUxJHst5jqc51EqdPKDvm61V8hkAlh6xcLQ/w2+vDhTBNMzgm8q8B6f77B76w08=;5:FMhAigMBoEgYAYffoNak8mrx5NgAEUiBAerl1j6B/NlohJMevF0BHWOZvfBDmiyZSshz9fialxNwu3ywrLGo2p7w6YnzuHktPiVqvklAKHGC6/jPQ2pDo45uMc1X/f9PuWhMvrL7u+fOiKA2RugrfD5/oAngCJolnmHnfj6mIbE=;24:UiKvuTyepXVtmWQNiq2SEr/O0kOPrSogzLJ6nG/J//RnD/QewSsSFX35tczkVJnMXrUKcCAc+s1dVEunm2CdZ1mZgCh6EBNB1GVZc8ws4hU=;7:J2pXlfCxuz0wK2/6NGp3VNW3gut7uV3dkzlfBCUrceX5VY7KJXQUCXDCtwmntXxWxTyPrbYvM3NJQW1kAM1NHK96Vod8fpEBE/nCD4GUaXTWjiqx5dgExfcfoH/K1cpKDBvCZNgjPdMLnZd5XBOqX7PqGt2+75qICIGHDGrQgkfWVT6BG7tdn69OALqIKXnXVh4qtTOyF5dDkEAR6ggcZDv7uysBiRuG8ejLdyWafDH7ZhWlILKw8rr2FE6iAZFW SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Nov 2017 16:35:25.9696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c19e31f-80f2-42d3-9e08-08d53034b490 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/msg00416.txt.bz2 From: Simon Marchi Remove for_each_inferior_with_data, replacing its sole usage with for_each_thread. gdb/gdbserver/ChangeLog: * inferiors.c (for_each_inferior_with_data): Remove. * inferiors.h (for_each_inferior_with_data): Remove. * server.c (handle_qxfer_threads_worker): Change parameter type. (handle_qxfer_threads_proper): Use for_each_thread. --- gdb/gdbserver/inferiors.c | 12 ------------ gdb/gdbserver/inferiors.h | 4 ---- gdb/gdbserver/server.c | 9 +++++---- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c index 093080d..6f4427c 100644 --- a/gdb/gdbserver/inferiors.c +++ b/gdb/gdbserver/inferiors.c @@ -30,18 +30,6 @@ struct thread_info *current_thread; /* The current working directory used to start the inferior. */ static const char *current_inferior_cwd = NULL; -void -for_each_inferior_with_data (std::list *thread_list, - void (*action) (thread_info *, void *), - void *data) -{ - gdb_assert (thread_list == &all_threads); - - for_each_thread ([&] (thread_info *thread) { - action (thread, data); - }); -} - struct thread_info * add_thread (ptid_t thread_id, void *target_data) { diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h index 030d9c3..947b56e 100644 --- a/gdb/gdbserver/inferiors.h +++ b/gdb/gdbserver/inferiors.h @@ -140,10 +140,6 @@ int have_attached_inferiors_p (void); void clear_inferiors (void); -void for_each_inferior_with_data (std::list *thread_list, - void (*action) (thread_info *, void *), - void *data); - void *thread_target_data (struct thread_info *); struct regcache *thread_regcache_data (struct thread_info *); void set_thread_regcache_data (struct thread_info *, struct regcache *); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index cfc4a12..e2b7537 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -1650,9 +1650,8 @@ handle_qxfer_statictrace (const char *annex, Emit the XML to describe the thread of INF. */ static void -handle_qxfer_threads_worker (thread_info *thread, void *arg) +handle_qxfer_threads_worker (thread_info *thread, struct buffer *buffer) { - struct buffer *buffer = (struct buffer *) arg; ptid_t ptid = ptid_of (thread); char ptid_s[100]; int core = target_core_of_thread (ptid); @@ -1692,8 +1691,10 @@ handle_qxfer_threads_proper (struct buffer *buffer) { buffer_grow_str (buffer, "\n"); - for_each_inferior_with_data (&all_threads, handle_qxfer_threads_worker, - buffer); + for_each_thread ([&] (thread_info *thread) + { + handle_qxfer_threads_worker (thread, buffer); + }); buffer_grow_str0 (buffer, "\n"); } -- 2.7.4