michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_PoolList to _k_mem_pool_list

Browse source 
Updating global variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: If9b4747ffa6f9dae4cb77717931fed445ae43721
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:25 -05:00 • committed by Anas Nashif
commit 652796d345
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/microkernel/include/minik.h
View file

@ -51,7 +51,7 @@ extern struct mbx_struct _k_mbox_list[];
extern struct mutex_struct _k_mutex_list[]; extern struct mutex_struct _k_mutex_list[];
extern struct sem_struct _k_sem_list[]; extern struct sem_struct _k_sem_list[];
extern struct que_struct _k_fifo_list[]; extern struct que_struct _k_fifo_list[];
extern struct pool_struct K_PoolList[]; extern struct pool_struct _k_mem_pool_list[];
extern struct pipe_struct K_PipeList[]; extern struct pipe_struct K_PipeList[];
#ifndef LITE #ifndef LITE

10
kernel/microkernel/k_mempool.c
View file

@ -61,7 +61,7 @@ void InitPools(void)
char *memptr; char *memptr;
/* for all pools initialise largest blocks */ /* for all pools initialise largest blocks */
for (i = 0, P = K_PoolList; i < K_PoolCount; i++, P++) { for (i = 0, P = _k_mem_pool_list; i < K_PoolCount; i++, P++) {
int remaining = P->nr_of_maxblocks; int remaining = P->nr_of_maxblocks;
int t = 0; int t = 0;
@ -201,7 +201,7 @@ static void defrag(struct pool_struct *P,
void K_Defrag(struct k_args *A) void K_Defrag(struct k_args *A)
{ {
struct pool_struct *P = K_PoolList + OBJ_INDEX(A->Args.p1.poolid); struct pool_struct *P = _k_mem_pool_list + OBJ_INDEX(A->Args.p1.poolid);
defrag(P, defrag(P,
P->nr_of_frags - 1, /* start from smallest blocks */ P->nr_of_frags - 1, /* start from smallest blocks */
@ -424,7 +424,7 @@ static char *rgetblock(struct pool_struct *P, int index, int startindex)
void K_GetBlock_Waiters(struct k_args *A) void K_GetBlock_Waiters(struct k_args *A)
{ {
struct pool_struct *P = K_PoolList + OBJ_INDEX(A->Args.p1.poolid); struct pool_struct *P = _k_mem_pool_list + OBJ_INDEX(A->Args.p1.poolid);
char *found_block; char *found_block;
struct k_args *curr_task, *prev_task; struct k_args *curr_task, *prev_task;
int start_size, offset; int start_size, offset;
@ -502,7 +502,7 @@ void K_gtbltmo(struct k_args *A)
void K_GetBlock(struct k_args *A) void K_GetBlock(struct k_args *A)
{ {
struct pool_struct *P = K_PoolList + OBJ_INDEX(A->Args.p1.poolid); struct pool_struct *P = _k_mem_pool_list + OBJ_INDEX(A->Args.p1.poolid);
char *found_block; char *found_block;
int start_size; int start_size;
@ -609,7 +609,7 @@ void K_RelBlock(struct k_args *A)
Pid = A->Args.p1.poolid; Pid = A->Args.p1.poolid;
P = K_PoolList + OBJ_INDEX(Pid); P = _k_mem_pool_list + OBJ_INDEX(Pid);
/* calculate size */ /* calculate size */
start_size = P->minblock_size; start_size = P->minblock_size;

4
scripts/sysgen.py
View file

@ -670,12 +670,12 @@ def kernel_main_c_pools():
kernel_main_c_out("\nint K_PoolCount = %d;\n" % (total_pools)) kernel_main_c_out("\nint K_PoolCount = %d;\n" % (total_pools))
if (total_pools == 0): if (total_pools == 0):
kernel_main_c_out("\nstruct pool_struct * K_PoolList = NULL;\n") kernel_main_c_out("\nstruct pool_struct * _k_mem_pool_list = NULL;\n")
return return
# start accumulating memory pool descriptor info # start accumulating memory pool descriptor info
pool_descriptors = "\nstruct pool_struct K_PoolList[%d] =\n{\n" % \ pool_descriptors = "\nstruct pool_struct _k_mem_pool_list[%d] =\n{\n" % \
(total_pools) (total_pools)
ident = 0x00010000 ident = 0x00010000