diff options
| author | Shicheng Chu <[email protected]> | 2023-04-04 21:06:27 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-04-04 09:06:27 -0400 |
| commit | 93f3cb30e48d5de341bda09fa806120e2bc3f3ad (patch) | |
| tree | b23b2343674fecbc3fdfbcd49220488da21472ed /components/libc | |
| parent | 8a52e65013d1abb7cfc032409000533000ccd0c2 (diff) | |
[kernel] 将rt_thread结构体改为显式继承rt_object (#7131)
Diffstat (limited to 'components/libc')
| -rw-r--r-- | components/libc/compilers/common/cstdlib.c | 2 | ||||
| -rw-r--r-- | components/libc/posix/libdl/dlmodule.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/components/libc/compilers/common/cstdlib.c b/components/libc/compilers/common/cstdlib.c index 4a978a106c..64bfbb10e0 100644 --- a/components/libc/compilers/common/cstdlib.c +++ b/components/libc/compilers/common/cstdlib.c @@ -20,7 +20,7 @@ void __rt_libc_exit(int status) if (self != RT_NULL) { - LOG_W("thread:%s exit:%d!", self->name, status); + LOG_W("thread:%s exit:%d!", self->parent.name, status); #ifdef RT_USING_PTHREADS if(self->pthread_data != RT_NULL) { diff --git a/components/libc/posix/libdl/dlmodule.c b/components/libc/posix/libdl/dlmodule.c index 723c8b7b73..eebc5be0f9 100644 --- a/components/libc/posix/libdl/dlmodule.c +++ b/components/libc/posix/libdl/dlmodule.c @@ -197,7 +197,7 @@ struct rt_dlmodule *dlmodule_create(void) void dlmodule_destroy_subthread(struct rt_dlmodule *module, rt_thread_t thread) { - RT_ASSERT(thread->module_id == module); + RT_ASSERT(thread->parent.module_id== module); /* lock scheduler to prevent scheduling in cleanup function. */ rt_enter_critical(); @@ -225,7 +225,7 @@ void dlmodule_destroy_subthread(struct rt_dlmodule *module, rt_thread_t thread) rt_thread_free_sig(thread); #endif - if (thread->type & RT_Object_Class_Static) + if (thread->parent.type & RT_Object_Class_Static) { /* detach object */ rt_object_detach((rt_object_t)thread); @@ -409,7 +409,7 @@ struct rt_dlmodule *dlmodule_self(void) tid = rt_thread_self(); if (tid) { - ret = (struct rt_dlmodule*) tid->module_id; + ret = (struct rt_dlmodule*) tid->parent.module_id; } return ret; @@ -555,7 +555,7 @@ struct rt_dlmodule* dlmodule_exec(const char* pgname, const char* cmd, int cmd_s module->stack_size, module->priority, 10); if (tid) { - tid->module_id = module; + tid->parent.module_id= module; module->main_thread = tid; rt_thread_startup(tid); @@ -732,7 +732,7 @@ struct rt_dlmodule* dlmodule_exec_custom(const char* pgname, const char* cmd, in module->stack_size, module->priority, 10); if (tid) { - tid->module_id = module; + tid->parent.module_id= module; module->main_thread = tid; rt_thread_startup(tid); |