Skip to content

兼容Alpine镜像打包 #223

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

兼容Alpine镜像打包 #223

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de9bcd0
修复在apphi下的pthread_getname_np 函数不存在的问题 兼容musl libc
ixingqiao Mar 28, 2024
7152c41
Merge branch 'ZLMediaKit:master' into master
ixingqiao Apr 22, 2024
808126b
Merge branch 'ZLMediaKit:master' into master
ixingqiao May 30, 2024
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
4 changes: 3 additions & 1 deletion src/Util/util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,9 @@ string getThreadName() {
string ret;
ret.resize(32);
auto tid = pthread_self();
pthread_getname_np(tid, (char *) ret.data(), ret.size());
#if defined(__GLIBC__)
Copy link
Member

Choose a reason for hiding this comment

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

这个代码如果被屏蔽了 那用什么替代这个功能呢？

Copy link
Author

Choose a reason for hiding this comment

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

若是不支持的话，就是走后面的默认逻辑了，以tid替代相应的name

pthread_getname_np(tid, (char*)ret.data(), ret.size());
#endif
if (ret[0]) {
ret.resize(strlen(ret.data()));
return ret;
Expand Down