Skip to content

Commit 4bad34e

Browse files
Andrew Boieandrewboie
Andrew Boie
authored and
andrewboie
committed
kernel: rename _k_thread_stack_element
Private data type, prefix with z_. Signed-off-by: Andrew Boie <[email protected]>
1 parent f2734ab commit 4bad34e

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
lines changed

‎doc/reference/usermode/kernelobjects.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Kernel Objects
66
A kernel object can be one of three classes of data:
77

88
* A core kernel object, such as a semaphore, thread, pipe, etc.
9-
* A thread stack, which is an array of :c:type:`struct _k_thread_stack_element`
9+
* A thread stack, which is an array of :c:type:`struct z_thread_stack_element`
1010
and declared with :c:macro:`K_THREAD_STACK_DEFINE()`
1111
* A device driver instance (struct device) that belongs to one of a defined
1212
set of subsystems

‎include/arch/arc/arch.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,17 @@ extern "C" {
139139

140140

141141
#define ARCH_THREAD_STACK_DEFINE(sym, size) \
142-
struct _k_thread_stack_element __noinit \
142+
struct z_thread_stack_element __noinit \
143143
__aligned(Z_ARC_THREAD_STACK_ALIGN(size)) \
144144
sym[ARCH_THREAD_STACK_LEN(size)]
145145

146146
#define ARCH_THREAD_STACK_ARRAY_DEFINE(sym, nmemb, size) \
147-
struct _k_thread_stack_element __noinit \
147+
struct z_thread_stack_element __noinit \
148148
__aligned(Z_ARC_THREAD_STACK_ALIGN(size)) \
149149
sym[nmemb][Z_ARC_THREAD_STACK_ARRAY_LEN(size)]
150150

151151
#define ARCH_THREAD_STACK_MEMBER(sym, size) \
152-
struct _k_thread_stack_element \
152+
struct z_thread_stack_element \
153153
__aligned(Z_ARC_THREAD_STACK_ALIGN(size)) \
154154
sym[ARCH_THREAD_STACK_LEN(size)]
155155

‎include/arch/arm/aarch32/arch.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ extern "C" {
198198
#if defined(CONFIG_USERSPACE) && \
199199
defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
200200
#define ARCH_THREAD_STACK_DEFINE(sym, size) \
201-
struct _k_thread_stack_element __noinit \
201+
struct z_thread_stack_element __noinit \
202202
__aligned(POW2_CEIL(size)) sym[POW2_CEIL(size)]
203203
#else
204204
#define ARCH_THREAD_STACK_DEFINE(sym, size) \
205-
struct _k_thread_stack_element __noinit __aligned(STACK_ALIGN) \
205+
struct z_thread_stack_element __noinit __aligned(STACK_ALIGN) \
206206
sym[size+MPU_GUARD_ALIGN_AND_SIZE]
207207
#endif
208208

@@ -216,24 +216,24 @@ extern "C" {
216216
#if defined(CONFIG_USERSPACE) && \
217217
defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
218218
#define ARCH_THREAD_STACK_ARRAY_DEFINE(sym, nmemb, size) \
219-
struct _k_thread_stack_element __noinit \
219+
struct z_thread_stack_element __noinit \
220220
__aligned(POW2_CEIL(size)) \
221221
sym[nmemb][ARCH_THREAD_STACK_LEN(size)]
222222
#else
223223
#define ARCH_THREAD_STACK_ARRAY_DEFINE(sym, nmemb, size) \
224-
struct _k_thread_stack_element __noinit \
224+
struct z_thread_stack_element __noinit \
225225
__aligned(STACK_ALIGN) \
226226
sym[nmemb][ARCH_THREAD_STACK_LEN(size)]
227227
#endif
228228

229229
#if defined(CONFIG_USERSPACE) && \
230230
defined(CONFIG_MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT)
231231
#define ARCH_THREAD_STACK_MEMBER(sym, size) \
232-
struct _k_thread_stack_element __aligned(POW2_CEIL(size)) \
232+
struct z_thread_stack_element __aligned(POW2_CEIL(size)) \
233233
sym[POW2_CEIL(size)]
234234
#else
235235
#define ARCH_THREAD_STACK_MEMBER(sym, size) \
236-
struct _k_thread_stack_element __aligned(STACK_ALIGN) \
236+
struct z_thread_stack_element __aligned(STACK_ALIGN) \
237237
sym[size+MPU_GUARD_ALIGN_AND_SIZE]
238238
#endif
239239

‎include/arch/x86/thread_stack.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ struct z_x86_thread_stack_header {
199199
sizeof(struct z_x86_thread_stack_header)
200200

201201
#define ARCH_THREAD_STACK_DEFINE(sym, size) \
202-
struct _k_thread_stack_element __noinit \
202+
struct z_thread_stack_element __noinit \
203203
__aligned(Z_X86_STACK_BASE_ALIGN) \
204204
sym[ROUND_UP((size), Z_X86_STACK_SIZE_ALIGN) + \
205205
ARCH_THREAD_STACK_RESERVED]
@@ -211,12 +211,12 @@ struct z_x86_thread_stack_header {
211211
ARCH_THREAD_STACK_RESERVED)
212212

213213
#define ARCH_THREAD_STACK_ARRAY_DEFINE(sym, nmemb, size) \
214-
struct _k_thread_stack_element __noinit \
214+
struct z_thread_stack_element __noinit \
215215
__aligned(Z_X86_STACK_BASE_ALIGN) \
216216
sym[nmemb][ARCH_THREAD_STACK_LEN(size)]
217217

218218
#define ARCH_THREAD_STACK_MEMBER(sym, size) \
219-
struct _k_thread_stack_element __aligned(Z_X86_STACK_BASE_ALIGN) \
219+
struct z_thread_stack_element __aligned(Z_X86_STACK_BASE_ALIGN) \
220220
sym[ROUND_UP((size), Z_X86_STACK_SIZE_ALIGN) + \
221221
ARCH_THREAD_STACK_RESERVED]
222222

‎include/kernel.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ union z_object_data {
174174
/* Numerical thread ID for K_OBJ_THREAD */
175175
unsigned int thread_id;
176176

177-
/* Stack buffer size for K_OBJ__THREAD_STACK_ELEMENT */
177+
/* Stack buffer size for K_OBJ_THREAD_STACK_ELEMENT */
178178
size_t stack_size;
179179

180180
/* Futex wait queue and spinlock for K_OBJ_FUTEX */
@@ -403,15 +403,15 @@ static inline void k_obj_free(void *obj)
403403
*
404404
* Stacks should always be created with K_THREAD_STACK_DEFINE().
405405
*/
406-
struct __packed _k_thread_stack_element {
406+
struct __packed z_thread_stack_element {
407407
char data;
408408
};
409409

410410
/**
411411
* @typedef k_thread_stack_t
412-
* @brief Typedef of struct _k_thread_stack_element
412+
* @brief Typedef of struct z_thread_stack_element
413413
*
414-
* @see _k_thread_stack_element
414+
* @see z_thread_stack_element
415415
*/
416416

417417
/**
@@ -5155,7 +5155,7 @@ static inline char *Z_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
51555155
* @req K-TSTACK-001
51565156
*/
51575157
#define K_THREAD_STACK_DEFINE(sym, size) \
5158-
struct _k_thread_stack_element __noinit __aligned(STACK_ALIGN) sym[size]
5158+
struct z_thread_stack_element __noinit __aligned(STACK_ALIGN) sym[size]
51595159

51605160
/**
51615161
* @brief Calculate size of stacks to be allocated in a stack array
@@ -5185,7 +5185,7 @@ static inline char *Z_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
51855185
* @req K-TSTACK-001
51865186
*/
51875187
#define K_THREAD_STACK_ARRAY_DEFINE(sym, nmemb, size) \
5188-
struct _k_thread_stack_element __noinit \
5188+
struct z_thread_stack_element __noinit \
51895189
__aligned(STACK_ALIGN) sym[nmemb][K_THREAD_STACK_LEN(size)]
51905190

51915191
/**
@@ -5202,7 +5202,7 @@ static inline char *Z_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
52025202
* @req K-TSTACK-001
52035203
*/
52045204
#define K_THREAD_STACK_MEMBER(sym, size) \
5205-
struct _k_thread_stack_element __aligned(STACK_ALIGN) sym[size]
5205+
struct z_thread_stack_element __aligned(STACK_ALIGN) sym[size]
52065206

52075207
/**
52085208
* @brief Return the size in bytes of a stack memory region

‎include/sys/arch_interface.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extern "C" {
4141
struct k_thread;
4242
struct k_mem_domain;
4343

44-
typedef struct _k_thread_stack_element k_thread_stack_t;
44+
typedef struct z_thread_stack_element k_thread_stack_t;
4545

4646
typedef void (*k_thread_entry_t)(void *p1, void *p2, void *p3);
4747

‎kernel/thread.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@ k_tid_t z_vrfy_k_thread_create(struct k_thread *new_thread,
648648
Z_OOPS(Z_SYSCALL_OBJ_NEVER_INIT(new_thread, K_OBJ_THREAD));
649649
stack_object = z_object_find(stack);
650650
Z_OOPS(Z_SYSCALL_VERIFY_MSG(z_obj_validation_check(stack_object, stack,
651-
K_OBJ__THREAD_STACK_ELEMENT,
651+
K_OBJ_THREAD_STACK_ELEMENT,
652652
_OBJ_INIT_FALSE) == 0,
653653
"bad stack object"));
654654

‎kernel/userspace.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ void *z_impl_k_object_alloc(enum k_objects otype)
242242
* to request memory that is aligned
243243
*/
244244
__ASSERT(otype > K_OBJ_ANY && otype < K_OBJ_LAST &&
245-
otype != K_OBJ__THREAD_STACK_ELEMENT,
245+
otype != K_OBJ_THREAD_STACK_ELEMENT,
246246
"bad object type requested");
247247

248248
dyn_obj = z_thread_malloc(sizeof(*dyn_obj) + obj_size_get(otype));

‎kernel/userspace_handler.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ static inline void z_vrfy_k_object_release(void *object)
6363
static inline void *z_vrfy_k_object_alloc(enum k_objects otype)
6464
{
6565
Z_OOPS(Z_SYSCALL_VERIFY_MSG(otype > K_OBJ_ANY && otype < K_OBJ_LAST &&
66-
otype != K_OBJ__THREAD_STACK_ELEMENT,
66+
otype != K_OBJ_THREAD_STACK_ELEMENT,
6767
"bad object type %d requested", otype));
6868

6969
return z_impl_k_object_alloc(otype);

‎scripts/elf_helper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def subsystem_to_enum(subsys):
2424

2525

2626
def kobject_to_enum(kobj):
27-
if kobj.startswith("k_") or kobj.startswith("_k_"):
27+
if kobj.startswith("k_") or kobj.startswith("z_"):
2828
name = kobj[2:]
2929
else:
3030
name = kobj
@@ -34,7 +34,7 @@ def kobject_to_enum(kobj):
3434

3535
DW_OP_addr = 0x3
3636
DW_OP_fbreg = 0x91
37-
STACK_TYPE = "_k_thread_stack_element"
37+
STACK_TYPE = "z_thread_stack_element"
3838
thread_counter = 0
3939
sys_mutex_counter = 0
4040
futex_counter = 0

0 commit comments

Comments
 (0)