From patchwork Fri Nov 17 16:26:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 24312 Received: (qmail 19593 invoked by alias); 17 Nov 2017 16:27:17 -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 19553 invoked by uid 89); 17 Nov 2017 16:27:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 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: sessmg23.ericsson.net Received: from sessmg23.ericsson.net (HELO sessmg23.ericsson.net) (193.180.251.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 Nov 2017 16:27:15 +0000 Received: from ESESSHC024.ericsson.se (Unknown_Domain [153.88.183.90]) by sessmg23.ericsson.net (Symantec Mail Security) with SMTP id 0A.71.07741.0ED0F0A5; Fri, 17 Nov 2017 17:27:12 +0100 (CET) Received: from EUR03-VE1-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.90) with Microsoft SMTP Server (TLS) id 14.3.352.0; Fri, 17 Nov 2017 17:27:12 +0100 Received: from elxacz23q12.ca.am.ericsson.se (192.75.88.130) by AMSPR07MB309.eurprd07.prod.outlook.com (2a01:111:e400:802f::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.239.4; Fri, 17 Nov 2017 16:27:10 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH 1/4] Make output_thread_groups take an std::vector Date: Fri, 17 Nov 2017 11:26:46 -0500 Message-ID: <1510936009-12779-2-git-send-email-simon.marchi@ericsson.com> In-Reply-To: <1510936009-12779-1-git-send-email-simon.marchi@ericsson.com> References: <1510936009-12779-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: SN2PR01CA0028.prod.exchangelabs.com (2603:10b6:804:2::38) To AMSPR07MB309.eurprd07.prod.outlook.com (2a01:111:e400:802f::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ec98ef68-9603-4ce5-bd45-08d52dd80dc8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603258); SRVR:AMSPR07MB309; X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB309; 3:99RX7txgv3tPBFHuDXYb+FZytx+DKwlP0jrP2olUw32RQngFBLaBZiF5gZDFFkQ1CihDkU46r8Kyxfcqs7KCaQ1uG+BWGdv4qlxR0ZH38Q4rT4ZSVoOjYkSjngcit0l0A5S+pDfsVKUyEwTNlzUEWiA8FP2yr2lzlLnuhgnj6H5x+2N5O4gWu44ULTAbpmwIxYZY4d9WLM9oSDWWpRptnuH7mLpw9h79wtwNkDXkUoMDQ3rIA1zyiY3WSCkLq7LE; 25:P2sU4JIAY3M1Dcc0dJ+wGOlLWXZ+jhPYuJC3AHSVOb+q4xIYbFs5h7rYUQjbC+1PBuCTdYpy2t5nAm3bHEtbPunA+awgh4YW3mgsNiN+ZhScEWiRAdY7buB/zQR+MtmGKXVPCAddMaSuZbC4EabeJARMamcN2orFQQrMBVdmu4t8GnlSxbmORr4JjtimO3if7oJhWYKBYiYXI2R9ins+xOuMAYV5p010DipCAcwBl19D7UbHzwfNJkoZ67XNNcZABBVHhIwv4eqnsKrrPhGnqYOrGAtqUfnSPVurWv1OiizvP2e5CBYGQQULkpHlGhcRFerIzP77JdaqdNL42dPc/G1FPlfD98086ky/SooiEaE=; 31:2w9irfEIINdK3knD+CHDJnNxf57PTrnHbdd3Xwnqeou1k4/I0j0av7y+9SCFQcTuxBLvWDwCmtCOkFeZACmgqejl9z4zG6iQX/2NhxzEtWoknjZEzMqNi0Z0kzagMrXcPu4TQKxLGAbms5wWF8k1PqwrGyrCd3fnHvluPOS7GDMOYCYyP1ymWGHxW4Zderg0BnFQtQqCvonseXS2V+lM5AJEyA3vtjU5IKYr/QzX/Sg= X-MS-TrafficTypeDiagnostic: AMSPR07MB309: X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB309; 20:HOH1J0FL9vWUaW4D7dlAp6uz2EoHEPJ02aNxkDPctICUDWJ/tZk5w9cKVzzUYVw0/9tZhcq+TV1i9duyvbRiymnwuQfkYIjaRAESBLDpzhWgKFBv3fyq47JEeFwnOidyWP6J9xh9ueKvwSYAlEy83oXwoLvPkCUx6BA6C1b7TE+XH4BZKLwYdZGjGLcaYIzxpVK5+Tvv7nLYSUtQkPQAN0gvQg2RtR4aA2UmgcGQ0cZsmBCwiAGUeu8duWWm+w/JJNdhkL1eppQG9UDTgCyHImwGkP6ze++vrXdJ/kKZjdPimY4ei3cmryi2P87P3VAgoV1MxU06Q84BDiXQrVOP7MfP8IVoJOYeVOHXJL44ZlhW2vG0kBrVrX13Bjyf1YgRi9ExSn181SdK6Q84ALnxmXmGWoD/tiataIHGSjVlnOU4iLFPtuvsn2Ao/95C/J8zFgnwpCTb4LtP7vQ0a7PmkjBLc/kZVv/DVTvWi25nZ1Y/SINHLE1DoCXbbZTQeVdP; 4:MBxaEEAT/Ml0QvHxlVjAXHroFm948fbXKFtZQblNiHxbWjXmIeFN6/6mgsfBs74ghFB1+oswi2laI5S+58NVFtfq6Cb6sruWUFGihHRvZjRpzLSxdrTeBXblqk0VJMXF597DOVoZLZkquPc31aVES71EGgMetrnKEccKOfcZuHzJESH3NETca5BMYGqMv8AwWndSZX+kUFJDOs/2cW42CZt5f6TN1URXQnqq0XRvljbymfbXWS5b9k05YOG7q/A9Ldo6oAYKbXG/FRdkfn3LHA== 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)(8121501046)(5005006)(10201501046)(3231022)(100000703101)(100105400095)(93006095)(93001095)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123560025)(20161123564025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AMSPR07MB309; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AMSPR07MB309; X-Forefront-PRVS: 049486C505 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(346002)(376002)(54534003)(189002)(199003)(305945005)(6506006)(189998001)(50226002)(7736002)(4326008)(6116002)(33646002)(3846002)(2906002)(6512007)(86362001)(16586007)(6916009)(53936002)(2950100002)(97736004)(5660300001)(316002)(2361001)(575784001)(6666003)(106356001)(50466002)(48376002)(81156014)(8676002)(5003940100001)(68736007)(25786009)(81166006)(47776003)(6486002)(16526018)(8936002)(66066001)(478600001)(36756003)(101416001)(2351001)(50986999)(76176999)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:AMSPR07MB309; H:elxacz23q12.ca.am.ericsson.se; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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; AMSPR07MB309; 23:r6lMrv6PptXZ/rHmbYzoCJKa7wLsdph0W1JhJlrrT5?= =?us-ascii?Q?XponBk3xN9ykqu6lj8Kv0qune1zB5z0ZvU48sL38u4Xfty2jSqGTw9KkEMwR?= =?us-ascii?Q?6RddSCuuXy+6T8LbFICoQYFpqtTW882U5Ooyis8sjTWJJKiz3zBCa3Xn0Qvx?= =?us-ascii?Q?t98i2fTzMmpGJG6rQxAiUo4uGsou46a3pAaQ7SBCupGKQqxHMcKnar6W3HSi?= =?us-ascii?Q?ylTLF5f/HFN+i1Q8gB1DK/8yo/EkU4XUDNCik4WLzVC/liqB1f0nKJKFSJ/U?= =?us-ascii?Q?htOm4FeEjcYYThkTuNDjUQhhqPH6L4B8AT9N0norwkaOL3kJDVBhVJfaUsIs?= =?us-ascii?Q?qFisWmcjOWnvIwpNZpdc3kKFg5R202E8ZFHQuACI5E2R3CzakTlH3iehmFHM?= =?us-ascii?Q?cfV9FW7fZU5GC+6/Xg1a+OBJRAYzaVoUyWvM53gTRJy1tzcoW+zXPJ5/k9rw?= =?us-ascii?Q?DgZSbtg0d1jIj8XMLS+xUvEeggGamVBhuHKCYLlp2PD5NOYZfdMwNzFt1ESo?= =?us-ascii?Q?5jqhuEicY/7LflK42VcqThQcZRS+dzcMvrdzSJA+iRWKQgBAIp4J9WyLVR5d?= =?us-ascii?Q?tJZ5c+3c029HhYAA5j27kg2XsNVPWL5Y5eM9ueuLnhuoMvHuCkApyRuKtXRV?= =?us-ascii?Q?/4xGeB4/oPZJHKTl0ma79S2yLehhCirB/R3aGX+XAPCB4AmYkB9X3q3rlZbQ?= =?us-ascii?Q?U/Z736zbwcA60PbNNphYjsQ1uUgjP9QSdGaAsj1IC1ZvN56x8OkjqdAbLpSB?= =?us-ascii?Q?MvNkTbsJTL4fkQN+dOTGG7puL6aqZquszm/dqBCNolzFjWyOi74Y5NT8Pxqj?= =?us-ascii?Q?BAeYUnJz5L77fz4qJ8zf/E5tfJGMR28Ds0DywPFZPFdxx30LV/8HtEmTgyZi?= =?us-ascii?Q?2om7QBgc9vMIyhh31A0h3yGwQh9jYRc5sTpMTIrmGZ5sDa4n3T8ipcG5OYeL?= =?us-ascii?Q?zMLFxTbadXGZMWmgknJb0uyvU+3/v3u8jYIwcCWEqK9np9bcT0spOsXbJaCq?= =?us-ascii?Q?ki7HuHHMId6ZAd8W6kjdroJw5jCdNf4zI4g/6GjezvJLNWhQSmj4IXN/NbNK?= =?us-ascii?Q?uM96ThnlbPPBNRosWcxOyqsF0sAucad1l3NkB7DmT9wBhBwCHjVbrsZEzon0?= =?us-ascii?Q?4zzNdf6cXtwkKtcdK2oiYUFp7hluKalgCBmldW84+oK7fbyqj/pEQVRIZN2E?= =?us-ascii?Q?sIY6CVEJ6o3dM=3D?= X-Microsoft-Exchange-Diagnostics: 1; AMSPR07MB309; 6:QgFFZFOKXYTnHltwAHRod126GO1CumQoBQMvM6GTr5iep3FMWP6h6rwNkqjJiZFsz1HX3dXGdqCZ266EHEC0AgD4rNyr41PSmqU8jEUCGBONF1N4xbOZAlDhBjiIM4B0sJuJSgs5EdYYSjqR6G88RHx7ksg7wXfPaJCIFN+i+InoGFYYLN/USQQvCJeKx6podRLBWLSIDYGHhUBx1dppxiIAf427qk9iDH2QDehUOWDiAcIpLDI/WxYBywbIbU8Zf56UkgBM1o4YiKNQD+1njx7HQagihb7zqR8oKH+2ocVl0fWyF9R0Ua3K6YAa/xZ1FBLeX9uV1GKNqzEQddTHuZUU7nEC+SeZqq1876OsysI=; 5:6r5VlQAQJqUoa9fhU6qquJBWYwKcS5hDDg2Nn3qb8nH+FVdeLjqnyM64+OjkcIGTiDhwUlibcduW0g6xOm64ruoMQjSC+GR0wYHgPHQXELw/++Vy9+tDEn0Ruzp/a+9yKixH7mooNgYjeKVdDLh3OCAGmkjXzroxRFXe/SJMmQk=; 24:i0AVq+h0oQ4ufmBSzvbu96XYCXZomqC7Fo+J7AMeb+andY4IcPiJuogsUd7viJ6gzSOHL8uVm+fE7R87OZ8btNlbN0OQ+C4tEnNdNqzD8Ok=; 7:kRUbBZOxDQuztwNCwcCBhsk34iY/S+eTRwj+L2CQK78qzfljUp3YVD7iextKaoZPhrCHLNnHntYh4xS5JMLxxvQcVKe9Gq10IVQVLpeJv3fMI2BPlnBycxYUVvJSCAawoLIQXGfPNDY5S20Ufr68qj5tbmNzMB17MTjZ8bLfLkcoWTYiek/We480LphT6Y2FNqc7N7icaVlz13rAsduby0bTa0wA4eGWVppg6RE1jXOV1R+TbHJjwMqM6i7lElj7 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2017 16:27:10.2738 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ec98ef68-9603-4ce5-bd45-08d52dd80dc8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR07MB309 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes From: Simon Marchi A simple replacement of VEC with std::vector. gdb/ChangeLog: * breakpoint.c (output_thread_groups): Take an std::vector. (print_one_breakpoint_location): Adjust. --- gdb/breakpoint.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c index 516cccf..d8d0ed0 100644 --- a/gdb/breakpoint.c +++ b/gdb/breakpoint.c @@ -6031,12 +6031,10 @@ bptype_string (enum bptype type) static void output_thread_groups (struct ui_out *uiout, const char *field_name, - VEC(int) *inf_num, + const std::vector &inf_nums, int mi_only) { int is_mi = uiout->is_mi_like_p (); - int inf; - int i; /* For backward compatibility, don't display inferiors in CLI unless there are several. Always display them for MI. */ @@ -6045,13 +6043,13 @@ output_thread_groups (struct ui_out *uiout, ui_out_emit_list list_emitter (uiout, field_name); - for (i = 0; VEC_iterate (int, inf_num, i, inf); ++i) + for (size_t i = 0; i < inf_nums.size (); i++) { if (is_mi) { char mi_group[10]; - xsnprintf (mi_group, sizeof (mi_group), "i%d", inf); + xsnprintf (mi_group, sizeof (mi_group), "i%d", inf_nums[i]); uiout->field_string (NULL, mi_group); } else @@ -6061,7 +6059,7 @@ output_thread_groups (struct ui_out *uiout, else uiout->text (", "); - uiout->text (plongest (inf)); + uiout->text (plongest (inf_nums[i])); } } } @@ -6220,13 +6218,13 @@ print_one_breakpoint_location (struct breakpoint *b, if (loc != NULL && !header_of_multiple) { struct inferior *inf; - VEC(int) *inf_num = NULL; + std::vector inf_nums; int mi_only = 1; ALL_INFERIORS (inf) { if (inf->pspace == loc->pspace) - VEC_safe_push (int, inf_num, inf->num); + inf_nums.push_back (inf->num); } /* For backward compatibility, don't display inferiors in CLI unless @@ -6239,8 +6237,7 @@ print_one_breakpoint_location (struct breakpoint *b, moribund_locations and thus having NULL OWNER. */ && loc->owner->type != bp_catchpoint)) mi_only = 0; - output_thread_groups (uiout, "thread-groups", inf_num, mi_only); - VEC_free (int, inf_num); + output_thread_groups (uiout, "thread-groups", inf_nums, mi_only); } if (!part_of_multiple)