From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by sourceware.org (Postfix) with ESMTPS id 16500385DC04 for ; Wed, 1 Apr 2020 21:03:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 16500385DC04 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gmx.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=n54@gmx.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1585774945; bh=NKNWki5W0zabJFugcaqEehY6xU6Mec6h8hB4dEPYYiE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Blqu0v66sxWPZAmkwlxBcUZEvgAO7S7teduHaqSiHrqk9fDWXpUATVWw747HhAsWe R5j0y5QULt2kFAntLAG62p+iyB17xXCnOVL1gwXGOVmudBEdAM0cdyuipkKogq4nT9 p00hTNeXvGAvRJW7E/p2Rb9frWsBLgUkTbQoFBWg= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([89.79.191.25]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N4Qwg-1jAeAQ3pHK-011RNa; Wed, 01 Apr 2020 23:02:25 +0200 From: Kamil Rytarowski To: gdb-patches@sourceware.org Cc: tom@tromey.com, simon.marchi@polymtl.ca, jhb@FreeBSD.org, Kamil Rytarowski Subject: [PATCH v3] Implement basic threading support in the NetBSD target Date: Wed, 1 Apr 2020 23:01:39 +0200 Message-Id: <20200401210139.27152-1-n54@gmx.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200326031658.3659-1-n54@gmx.com> References: <20200326031658.3659-1-n54@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:GtAKEMu/foKOmQjhkBlsRKW/Zus51xR0dJyc2nh70RwkqGm1N7V VJn31DRoDvancOZCy8YiRl3FqQhgk7MEc3NhtidzrZVKhhIZdot+Ca/U4YzEskwueN1/QTM sszay1gik3H55MmqEkZR6BFMxnnpZPBLp6xGyHWGKQbEXwIuN60TVKwC2cxv1UNLTSGvi08 pdgqo6h/F0mpKNMoCvIZg== X-UI-Out-Filterresults: notjunk:1;V03:K0:vF8or1+GaQA=:9jHdhWCAioIyxfo5lu+c69 jFYb9ytj5YVu7xRaqe7gj9A8u2/CmTcXQ2wVJXbjk3SnvYwmtau7vsM/fwC2mvdgsh0AVwIY0 7QsfkUgNfmOTqC14QttrrTzuXCOnjOd9iVikJB1HURW6/EVwWwqyLZBbn8WtIuKLcahfMt7jv u3t61nfNojjdY7Udk7+XjbnHIs5ojJXv7Ma4hjqcAno8sAokb2JmNuqGzp5Y4cO4a8L2f38os Yqv2w5tUl+hvFp0TxCqWiAEva6Zc+VvaUd6AUvhCv2iTSlfD0y/mB6auk01GStwBn/U1b7lVA NuvDpVnqflTzeSgrc+uGRHHDoUe+kXIaV1uKBYx+ri3buhwmGUE8l4NN+52KCPxvXIsQcES6h 6TfsYDP88u3GnnuhwaIPimsmiTldMJIj01Fm2rZWsTnQyOSQNv+uAOlJgk4erjW2rVrRf5UXp xc+8v50+nK1pwWA9mfgL3TDCclmSRQZb2gMLw4wKk7R63bQYzxYu8I2S/7rpYDp6CgfSpnHxU LhU9PlBHicZa24v0XbYscLP8mNqJOvOEfwl3lwiV/U+NDZvBcVxfBucv05nOfpKDMRUjUtww7 FoanqcdgAqx2rMND2zHNXMNeWpYCHt/02sP0dXHQMm3tqjpUIdjUG4i7I5ttIOB0xVZeWF20a XK6lHB7HaQgRVSx9XkhrFGPg8kPgRiVB6sldtSUcAyp4CZ/ZeVhctCxx3kGAnGL84siMmLdGA kD7ZCw24OBnrgx75px1Qocp8Msh/TEZw5BMx1COXPtRsw1W6974bO/hp+tfOEnsGa3OvTkT4q q2zwO8kQ5uowagRCLiBnm1qRGAVJdHustRA32aXvw4vnabqE9xFLQxBk8nOU3VwM0927sE5Uu MTE/dZTWa/ZxeTa6q/e6x5V4EvkfFiH1aXTWIze74AknX8uSc3yngZJ/gjUzFqxvQfbCyda6v V9ZRJDA4CTv8Sgwz3Vb5GX8HpfQVahioYimwuS8yGKVYI6ksi6SPgAVhQ3OUoJubQ971fC0gq 6HXTpO/x8UhHasklXecREsbHQi4LEgjnTB6/o64/023LEVsTQXwTYA6B+zTM9fA5NRunIyMLI 1/n3VyoEA/T56xCCY7jdObVEVIt+JQZjXm6rkdU/Sf8Jr2o3NaImyBxLVza/RRMRV82GfgOHh 6FjDKHSfavVxBFhC+N08Cvhqvt8j4A0D9sgpVZ10QlANarS3ZxIblKL57MnKxO/aOPuT8= X-Spam-Status: No, score=-28.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Apr 2020 21:03:09 -0000 Use sysctl(3) as the portable interface to prompt NetBSD threads on all supported NetBSD versions. In future newer versions could switch to PT_LWPSTATUS ptrace(2) API that will be supported on NetBSD 10.0 and newer. Implement as part of nbsd_nat_target: - thread_name() - read descriptive thread name - thread_alive() - check whether a thread is alive - post_attach() - updates the list of threads after attach - update_thread_list() - updates the list of threads - pid_to_str() - translates ptid to a descriptive string There are two local static functions: - nbsd_thread_lister() - generic LWP lister for a specified pid - nbsd_add_threads() - utility to update the list of threads Now, GDB on NetBSD can attach to a multithreaded process, spawn a multithreaded process, list threads, print their LWP+PID numbers and descriptive thread names. gdb/ChangeLog: * nbsd-nat.h (struct thread_info): Add forward declaration. (nbsd_nat_target::thread_alive): Add. (nbsd_nat_target::thread_name): Likewise. (nbsd_nat_target::update_thread_list): Likewise. (update_thread_list::post_attach): Likewise. (post_attach::pid_to_str): Likewise. * nbsd-nat.c: Include "gdbthread.h" and "inferior.h". (nbsd_thread_lister): Add. (nbsd_nat_target::thread_alive): Likewise. (nbsd_nat_target::thread_name): Likewise. (nbsd_add_threads): Likewise. (update_thread_list::post_attach): Likewise. (nbsd_nat_target::update_thread_list): Likewise. (post_attach::pid_to_str): Likewise. =2D-- gdb/ChangeLog | 17 +++++ gdb/nbsd-nat.c | 166 +++++++++++++++++++++++++++++++++++++++++++++++++ gdb/nbsd-nat.h | 8 +++ 3 files changed, 191 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ef62216e0ad..764b65d872d 100644 =2D-- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,20 @@ +2020-04-01 Kamil Rytarowski + + * nbsd-nat.h (struct thread_info): Add forward declaration. + (nbsd_nat_target::thread_alive): Add. + (nbsd_nat_target::thread_name): Likewise. + (nbsd_nat_target::update_thread_list): Likewise. + (update_thread_list::post_attach): Likewise. + (post_attach::pid_to_str): Likewise. + * nbsd-nat.c: Include "gdbthread.h" and "inferior.h". + (nbsd_thread_lister): Add. + (nbsd_nat_target::thread_alive): Likewise. + (nbsd_nat_target::thread_name): Likewise. + (nbsd_add_threads): Likewise. + (update_thread_list::post_attach): Likewise. + (nbsd_nat_target::update_thread_list): Likewise. + (post_attach::pid_to_str): Likewise. + 2020-04-01 Tankut Baris Aktemur * infrun.c (stop_all_threads): Update assertion, plus when diff --git a/gdb/nbsd-nat.c b/gdb/nbsd-nat.c index 326bbe3aec3..54ae172ba7c 100644 =2D-- a/gdb/nbsd-nat.c +++ b/gdb/nbsd-nat.c @@ -20,6 +20,8 @@ #include "defs.h" #include "nbsd-nat.h" +#include "gdbthread.h" +#include "inferior.h" #include #include @@ -39,3 +41,167 @@ nbsd_nat_target::pid_to_exec_file (int pid) return NULL; return buf; } + +/* Generic thread (LWP) lister within a specified process. The callback + parameters is a C++ function that is called for each detected thread. = */ + +static void +nbsd_thread_lister (const pid_t pid, + std::function callback) +{ + int mib[5] =3D {CTL_KERN, KERN_LWP, pid, sizeof (struct kinfo_lwp), 0}; + size_t size; + + if (sysctl (mib, ARRAY_SIZE (mib), NULL, &size, NULL, 0) =3D=3D -1 || s= ize =3D=3D 0) + perror_with_name (("sysctl")); + + mib[4] =3D size / sizeof (size_t); + + gdb::unique_xmalloc_ptr kl + ((struct kinfo_lwp *) xcalloc (size, 1)); + if (kl =3D=3D NULL) + perror_with_name (("calloc")); + + if (sysctl (mib, ARRAY_SIZE (mib), kl.get (), &size, NULL, 0) =3D=3D -1 + || size =3D=3D 0) + perror_with_name (("sysctl")); + + for (size_t i =3D 0; i < size / sizeof (struct kinfo_lwp); i++) + { + struct kinfo_lwp *l =3D &kl.get ()[i]; + + /* Return true if the specified thread is alive. */ + auto lwp_alive + =3D [](struct kinfo_lwp *lwp) + { + switch (lwp->l_stat) + { + case LSSLEEP: + case LSRUN: + case LSONPROC: + case LSSTOP: + case LSSUSPENDED: + return true; + default: + return false; + } + }; + + /* Ignore embryonic or demised threads. */ + if (!lwp_alive (l)) + continue; + + if (callback (l)) + break; + } +} + +/* Return true if PTID is still active in the inferior. */ + +bool +nbsd_nat_target::thread_alive (ptid_t ptid) +{ + pid_t pid =3D ptid.pid (); + int lwp =3D ptid.lwp (); + bool found =3D false; + + auto fn + =3D [&lwp, &found] (const struct kinfo_lwp *kl) + { + if (kl->l_lid =3D=3D lwp) + { + found =3D true; + return true; + } + return false; + }; + + nbsd_thread_lister (pid, fn); + + return found; +} + +/* Return the name assigned to a thread by an application. Returns + the string in a static buffer. */ + +const char * +nbsd_nat_target::thread_name (struct thread_info *thr) +{ + ptid_t ptid =3D thr->ptid; + pid_t pid =3D ptid.pid (); + int lwp =3D ptid.lwp (); + + static char buf[KI_LNAMELEN] =3D {}; + + auto fn + =3D [&lwp] (const struct kinfo_lwp *kl) + { + if (kl->l_lid =3D=3D lwp) + { + xsnprintf (buf, sizeof buf, "%s", kl->l_name); + return true; + } + return false; + }; + + nbsd_thread_lister (pid, fn); + + return buf; +} + +/* Implement the "post_attach" target_ops method. */ + +static void +nbsd_add_threads (nbsd_nat_target *target, pid_t pid) +{ + auto fn + =3D [&target, &pid] (const struct kinfo_lwp *kl) + { + ptid_t ptid =3D ptid_t (pid, kl->l_lid, 0); + if (!in_thread_list (target, ptid)) + { + if (inferior_ptid.lwp () =3D=3D 0) + thread_change_ptid (target, inferior_ptid, ptid); + else + add_thread (target, ptid); + } + return false; + }; + + nbsd_thread_lister (pid, fn); +} + +/* Implement the "post_attach" target_ops method. */ + +void +nbsd_nat_target::post_attach (int pid) +{ + nbsd_add_threads (this, pid); +} + +/* Implement the "update_thread_list" target_ops method. */ + +void +nbsd_nat_target::update_thread_list () +{ + prune_threads (); + + nbsd_add_threads (this, inferior_ptid.pid ()); +} + +/* Convert PTID to a string. */ + +std::string +nbsd_nat_target::pid_to_str (ptid_t ptid) +{ + int lwp =3D ptid.lwp (); + + if (lwp !=3D 0) + { + pid_t pid =3D ptid.pid (); + + return string_printf ("LWP %d of process %d", lwp, pid); + } + + return normal_pid_to_str (ptid); +} diff --git a/gdb/nbsd-nat.h b/gdb/nbsd-nat.h index a752fbe572d..3606048cd07 100644 =2D-- a/gdb/nbsd-nat.h +++ b/gdb/nbsd-nat.h @@ -22,11 +22,19 @@ #include "inf-ptrace.h" +struct thread_info; + /* A prototype NetBSD target. */ struct nbsd_nat_target : public inf_ptrace_target { char *pid_to_exec_file (int pid) override; + + bool thread_alive (ptid_t ptid) override; + const char *thread_name (struct thread_info *thr) override; + void post_attach (int pid) override; + void update_thread_list () override; + std::string pid_to_str (ptid_t ptid) override; }; #endif /* nbsd-nat.h */ =2D- 2.25.0