michaelh/zephyr
1
0
Fork 0
Code Releases Activity

kernel: userspace: rename obj_list in struct dyn_obj

Browse source 
This renames the obj_list element in struct dyn_obj to
dobj_list, to avoid identifier collision with the static
obj_list defined in userspace.c.

Violation of MISRA rule 5.9.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
This commit is contained in:
Daniel Leung 2021-04-27 11:49:30 -07:00 • committed by Anas Nashif
commit abfe045fd3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
kernel/userspace.c
View file

@ -134,7 +134,7 @@ uint8_t *z_priv_stack_find(k_thread_stack_t *stack)
struct dyn_obj { struct dyn_obj {
struct z_object kobj; struct z_object kobj;
sys_dnode_t obj_list; sys_dnode_t dobj_list;
struct rbnode node; /* must be immediately before data member */ struct rbnode node; /* must be immediately before data member */
/* The object itself */ /* The object itself */
@ -321,7 +321,7 @@ struct z_object *z_dynamic_object_aligned_create(size_t align, size_t size)
k_spinlock_key_t key = k_spin_lock(&lists_lock); k_spinlock_key_t key = k_spin_lock(&lists_lock);
rb_insert(&obj_rb_tree, &dyn->node); rb_insert(&obj_rb_tree, &dyn->node);
sys_dlist_append(&obj_list, &dyn->obj_list); sys_dlist_append(&obj_list, &dyn->dobj_list);
k_spin_unlock(&lists_lock, key); k_spin_unlock(&lists_lock, key);
return &dyn->kobj; return &dyn->kobj;
@ -395,7 +395,7 @@ void k_object_free(void *obj)
dyn = dyn_object_find(obj); dyn = dyn_object_find(obj);
if (dyn != NULL) { if (dyn != NULL) {
rb_remove(&obj_rb_tree, &dyn->node); rb_remove(&obj_rb_tree, &dyn->node);
sys_dlist_remove(&dyn->obj_list); sys_dlist_remove(&dyn->dobj_list);
if (dyn->kobj.type == K_OBJ_THREAD) { if (dyn->kobj.type == K_OBJ_THREAD) {
thread_idx_free(dyn->kobj.data.thread_id); thread_idx_free(dyn->kobj.data.thread_id);
@ -438,7 +438,7 @@ void z_object_wordlist_foreach(_wordlist_cb_func_t func, void *context)
k_spinlock_key_t key = k_spin_lock(&lists_lock); k_spinlock_key_t key = k_spin_lock(&lists_lock);
SYS_DLIST_FOR_EACH_CONTAINER_SAFE(&obj_list, obj, next, obj_list) { SYS_DLIST_FOR_EACH_CONTAINER_SAFE(&obj_list, obj, next, dobj_list) {
func(&obj->kobj, context); func(&obj->kobj, context);
} }
k_spin_unlock(&lists_lock, key); k_spin_unlock(&lists_lock, key);
@ -499,7 +499,7 @@ static void unref_check(struct z_object *ko, uintptr_t index)
} }
rb_remove(&obj_rb_tree, &dyn->node); rb_remove(&obj_rb_tree, &dyn->node);
sys_dlist_remove(&dyn->obj_list); sys_dlist_remove(&dyn->dobj_list);
k_free(dyn); k_free(dyn);
out: out:
#endif #endif