yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!549 挑单 pthread_create创建的线程未设置detach属性，主动退出后，OsGetAllTskInfo调用后，相关的任务名为乱码 

Merge pull request !549 from wangchen/exit_3
This commit is contained in:
openharmony_ci 2022-01-18 03:54:25 +00:00 committed by Gitee
parent 307ab396a5 96b2eaeab6
commit 9de6f57cda
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
kal/posix/src/pthread.c
View File

@ -38,6 +38,8 @@
#include "los_config.h" #include "los_config.h"
#include "los_task.h" #include "los_task.h"
#define PTHREAD_DEFAULT_NAME "pthread"
#define PTHREAD_DEFAULT_NAME_LEN 8
#define PTHREAD_NAMELEN 16 #define PTHREAD_NAMELEN 16
typedef struct { typedef struct {
@ -51,7 +53,7 @@ static void *PthreadEntry(UINT32 param)
PthreadData *pthreadData = (PthreadData *)(UINTPTR)param; PthreadData *pthreadData = (PthreadData *)(UINTPTR)param;
void *(*startRoutine)(void *) = pthreadData->startRoutine; void *(*startRoutine)(void *) = pthreadData->startRoutine;
void *ret = startRoutine(pthreadData->param); void *ret = startRoutine(pthreadData->param);
free(pthreadData); pthread_exit(ret);
return ret; return ret;
} }
@ -69,7 +71,8 @@ static int PthreadCreateAttrInit(const pthread_attr_t *attr, void *(*startRoutin
INT32 policy = 0; INT32 policy = 0;
pthread_attr_t attrTmp; pthread_attr_t attrTmp;
INT32 ret; INT32 ret;
errno_t error;
if (!attr) { if (!attr) {
(VOID)pthread_attr_init(&attrTmp); (VOID)pthread_attr_init(&attrTmp);
threadAttr = &attrTmp; threadAttr = &attrTmp;
@ -97,6 +100,11 @@ static int PthreadCreateAttrInit(const pthread_attr_t *attr, void *(*startRoutin
return ENOMEM; return ENOMEM;
} }
error = memcpy_s(pthreadData->name, PTHREAD_NAMELEN, PTHREAD_DEFAULT_NAME, PTHREAD_DEFAULT_NAME_LEN);
if (error != EOK) {
free(pthreadData);
return error;
}
pthreadData->startRoutine = startRoutine; pthreadData->startRoutine = startRoutine;
pthreadData->param = arg; pthreadData->param = arg;
taskInitParam->pcName = pthreadData->name; taskInitParam->pcName = pthreadData->name;
@ -129,9 +137,6 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
return EINVAL; return EINVAL;
} }
/* set pthread default name */
(void)sprintf_s(taskInitParam.pcName, PTHREAD_NAMELEN, "pthread%u", taskID);
(void)LOS_TaskResume(taskID); (void)LOS_TaskResume(taskID);
*thread = (pthread_t)taskID; *thread = (pthread_t)taskID;
@ -219,9 +224,16 @@ int pthread_detach(pthread_t thread)
void pthread_exit(void *retVal) void pthread_exit(void *retVal)
{ {
UINT32 intSave;
LosTaskCB *tcb = OS_TCB_FROM_TID(LOS_CurTaskIDGet()); LosTaskCB *tcb = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
tcb->joinRetval = (UINTPTR)retVal; tcb->joinRetval = (UINTPTR)retVal;
free((PthreadData *)(UINTPTR)tcb->arg); PthreadData *pthreadData = (PthreadData *)(UINTPTR)tcb->arg;
intSave = LOS_IntLock();
tcb->taskName = PTHREAD_DEFAULT_NAME;
LOS_IntRestore(intSave);
free(pthreadData);
(void)LOS_TaskDelete(tcb->taskID); (void)LOS_TaskDelete(tcb->taskID);
} }
@ -240,6 +252,11 @@ int pthread_setname_np(pthread_t thread, const char *name)
taskCB = OS_TCB_FROM_TID((UINT32)thread); taskCB = OS_TCB_FROM_TID((UINT32)thread);
intSave = LOS_IntLock(); intSave = LOS_IntLock();
if (taskCB->taskStatus & OS_TASK_STATUS_EXIT) {
LOS_IntRestore(intSave);
return EINVAL;
}
if (taskCB->taskEntry == PthreadEntry) { if (taskCB->taskEntry == PthreadEntry) {
(void)strcpy_s(taskName, PTHREAD_NAMELEN, name); (void)strcpy_s(taskName, PTHREAD_NAMELEN, name);
} else { } else {