maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix FreeBSD build after thread changes 

More work on the GetName/SetName arguments (thread_t vs tid_t) is needed
but this change should restore the build and basic operation.

llvm-svn: 217502
This commit is contained in:
Ed Maste 2014-09-10 13:38:47 +00:00
parent b87899b567
commit 3967764b98
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Host/freebsd/HostThreadFreeBSD.h
View File

@ -25,7 +25,7 @@ class HostThreadFreeBSD : public HostThreadPosix
HostThreadFreeBSD(lldb::thread_t thread);
static void SetName(lldb::thread_t thread, llvm::StringRef name);
static void GetName(lldb::thread_t thread, llvm::SmallVectorImpl<char> &name);
static void GetName(lldb::tid_t tid, llvm::SmallVectorImpl<char> &name);
};
}

6
lldb/source/Host/freebsd/HostThreadFreeBSD.cpp
View File

@ -40,7 +40,7 @@ HostThreadFreeBSD::SetName(lldb::thread_t thread, llvm::StringRef name)
}
void
HostThreadFreeBSD::GetName(lldb::thread_t thread, llvm::SmallVectorImpl<char> &name)
HostThreadFreeBSD::GetName(lldb::tid_t tid, llvm::SmallVectorImpl<char> &name)
{
name.clear();
int pid = Host::GetCurrentProcessID();
@ -73,9 +73,9 @@ HostThreadFreeBSD::GetName(lldb::thread_t thread, llvm::SmallVectorImpl<char> &n
for (size_t i = 0; i < len / sizeof(*kp); i++)
{
if (kp[i].ki_tid == (int)thread)
if (kp[i].ki_tid == (lwpid_t)tid)
{
name.append(kp[i].ki_tdname, strlen(kp[i].ki_tdname));
name.append(kp[i].ki_tdname, kp[i].ki_tdname + strlen(kp[i].ki_tdname));
break;
}
}

3
lldb/source/Host/freebsd/ThisThread.cpp
View File

@ -13,6 +13,7 @@
#include "llvm/ADT/SmallVector.h"
#include <pthread.h>
#include <pthread_np.h>
using namespace lldb_private;
@ -25,5 +26,5 @@ ThisThread::SetName(llvm::StringRef name)
void
ThisThread::GetName(llvm::SmallVectorImpl<char> &name)
{
HostNativeThread::GetName(::pthread_self(), name);
HostNativeThread::GetName(::pthread_getthreadid_np(), name);
}

4
lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
View File

@ -213,8 +213,8 @@ public:
private:
ProcessFreeBSD *m_process;
HostThread m_operation_thread;
HostThread m_monitor_thread;
lldb_private::HostThread m_operation_thread;
lldb_private::HostThread m_monitor_thread;
lldb::pid_t m_pid;
int m_terminal_fd;