From patchwork Sat Aug 12 20:06:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Baldwin X-Patchwork-Id: 22118 Received: (qmail 9298 invoked by alias); 12 Aug 2017 20:07:14 -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 9243 invoked by uid 89); 12 Aug 2017 20:07:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: mail.baldwin.cx Received: from bigwig.baldwin.cx (HELO mail.baldwin.cx) (96.47.65.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 12 Aug 2017 20:07:11 +0000 Received: from ralph.baldwin.cx.com (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by mail.baldwin.cx (Postfix) with ESMTPSA id 683C810AF07 for ; Sat, 12 Aug 2017 16:07:09 -0400 (EDT) From: John Baldwin To: gdb-patches@sourceware.org Subject: [PATCH] Use an array type (lwpid_t[]) for the array of lwp IDs. Date: Sat, 12 Aug 2017 13:06:16 -0700 Message-Id: <20170812200616.94064-1-jhb@FreeBSD.org> X-IsSubscribed: yes While here, fix a mistake in the ChangeLog for an earlier commit. gdb/ChangeLog: * fbsd-nat.c (fbsd_add_threads): Use array type for `lwps'. --- gdb/ChangeLog | 6 +++++- gdb/fbsd-nat.c | 9 ++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c588291427..ce44c3805f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2017-08-12 John Baldwin + + * fbsd-nat.c (fbsd_add_threads): Use array type for `lwps'. + 2017-08-11 Pedro Alves * infrun.c (process_event_stop_test): Adjust @@ -116,7 +120,7 @@ [!HAVE_KINFO_GETVMMAP] (fbsd_find_memory_regions): Use std::string for `mapfilename'. (fbsd_xfer_partial): Use gdb::byte_vector. - (fbsd_add_threads): Likewise. + (fbsd_add_threads): Use gdb::unique_xmalloc_ptr. 2017-08-09 John Baldwin diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c index c89343a24f..aeae011c07 100644 --- a/gdb/fbsd-nat.c +++ b/gdb/fbsd-nat.c @@ -632,7 +632,7 @@ fbsd_add_threads (pid_t pid) if (nlwps == -1) perror_with_name (("ptrace")); - gdb::unique_xmalloc_ptr lwps (XCNEWVEC (lwpid_t, nlwps)); + gdb::unique_xmalloc_ptr lwps (XCNEWVEC (lwpid_t, nlwps)); nlwps = ptrace (PT_GETLWPLIST, pid, (caddr_t) lwps.get (), nlwps); if (nlwps == -1) @@ -640,8 +640,7 @@ fbsd_add_threads (pid_t pid) for (i = 0; i < nlwps; i++) { - lwpid_t lwp = lwps.get ()[i]; - ptid_t ptid = ptid_build (pid, lwp, 0); + ptid_t ptid = ptid_build (pid, lwps[i], 0); if (!in_thread_list (ptid)) { @@ -650,7 +649,7 @@ fbsd_add_threads (pid_t pid) /* Don't add exited threads. Note that this is only called when attaching to a multi-threaded process. */ - if (ptrace (PT_LWPINFO, lwp, (caddr_t) &pl, sizeof pl) == -1) + if (ptrace (PT_LWPINFO, lwps[i], (caddr_t) &pl, sizeof pl) == -1) perror_with_name (("ptrace")); if (pl.pl_flags & PL_FLAG_EXITED) continue; @@ -658,7 +657,7 @@ fbsd_add_threads (pid_t pid) if (debug_fbsd_lwp) fprintf_unfiltered (gdb_stdlog, "FLWP: adding thread for LWP %u\n", - lwp); + lwps[i]); add_thread (ptid); } }