Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Musl
提交
44b4d09f
T
Third Party Musl
项目概览
OpenHarmony
/
Third Party Musl
接近 2 年 前同步成功
通知
37
Star
125
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Musl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
44b4d09f
编写于
6月 03, 2013
作者:
R
Rich Felker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ensure that thread dtv pointer is never null to optimize __tls_get_addr
上级
d9265653
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
4 deletion
+6
-4
src/ldso/dynlink.c
src/ldso/dynlink.c
+4
-4
src/thread/pthread_self.c
src/thread/pthread_self.c
+2
-0
未找到文件。
src/ldso/dynlink.c
浏览文件 @
44b4d09f
...
@@ -740,13 +740,13 @@ void *__copy_tls(unsigned char *mem)
...
@@ -740,13 +740,13 @@ void *__copy_tls(unsigned char *mem)
void
*
__tls_get_addr
(
size_t
*
v
)
void
*
__tls_get_addr
(
size_t
*
v
)
{
{
pthread_t
self
=
__pthread_self
();
pthread_t
self
=
__pthread_self
();
if
(
self
->
dtv
&&
v
[
0
]
<=
(
size_t
)
self
->
dtv
[
0
]
&&
self
->
dtv
[
v
[
0
]])
if
(
v
[
0
]
<=
(
size_t
)
self
->
dtv
[
0
]
&&
self
->
dtv
[
v
[
0
]])
return
(
char
*
)
self
->
dtv
[
v
[
0
]]
+
v
[
1
];
return
(
char
*
)
self
->
dtv
[
v
[
0
]]
+
v
[
1
];
/* Block signals to make accessing new TLS async-signal-safe */
/* Block signals to make accessing new TLS async-signal-safe */
sigset_t
set
;
sigset_t
set
;
pthread_sigmask
(
SIG_BLOCK
,
SIGALL_SET
,
&
set
);
pthread_sigmask
(
SIG_BLOCK
,
SIGALL_SET
,
&
set
);
if
(
self
->
dtv
&&
v
[
0
]
<=
(
size_t
)
self
->
dtv
[
0
]
&&
self
->
dtv
[
v
[
0
]])
{
if
(
v
[
0
]
<=
(
size_t
)
self
->
dtv
[
0
]
&&
self
->
dtv
[
v
[
0
]])
{
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
0
);
pthread_sigmask
(
SIG_SETMASK
,
&
set
,
0
);
return
(
char
*
)
self
->
dtv
[
v
[
0
]]
+
v
[
1
];
return
(
char
*
)
self
->
dtv
[
v
[
0
]]
+
v
[
1
];
}
}
...
@@ -759,10 +759,10 @@ void *__tls_get_addr(size_t *v)
...
@@ -759,10 +759,10 @@ void *__tls_get_addr(size_t *v)
for
(
p
=
head
;
p
->
tls_id
!=
v
[
0
];
p
=
p
->
next
);
for
(
p
=
head
;
p
->
tls_id
!=
v
[
0
];
p
=
p
->
next
);
/* Get new DTV space from new DSO if needed */
/* Get new DTV space from new DSO if needed */
if
(
!
self
->
dtv
||
v
[
0
]
>
(
size_t
)
self
->
dtv
[
0
])
{
if
(
v
[
0
]
>
(
size_t
)
self
->
dtv
[
0
])
{
void
**
newdtv
=
p
->
new_dtv
+
void
**
newdtv
=
p
->
new_dtv
+
(
v
[
0
]
+
1
)
*
sizeof
(
void
*
)
*
a_fetch_add
(
&
p
->
new_dtv_idx
,
1
);
(
v
[
0
]
+
1
)
*
sizeof
(
void
*
)
*
a_fetch_add
(
&
p
->
new_dtv_idx
,
1
);
if
(
self
->
dtv
)
memcpy
(
newdtv
,
self
->
dtv
,
memcpy
(
newdtv
,
self
->
dtv
,
((
size_t
)
self
->
dtv
[
0
]
+
1
)
*
sizeof
(
void
*
));
((
size_t
)
self
->
dtv
[
0
]
+
1
)
*
sizeof
(
void
*
));
newdtv
[
0
]
=
(
void
*
)
v
[
0
];
newdtv
[
0
]
=
(
void
*
)
v
[
0
];
self
->
dtv
=
newdtv
;
self
->
dtv
=
newdtv
;
...
...
src/thread/pthread_self.c
浏览文件 @
44b4d09f
...
@@ -17,6 +17,8 @@ static int init_main_thread()
...
@@ -17,6 +17,8 @@ static int init_main_thread()
main_thread
->
self
=
main_thread
;
main_thread
->
self
=
main_thread
;
main_thread
->
tid
=
main_thread
->
pid
=
main_thread
->
tid
=
main_thread
->
pid
=
__syscall
(
SYS_set_tid_address
,
&
main_thread
->
tid
);
__syscall
(
SYS_set_tid_address
,
&
main_thread
->
tid
);
if
(
!
main_thread
->
dtv
)
main_thread
->
dtv
=
(
void
*
)
dummy
;
libc
.
main_thread
=
main_thread
;
libc
.
main_thread
=
main_thread
;
return
0
;
return
0
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录