RT-Thread/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-10-19 20:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

【修复】armclang cpp11 内存泄漏及编译警告问题

Browse Source
This commit is contained in:
guozhanxin
2021-12-09 20:31:12 +08:00
committed by Bernard Xiong
parent 67a39f62e5
commit acc62c1e3d
2 changed files with 391 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/cplusplus/cpp11/armclang/thread.cpp
View File

@@ -13,19 +13,18 @@
#include <cstdio>
#include <pthread.h>
#define CPP11_DEFAULT_ID_OFFSET 1
extern "C" int __ARM_TPL_thread_create(__ARM_TPL_thread_t *__t,
void *(*__func)(void *),
void *__arg)
{
int ret = 0;
/* TODO memory leek */
pthread_t *pid = (pthread_t *)rt_malloc(sizeof(pthread_t));
if (pid == nullptr)
return -1;
ret = pthread_create(pid, RT_NULL, __func, __arg);
pthread_t pid;
ret = pthread_create(&pid, RT_NULL, __func, __arg);
if (ret == 0)
{
__t->data = (std::uintptr_t)pid;
__t->data = (std::uintptr_t)pid + CPP11_DEFAULT_ID_OFFSET;
return 0;
}
return -1;
@@ -50,18 +49,18 @@ extern "C" __ARM_TPL_thread_id __ARM_TPL_thread_get_current_id()
extern "C" __ARM_TPL_thread_id __ARM_TPL_thread_get_id(
const __ARM_TPL_thread_t *__t)
{
return (__ARM_TPL_thread_id)((*(pthread_t *)__t->data));
return (__ARM_TPL_thread_id)(((pthread_t)__t->data - CPP11_DEFAULT_ID_OFFSET));
}
extern "C" int __ARM_TPL_thread_join(__ARM_TPL_thread_t *__t)
{
pthread_join((*(pthread_t *)__t->data), RT_NULL);
pthread_join(((pthread_t)__t->data - CPP11_DEFAULT_ID_OFFSET), RT_NULL);
return 0;
}
extern "C" int __ARM_TPL_thread_detach(__ARM_TPL_thread_t *__t)
{
pthread_detach((*(pthread_t *)__t->data));
pthread_detach(((pthread_t)__t->data - CPP11_DEFAULT_ID_OFFSET));
return 0;
}