Skip to content

Commit

Permalink
Remove use of pthread_getname_np to work with older musl versions
Browse files Browse the repository at this point in the history
  • Loading branch information
trapexit committed Oct 14, 2023
1 parent 8534ee7 commit 569537d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
1 change: 1 addition & 0 deletions DEPENDENCIES
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@
* nonstd::optional: https://github.com/martinmoene/optional-lite
* fmt: https://github.com/fmtlib/fmt
* concurrentqueue: https://github.com/cameron314/concurrentqueue
* scope_guard: https://github.com/Neargye/scope_guard
22 changes: 3 additions & 19 deletions libfuse/include/thread_pool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class ThreadPool
: _queue(),
_queue_depth(0),
_max_queue_depth(std::max(thread_count_,max_queue_depth_)),
_name(get_thread_name(name_))
_name(name_)
{
syslog(LOG_DEBUG,
"threadpool (%s): spawning %u threads w/ max queue depth %u%s",
Expand Down Expand Up @@ -100,19 +100,6 @@ class ThreadPool
}

private:
static
std::string
get_thread_name(std::string const name_)
{
if(!name_.empty())
return name_;

char name[16];
pthread_getname_np(pthread_self(),name,sizeof(name));

return name;
}

static
void*
start_routine(void *arg_)
Expand Down Expand Up @@ -208,12 +195,9 @@ class ThreadPool
}
}

char name[16];
pthread_getname_np(t,name,sizeof(name));
syslog(LOG_DEBUG,
"threadpool (%s): 1 thread removed named '%s'",
_name.c_str(),
name);
"threadpool (%s): 1 thread removed",
_name.c_str());

pthread_exit(NULL);
};
Expand Down

0 comments on commit 569537d

Please sign in to comment.