Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compile on mac os #6652

Merged
merged 1 commit into from
Jan 18, 2023
Merged
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion dbms/src/Common/setThreadName.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,15 @@ std::string getThreadName()

std::string getThreadNameAndID()
{
return getThreadName() + "_" + DB::toString(pthread_self());
uint64_t thread_id;
#if defined(__APPLE__)
hehechen marked this conversation as resolved.
Show resolved Hide resolved
int err = pthread_threadid_np(pthread_self(), &thread_id);
if (err)
DB::throwFromErrno("Cannot get thread id with pthread_threadid_np()", DB::ErrorCodes::PTHREAD_ERROR, err);
#elif defined(__FreeBSD__)
thread_id = pthread_getthreadid_np();
#else
thread_id = pthread_self();
#endif
return getThreadName() + "_" + DB::toString(thread_id);
}