未验证 提交 5501bf88 编写于 作者: O openharmony_ci 提交者: Gitee

!253 解决动态库卸载时不会触发C++全局和静态对象的析构函数

Merge pull request !253 from lipengzheng_gitee/third_party_musl
......@@ -1850,6 +1850,7 @@ musl_src_porting_file = [
"src/thread/arm/syscall_cp.s",
"src/ldso/dlclose.c",
"ldso/dynlink.c",
"src/exit/atexit.c",
"crt/arm/crti.s",
"crt/aarch64/crti.s",
]
......
#include <stdlib.h>
#include <stdint.h>
#include "libc.h"
#include "lock.h"
/* Ensure that at least 32 atexit handlers can be registered without malloc */
#define COUNT 32
static struct fl
{
struct fl *next;
void (*f[COUNT])(void *);
void *a[COUNT];
void *dso[COUNT];
} builtin, *head;
static int slot;
static volatile int lock[1];
void __funcs_on_exit()
{
void (*func)(void *), *arg;
LOCK(lock);
for (; head; head=head->next, slot=COUNT) while(slot-->0) {
if (head->dso[slot] != NULL) {
func = head->f[slot];
arg = head->a[slot];
UNLOCK(lock);
func(arg);
LOCK(lock);
}
}
UNLOCK(lock);
}
void __cxa_finalize(void *dso)
{
void (*func)(void *), *arg;
LOCK(lock);
for (; head; head=head->next, slot=COUNT) while(slot-->0) {
if (dso == head->dso[slot]) {
func = head->f[slot];
arg = head->a[slot];
UNLOCK(lock);
func(arg);
LOCK(lock);
head->dso[slot] = NULL;
}
}
UNLOCK(lock);
}
int __cxa_atexit(void (*func)(void *), void *arg, void *dso)
{
LOCK(lock);
/* Defer initialization of head so it can be in BSS */
if (!head) head = &builtin;
/* If the current function list is full, add a new one */
if (slot==COUNT) {
struct fl *new_fl = calloc(sizeof(struct fl), 1);
if (!new_fl) {
UNLOCK(lock);
return -1;
}
new_fl->next = head;
head = new_fl;
slot = 0;
}
/* Append function to the list. */
head->f[slot] = func;
head->a[slot] = arg;
head->dso[slot] = dso;
slot++;
UNLOCK(lock);
return 0;
}
static void call(void *p)
{
((void (*)(void))(uintptr_t)p)();
}
int atexit(void (*func)(void))
{
return __cxa_atexit(call, (void *)(uintptr_t)func, 0);
}
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册