Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Re-adding getThreadName() and setThreadName() to Log.cpp. #73

Merged
merged 1 commit into from
May 3, 2016
Merged

Re-adding getThreadName() and setThreadName() to Log.cpp. #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libdevcore/Log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ extern "C" __declspec(dllimport) void __stdcall OutputDebugStringA(const char* l

string dev::getThreadName()
{
#if defined(__APPLE__)
#if defined(__GLIBC__) || defined(__APPLE__)
char buffer[128];
pthread_getname_np(pthread_self(), buffer, 127);
buffer[127] = 0;
Expand All @@ -187,7 +187,9 @@ string dev::getThreadName()

void dev::setThreadName(string const& _n)
{
#if defined(__APPLE__)
#if defined(__GLIBC__)
pthread_setname_np(pthread_self(), _n.c_str());
#elif defined(__APPLE__)
pthread_setname_np(_n.c_str());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing the # at the start

Copy link
Contributor

@rainbreak rainbreak May 3, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously there were different pathways for linux and apple. Linux used

pthread_setname_np(pthread_self(), _n.c_str());

getname was the same usage. I guess apple provides implicit thread_self. Edit: yep, apple can only set the name of the current thread.

#else
g_logThreadName.m_name.reset(new std::string(_n));
Expand Down
22 changes: 22 additions & 0 deletions libdevcore/Log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,28 @@ class ThreadContext
};

/// Set the current thread's log name.
///
/// It appears that there is not currently any cross-platform way of setting
/// thread names either in Boost or in the C++11 runtime libraries. What is
/// more, the API for 'pthread_setname_np' is not even consistent across
/// platforms which implement it.
///
/// A proposal to add such functionality on the Boost mailing list, which
/// I assume never happened, but which I should follow-up and ask about.
/// http://boost.2283326.n4.nabble.com/Adding-an-option-to-set-the-name-of-a-boost-thread-td4638283.html
///
/// man page for 'pthread_setname_np', including this crucial snippet of
/// information ... "These functions are nonstandard GNU extensions."
/// http://man7.org/linux/man-pages/man3/pthread_setname_np.3.html
///
/// Stack Overflow "Can I set the name of a thread in pthreads / linux?"
/// which includes useful information on the minor API differences between
/// Linux, BSD and OS X.
/// http://stackoverflow.com/questions/2369738/can-i-set-the-name-of-a-thread-in-pthreads-linux/7989973#7989973
///
/// musl mailng list posting "pthread set name on MIPs" which includes the
/// information that musl doesn't currently implement 'pthread_setname_np'
/// https://marc.info/?l=musl&m=146171729013062&w=1
void setThreadName(std::string const& _n);

/// Set the current thread's log name.
Expand Down