kernel: Rename private memory pool types
Revises the names of 2 types to make them better reflect the
data structures they represent, namely:
- block set: a collection of memory pool blocks of a given size
- quad-block: four contiguous memory pool blocks of a given size
Change-Id: I3e424586e97157eea185fba6836e2e89d10d9cd6
Signed-off-by: Allan Stephens <allan.stephens@windriver.com>
diff --git a/kernel/microkernel/include/micro_private_types.h b/kernel/microkernel/include/micro_private_types.h
index 8be328c..3ce67c8 100644
--- a/kernel/microkernel/include/micro_private_types.h
+++ b/kernel/microkernel/include/micro_private_types.h
@@ -377,15 +377,15 @@
/* ---------------------------------------------------------------------- */
/* KERNEL OBJECT STRUCTURES */
-struct block_stat {
+struct pool_quad_block {
char *mem_blocks;
uint32_t mem_status;
};
-struct pool_block {
+struct pool_block_set {
int block_size;
int nr_of_entries;
- struct block_stat *blocktable;
+ struct pool_quad_block *blocktable;
int count;
};
@@ -397,7 +397,7 @@
struct k_args *waiters;
- struct pool_block *frag_tab;
+ struct pool_block_set *frag_tab;
char *bufblock;
#ifdef CONFIG_DEBUG_TRACING_KERNEL_OBJECTS
diff --git a/kernel/microkernel/k_memory_pool.c b/kernel/microkernel/k_memory_pool.c
index 5af1ada..7ebe622 100644
--- a/kernel/microkernel/k_memory_pool.c
+++ b/kernel/microkernel/k_memory_pool.c
@@ -111,7 +111,7 @@
*/
static void free_existing_block(char *ptr, struct pool_struct *P, int index)
{
- struct block_stat *quad_block = P->frag_tab[index].blocktable;
+ struct pool_quad_block *quad_block = P->frag_tab[index].blocktable;
char *block_ptr;
int i, j;
@@ -157,7 +157,7 @@
int ifraglevel_start, int ifraglevel_stop)
{
int i, j, k;
- struct block_stat *quad_block;
+ struct pool_quad_block *quad_block;
/* process block sets from smallest to largest permitted sizes */
@@ -269,7 +269,7 @@
*
* @return pointer to allocated block, or NULL if none available
*/
-static char *get_existing_block(struct pool_block *pfraglevelinfo,
+static char *get_existing_block(struct pool_block_set *pfraglevelinfo,
int *piblockindex)
{
char *found = NULL;
@@ -328,7 +328,7 @@
{
int i;
char *found, *larger_block;
- struct pool_block *fr_table;
+ struct pool_block_set *fr_table;
/* give up if we've exhausted the set of maximum size blocks */
diff --git a/scripts/sysgen b/scripts/sysgen
index 5c9f0a3..475f29f 100755
--- a/scripts/sysgen
+++ b/scripts/sysgen
@@ -686,12 +686,12 @@
for index in range(0, frag_levels):
kernel_main_c_out(
- "struct block_stat blockstatus_%#010x_%d[%d];\n" %
+ "struct pool_quad_block blockstatus_%#010x_%d[%d];\n" %
(ident, index, block_status_sizes[index]))
# generate memory pool fragmentation descriptor
- kernel_main_c_out("\nstruct pool_block %s[%d] =\n{\n" %
+ kernel_main_c_out("\nstruct pool_block_set %s[%d] =\n{\n" %
(frag_table, frag_levels))
for index in range(0, frag_levels):
kernel_main_c_out(" { %d, %d, blockstatus_%#010x_%d},\n" %
