[lldb] [Process/NetBSD] Implement thread name getting

Implement thread name getting sysctl() on NetBSD.  Also fix
the incorrect type in pthread_setname_np() in the relevant test.

Differential Revision: https://reviews.llvm.org/D70363
This commit is contained in:
Michał Górny 2019-11-17 22:01:19 +01:00
parent e8924d6403
commit 23a766dcad
3 changed files with 39 additions and 3 deletions

View File

@ -30,7 +30,6 @@ class TestGdbRemoteThreadName(gdbremote_testcase.GdbRemoteTestCaseBase):
self.assertEqual(expected_name, kv_dict.get("name"))
@skipIfWindows # the test is not updated for Windows.
@skipIfNetBSD # build failure due to pthread_setname_np prototype
@llgs_test
def test(self):
""" Make sure lldb-server can retrieve inferior thread name"""

View File

@ -9,7 +9,7 @@ void set_thread_name(const char *name) {
#elif defined(__linux__)
::pthread_setname_np(::pthread_self(), name);
#elif defined(__NetBSD__)
::pthread_setname_np(::pthread_self(), "%s", name);
::pthread_setname_np(::pthread_self(), "%s", const_cast<char *>(name));
#endif
}

View File

@ -16,9 +16,15 @@
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/RegisterValue.h"
#include "lldb/Utility/State.h"
#include "llvm/Support/Errno.h"
#include <sstream>
// clang-format off
#include <sys/types.h>
#include <sys/sysctl.h>
// clang-format on
using namespace lldb;
using namespace lldb_private;
using namespace lldb_private::process_netbsd;
@ -105,7 +111,38 @@ void NativeThreadNetBSD::SetStepping() {
m_stop_info.reason = StopReason::eStopReasonNone;
}
std::string NativeThreadNetBSD::GetName() { return std::string(""); }
std::string NativeThreadNetBSD::GetName() {
Log *log(ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_THREAD));
std::vector<struct kinfo_lwp> infos;
int mib[5] = {CTL_KERN, KERN_LWP, static_cast<int>(m_process.GetID()),
sizeof(struct kinfo_lwp), 0};
size_t size;
if (::sysctl(mib, 5, nullptr, &size, nullptr, 0) == -1 || size == 0) {
LLDB_LOG(log, "sysctl() for LWP info size failed: {0}",
llvm::sys::StrError());
return "";
}
mib[4] = size / sizeof(size_t);
infos.resize(size / sizeof(struct kinfo_lwp));
if (sysctl(mib, 5, infos.data(), &size, NULL, 0) == -1 || size == 0) {
LLDB_LOG(log, "sysctl() for LWP info failed: {0}", llvm::sys::StrError());
return "";
}
size_t nlwps = size / sizeof(struct kinfo_lwp);
for (size_t i = 0; i < nlwps; i++) {
if (static_cast<lldb::tid_t>(infos[i].l_lid) == m_tid) {
return infos[i].l_name;
}
}
LLDB_LOG(log, "unable to find lwp {0} in LWP infos", m_tid);
return "";
}
lldb::StateType NativeThreadNetBSD::GetState() { return m_state; }