Clean up some minor data structure inconsistencies

Namely, unify the include guard styling with the majority of the project, and do
flat_bitmap -> fb, to match its naming convention.
This commit is contained in:
David Goldblatt 2021-02-17 16:23:24 -08:00 committed by David Goldblatt
parent 1f688490e1
commit aea91b8c33
9 changed files with 14 additions and 14 deletions

View File

@ -215,7 +215,7 @@ TESTS_UNIT := \
$(srcroot)test/unit/edata_cache.c \ $(srcroot)test/unit/edata_cache.c \
$(srcroot)test/unit/emitter.c \ $(srcroot)test/unit/emitter.c \
$(srcroot)test/unit/extent_quantize.c \ $(srcroot)test/unit/extent_quantize.c \
${srcroot}test/unit/flat_bitmap.c \ ${srcroot}test/unit/fb.c \
$(srcroot)test/unit/fork.c \ $(srcroot)test/unit/fork.c \
${srcroot}test/unit/fxp.c \ ${srcroot}test/unit/fxp.c \
$(srcroot)test/unit/hash.c \ $(srcroot)test/unit/hash.c \

View File

@ -2,7 +2,7 @@
#define JEMALLOC_INTERNAL_ESET_H #define JEMALLOC_INTERNAL_ESET_H
#include "jemalloc/internal/atomic.h" #include "jemalloc/internal/atomic.h"
#include "jemalloc/internal/flat_bitmap.h" #include "jemalloc/internal/fb.h"
#include "jemalloc/internal/edata.h" #include "jemalloc/internal/edata.h"
#include "jemalloc/internal/mutex.h" #include "jemalloc/internal/mutex.h"

View File

@ -1,7 +1,7 @@
#ifndef JEMALLOC_INTERNAL_HPDATA_H #ifndef JEMALLOC_INTERNAL_HPDATA_H
#define JEMALLOC_INTERNAL_HPDATA_H #define JEMALLOC_INTERNAL_HPDATA_H
#include "jemalloc/internal/flat_bitmap.h" #include "jemalloc/internal/fb.h"
#include "jemalloc/internal/ph.h" #include "jemalloc/internal/ph.h"
#include "jemalloc/internal/ql.h" #include "jemalloc/internal/ql.h"
#include "jemalloc/internal/typed_list.h" #include "jemalloc/internal/typed_list.h"

View File

@ -1,3 +1,6 @@
#ifndef JEMALLOC_INTERNAL_PH_H
#define JEMALLOC_INTERNAL_PH_H
/* /*
* A Pairing Heap implementation. * A Pairing Heap implementation.
* *
@ -12,9 +15,6 @@
******************************************************************************* *******************************************************************************
*/ */
#ifndef PH_H_
#define PH_H_
/* Node structure. */ /* Node structure. */
#define phn(a_type) \ #define phn(a_type) \
struct { \ struct { \
@ -388,4 +388,4 @@ a_prefix##remove(a_ph_type *ph, a_type *phn) { \
} \ } \
} }
#endif /* PH_H_ */ #endif /* JEMALLOC_INTERNAL_PH_H */

View File

@ -1,3 +1,6 @@
#ifndef JEMALLOC_INTERNAL_RB_H
#define JEMALLOC_INTERNAL_RB_H
/*- /*-
******************************************************************************* *******************************************************************************
* *
@ -19,9 +22,6 @@
******************************************************************************* *******************************************************************************
*/ */
#ifndef RB_H_
#define RB_H_
#ifndef __PGI #ifndef __PGI
#define RB_COMPACT #define RB_COMPACT
#endif #endif
@ -1003,4 +1003,4 @@ a_prefix##destroy(a_rbt_type *rbtree, void (*cb)(a_type *, void *), \
rbtree->rbt_root = NULL; \ rbtree->rbt_root = NULL; \
} }
#endif /* RB_H_ */ #endif /* JEMALLOC_INTERNAL_RB_H */

View File

@ -3,7 +3,7 @@
#include "jemalloc/internal/hpa.h" #include "jemalloc/internal/hpa.h"
#include "jemalloc/internal/flat_bitmap.h" #include "jemalloc/internal/fb.h"
#include "jemalloc/internal/witness.h" #include "jemalloc/internal/witness.h"
#define HPA_EDEN_SIZE (128 * HUGEPAGE) #define HPA_EDEN_SIZE (128 * HUGEPAGE)

View File

@ -3,7 +3,7 @@
#include "jemalloc/internal/psset.h" #include "jemalloc/internal/psset.h"
#include "jemalloc/internal/flat_bitmap.h" #include "jemalloc/internal/fb.h"
void void
psset_init(psset_t *psset) { psset_init(psset_t *psset) {

View File

@ -1,6 +1,6 @@
#include "test/jemalloc_test.h" #include "test/jemalloc_test.h"
#include "jemalloc/internal/flat_bitmap.h" #include "jemalloc/internal/fb.h"
#include "test/nbits.h" #include "test/nbits.h"
static void static void