Rename struct slab_alloc to struct slab_allocator.

We have a function with the following signature:

  void *slab_alloc(struct slab_alloc *);

which produces the following error message with g++:

  error: ‘void* slab_alloc(slab_alloc*)’ hides constructor for ‘struct
  slab_alloc’ [-Werror=shadow]

The two easy ways out are 1) renaming the function or 2) renaming the struct.
For clarity (and consistency with malloc and co) I've chosen to rename the
struct to "struct slab_allocator".

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>

diff --git a/include/arch/arm/barrelfish/core_state_arch.h b/include/arch/arm/barrelfish/core_state_arch.h
index 8bbd2a2..a05fd59 100644 (file)
--- a/include/arch/arm/barrelfish/core_state_arch.h
+++ b/include/arch/arm/barrelfish/core_state_arch.h
@@ -27,8 +27,8 @@ struct pinned_state {
     struct memobj_pinned memobj;
     struct vregion vregion;
     lvaddr_t offset;
-    struct slab_alloc vregion_list_slab;
-    struct slab_alloc frame_list_slab;
+    struct slab_allocator vregion_list_slab;
+    struct slab_allocator frame_list_slab;
 };
 
 struct core_state_arch {

diff --git a/include/arch/x86/barrelfish/core_state_arch.h b/include/arch/x86/barrelfish/core_state_arch.h
index 2dcb577..9b64b4a 100644 (file)
--- a/include/arch/x86/barrelfish/core_state_arch.h
+++ b/include/arch/x86/barrelfish/core_state_arch.h
@@ -27,8 +27,8 @@ struct pinned_state {
     struct memobj_pinned memobj;
     struct vregion vregion;
     lvaddr_t offset;
-    struct slab_alloc vregion_list_slab;
-    struct slab_alloc frame_list_slab;
+    struct slab_allocator vregion_list_slab;
+    struct slab_allocator frame_list_slab;
 };
 
 struct core_state_arch {

diff --git a/include/barrelfish/memobj.h b/include/barrelfish/memobj.h
index efe0c81..180ba77 100644 (file)
--- a/include/barrelfish/memobj.h
+++ b/include/barrelfish/memobj.h
@@ -109,9 +109,9 @@ struct memobj_frame_list {
 struct memobj_anon {
     struct memobj m;
     struct vregion_list *vregion_list;    ///< List of vregions mapped into the obj
-    struct slab_alloc vregion_slab;       ///< Slab to back the vregion list
+    struct slab_allocator vregion_slab;       ///< Slab to back the vregion list
     struct memobj_frame_list *frame_list; ///< List of frames tracked by the obj
-    struct slab_alloc frame_slab;         ///< Slab to back the frame list
+    struct slab_allocator frame_slab;         ///< Slab to back the frame list
 };
 
 /**

diff --git a/include/barrelfish/slab.h b/include/barrelfish/slab.h
index f1aecb8..7778b79 100644 (file)
--- a/include/barrelfish/slab.h
+++ b/include/barrelfish/slab.h
@@ -20,10 +20,10 @@
 __BEGIN_DECLS
 
 // forward declarations
-struct slab_alloc;
+struct slab_allocator;
 struct block_head;
 
-typedef errval_t (*slab_refill_func_t)(struct slab_alloc *slabs);
+typedef errval_t (*slab_refill_func_t)(struct slab_allocator *slabs);
 
 struct slab_head {
     struct slab_head *next; ///< Next slab in the allocator
@@ -33,19 +33,19 @@ struct slab_head {
 
 struct slot_allocator;
 
-struct slab_alloc {
+struct slab_allocator {
     struct slab_head *slabs;    ///< Pointer to list of slabs
     size_t blocksize;           ///< Size of blocks managed by this allocator
     slab_refill_func_t refill_func;  ///< Refill function
 };
 
-void slab_init(struct slab_alloc *slabs, size_t blocksize,
+void slab_init(struct slab_allocator *slabs, size_t blocksize,
                slab_refill_func_t refill_func);
-void slab_grow(struct slab_alloc *slabs, void *buf, size_t buflen);
-void *slab_alloc(struct slab_alloc *slabs);
-void slab_free(struct slab_alloc *slabs, void *block);
-size_t slab_freecount(struct slab_alloc *slabs);
-errval_t slab_default_refill(struct slab_alloc *slabs);
+void slab_grow(struct slab_allocator *slabs, void *buf, size_t buflen);
+void *slab_alloc(struct slab_allocator *slabs);
+void slab_free(struct slab_allocator *slabs, void *block);
+size_t slab_freecount(struct slab_allocator *slabs);
+errval_t slab_default_refill(struct slab_allocator *slabs);
 
 // size of block header
 #define SLAB_BLOCK_HDRSIZE (sizeof(void *))

diff --git a/include/barrelfish/slot_alloc.h b/include/barrelfish/slot_alloc.h
index da25dd1..f1d6cdb 100644 (file)
--- a/include/barrelfish/slot_alloc.h
+++ b/include/barrelfish/slot_alloc.h
@@ -43,7 +43,7 @@ struct single_slot_allocator {
     struct capref cap;          ///< Cap of the cnode the allocator is tracking
     struct cnoderef cnode;      ///< Cnode the allocator is tracking
     struct cnode_meta *head;    ///< Linked list of free slots
-    struct slab_alloc slab;     ///< Slab for backing the list
+    struct slab_allocator slab;     ///< Slab for backing the list
 };
 
 struct slot_allocator_list {
@@ -58,7 +58,7 @@ struct multi_slot_allocator {
     struct slot_allocator_list *head; ///< List of single slot allocators
     struct slot_allocator_list *reserve; ///< One single allocator in reserve
 
-    struct slab_alloc slab;      ///< Slab backing the slot_allocator_list
+    struct slab_allocator slab;      ///< Slab backing the slot_allocator_list
 
     struct vspace_mmu_aware mmu_state;
 };
@@ -67,7 +67,7 @@ struct range_slot_allocator {
     struct capref cnode_cap;     ///< capref for the cnode
     struct cnoderef cnode;       ///< cnoderef for the cnode to allocate from
     struct cnode_meta *meta;     ///< Linked list of meta data
-    struct slab_alloc slab;      ///< Slab allocation
+    struct slab_allocator slab;      ///< Slab allocation
     struct thread_mutex mutex;   ///< Mutex for thread safety
 };
 

diff --git a/include/mm/mm.h b/include/mm/mm.h
index 1415183..ad758b8 100644 (file)
--- a/include/mm/mm.h
+++ b/include/mm/mm.h
@@ -49,7 +49,7 @@ struct mmnode {
  * them to allocate its memory, we declare it in the public header.
  */
 struct mm {
-    struct slab_alloc slabs;///< Slab allocator used for allocating nodes
+    struct slab_allocator slabs;///< Slab allocator used for allocating nodes
     slot_alloc_t slot_alloc;///< Slot allocator for allocating cspace
     void *slot_alloc_inst;  ///< Opaque instance pointer for slot allocator
     struct mmnode *root;    ///< Root node

diff --git a/include/target/arm/barrelfish/pmap_target.h b/include/target/arm/barrelfish/pmap_target.h
index 88666b0..36fc07d 100644 (file)
--- a/include/target/arm/barrelfish/pmap_target.h
+++ b/include/target/arm/barrelfish/pmap_target.h
@@ -41,7 +41,7 @@ struct pmap_arm {
     struct vregion vregion;     ///< Vregion used to reserve virtual address for metadata
     genvaddr_t vregion_offset;  ///< Offset into amount of reserved virtual address used
     struct vnode root;          ///< Root of the vnode tree
-    struct slab_alloc slab;     ///< Slab allocator for the vnode lists
+    struct slab_allocator slab;     ///< Slab allocator for the vnode lists
     uint8_t slab_buffer[512];   ///< Initial buffer to back the allocator
 };
 

diff --git a/include/target/x86/barrelfish/pmap_target.h b/include/target/x86/barrelfish/pmap_target.h
index 27ac196..ffbdbee 100644 (file)
--- a/include/target/x86/barrelfish/pmap_target.h
+++ b/include/target/x86/barrelfish/pmap_target.h
@@ -42,7 +42,7 @@ struct pmap_x86 {
     genvaddr_t vregion_offset;  ///< Offset into amount of reserved virtual address used
     struct vnode root;          ///< Root of the vnode tree
     errval_t (*refill_slabs)(struct pmap_x86 *); ///< Function to refill slabs
-    struct slab_alloc slab;     ///< Slab allocator for the vnode lists
+    struct slab_allocator slab;     ///< Slab allocator for the vnode lists
     genvaddr_t min_mappable_va; ///< Minimum mappable virtual address
     genvaddr_t max_mappable_va; ///< Maximum mappable virtual address
     uint8_t slab_buffer[512];   ///< Initial buffer to back the allocator

diff --git a/lib/barrelfish/slab.c b/lib/barrelfish/slab.c
index 1a39385..0dc7f38 100644 (file)
--- a/lib/barrelfish/slab.c
+++ b/lib/barrelfish/slab.c
@@ -32,7 +32,7 @@ STATIC_ASSERT_SIZEOF(struct block_head, SLAB_BLOCK_HDRSIZE);
  * \param blocksize Size of blocks to be allocated by this allocator
  * \param refill_func Pointer to function to call when out of memory (or NULL)
  */
-void slab_init(struct slab_alloc *slabs, size_t blocksize,
+void slab_init(struct slab_allocator *slabs, size_t blocksize,
                slab_refill_func_t refill_func)
 {
     slabs->slabs = NULL;
@@ -48,7 +48,7 @@ void slab_init(struct slab_alloc *slabs, size_t blocksize,
  * \param buf Pointer to start of memory region
  * \param buflen Size of memory region (in bytes)
  */
-void slab_grow(struct slab_alloc *slabs, void *buf, size_t buflen)
+void slab_grow(struct slab_allocator *slabs, void *buf, size_t buflen)
 {
     /* setup slab_head structure at top of buffer */
     assert(buflen > sizeof(struct slab_head));
@@ -83,7 +83,7 @@ void slab_grow(struct slab_alloc *slabs, void *buf, size_t buflen)
  *
  * \returns Pointer to block on success, NULL on error (out of memory)
  */
-void *slab_alloc(struct slab_alloc *slabs)
+void *slab_alloc(struct slab_allocator *slabs)
 {
     errval_t err;
     /* find a slab with free blocks */
@@ -122,7 +122,7 @@ void *slab_alloc(struct slab_alloc *slabs)
  * \param slabs Pointer to slab allocator instance
  * \param block Pointer to block previously returned by #slab_alloc
  */
-void slab_free(struct slab_alloc *slabs, void *block)
+void slab_free(struct slab_allocator *slabs, void *block)
 {
     if (block == NULL) {
         return;
@@ -157,7 +157,7 @@ void slab_free(struct slab_alloc *slabs, void *block)
  *
  * \returns Free block count
  */
-size_t slab_freecount(struct slab_alloc *slabs)
+size_t slab_freecount(struct slab_allocator *slabs)
 {
     size_t ret = 0;
 
@@ -176,7 +176,7 @@ size_t slab_freecount(struct slab_alloc *slabs)
  * \param slabs Pointer to slab allocator instance
  * \param bytes (Minimum) amount of memory to map
  */
-static errval_t slab_refill_pages(struct slab_alloc *slabs, size_t bytes)
+static errval_t slab_refill_pages(struct slab_allocator *slabs, size_t bytes)
 {
     errval_t err;
     struct capref frame_cap;
@@ -204,7 +204,7 @@ static errval_t slab_refill_pages(struct slab_alloc *slabs, size_t bytes)
  *
  * \param slabs Pointer to slab allocator instance
  */
-errval_t slab_default_refill(struct slab_alloc *slabs)
+errval_t slab_default_refill(struct slab_allocator *slabs)
 {
     return slab_refill_pages(slabs, BASE_PAGE_SIZE);
 }

diff --git a/lib/barrelfish/threads.c b/lib/barrelfish/threads.c
index 9836e7f..0c0950b 100644 (file)
--- a/lib/barrelfish/threads.c
+++ b/lib/barrelfish/threads.c
@@ -61,7 +61,7 @@ static struct thread staticthread = {
 static struct thread_mutex staticthread_lock = THREAD_MUTEX_INITIALIZER;
 
 /// Storage metadata for thread structures (and TLS data)
-static struct slab_alloc thread_slabs;
+static struct slab_allocator thread_slabs;
 static struct vspace_mmu_aware thread_slabs_vm;
 
 // XXX: mutex and spinlock protecting thread slabs in spanned domains
@@ -205,7 +205,7 @@ void thread_remove_from_queue(struct thread **queue, struct thread *thread)
 }
 
 /// Refill backing storage for thread region
-static errval_t refill_thread_slabs(struct slab_alloc *slabs)
+static errval_t refill_thread_slabs(struct slab_allocator *slabs)
 {
     assert(slabs == &thread_slabs);
 

diff --git a/lib/barrelfish/vspace/pinned.c b/lib/barrelfish/vspace/pinned.c
index d87035b..10b2b21 100644 (file)
--- a/lib/barrelfish/vspace/pinned.c
+++ b/lib/barrelfish/vspace/pinned.c
@@ -81,7 +81,7 @@ errval_t vspace_pinned_alloc(void **retbuf, enum slab_type slab_type)
     struct pinned_state *state = get_current_pinned_state();
 
     // Select slab type
-    struct slab_alloc *slab;
+    struct slab_allocator *slab;
     switch(slab_type) {
     case VREGION_LIST:
         slab = &state->vregion_list_slab;

diff --git a/usr/mem_serv_dist/mem_serv.c b/usr/mem_serv_dist/mem_serv.c
index e1ac268..557a396 100644 (file)
--- a/usr/mem_serv_dist/mem_serv.c
+++ b/usr/mem_serv_dist/mem_serv.c
@@ -111,7 +111,7 @@ static void dump_ram_region(int index, struct mem_region* m)
 }
 #endif // 0
 
-errval_t slab_refill(struct slab_alloc *slabs)
+errval_t slab_refill(struct slab_allocator *slabs)
 {
     errval_t err;
 

diff --git a/usr/mem_serv_dist/mem_serv.h b/usr/mem_serv_dist/mem_serv.h
index b6c33d3..0f74e0a 100644 (file)
--- a/usr/mem_serv_dist/mem_serv.h
+++ b/usr/mem_serv_dist/mem_serv.h
@@ -101,7 +101,7 @@ extern struct mm mm_local;
 /// Monitor's binding to this mem_serv
 extern struct mem_binding *monitor_mem_binding;
 
-errval_t slab_refill(struct slab_alloc *slabs);
+errval_t slab_refill(struct slab_allocator *slabs);
 
 errval_t percore_free_handler_common(struct capref ramcap, genpaddr_t base,
                                      uint8_t bits);