Robj/trunk rewrite

Makefile

@@ -118,12 +118,12 @@ BUILD_DIR := $(BUILD_MODE)
 ifeq "$(BUILD_MODE)" "debug"
    CFLAGS    += -DSPLINTER_DEBUG
 else ifeq "$(BUILD_MODE)" "release"
-   CFLAGS    += -Ofast -flto
-   LDFLAGS   += -Ofast -flto
+   CFLAGS    += -O3 -ffast-math -flto
+   LDFLAGS   += -O3 -ffast-math -flto
 else ifeq "$(BUILD_MODE)" "optimized-debug"
    CFLAGS    += -DSPLINTER_DEBUG
-   CFLAGS    += -Ofast -flto
-   LDFLAGS   += -Ofast -flto
+   CFLAGS    += -O3 -ffast-math -flto
+   LDFLAGS   += -O3 -ffast-math -flto
 else
    $(error Unknown BUILD_MODE "$(BUILD_MODE)".  Valid options are "debug", "optimized-debug", and "release".  Default is "release")
 endif
@@ -161,8 +161,8 @@ ifndef BUILD_MSAN
 endif
 
 ifeq "$(BUILD_MSAN)" "1"
-   CFLAGS  += -fsanitize=memory
-   LDFLAGS += -fsanitize=memory
+   CFLAGS  += -fsanitize=memory -fsanitize-memory-track-origins
+   LDFLAGS += -fsanitize=memory -fsanitize-memory-track-origins
    BUILD_DIR:=$(BUILD_DIR)-msan
 else ifneq "$(BUILD_MSAN)" "0"
    $(error Unknown BUILD_MSAN mode "$(BUILD_MSAN)".  Valid values are "0" or "1". Default is "0")
@@ -413,6 +413,7 @@ BTREE_SYS = $(OBJDIR)/$(SRCDIR)/btree.o           \
 # defined above using unit_test_self_dependency.
 #
 $(BINDIR)/$(UNITDIR)/misc_test: $(UTIL_SYS) $(COMMON_UNIT_TESTOBJ)
+$(BINDIR)/$(UNITDIR)/vector_test: $(UTIL_SYS) $(COMMON_UNIT_TESTOBJ)
 
 $(BINDIR)/$(UNITDIR)/util_test: $(UTIL_SYS)            \
                                 $(COMMON_UNIT_TESTOBJ)

include/splinterdb/splinterdb.h

@@ -93,16 +93,15 @@ typedef struct splinterdb_config {
    uint64 btree_rough_count_height;
 
    // filter
-   uint64 filter_remainder_size;
-   uint64 filter_index_size;
+   uint64 filter_hash_size;
+   uint64 filter_log_index_size;
 
    // log
    _Bool use_log;
 
    // splinter
    uint64 memtable_capacity;
    uint64 fanout;
-   uint64 max_branches_per_node;
    uint64 use_stats;
    uint64 reclaim_threshold;
 

src/allocator.h

@@ -114,6 +114,8 @@ allocator_config_pages_share_extent(allocator_config *allocator_cfg,
 // ----------------------------------------------------------------------
 // Type declarations for allocator ops
 
+typedef uint32 refcount;
+
 typedef struct allocator allocator;
 
 typedef allocator_config *(*allocator_get_config_fn)(allocator *al);
@@ -122,8 +124,8 @@ typedef platform_status (*alloc_fn)(allocator *al,
                                     uint64    *addr,
                                     page_type  type);
 
-typedef uint8 (*dec_ref_fn)(allocator *al, uint64 addr, page_type type);
-typedef uint8 (*generic_ref_fn)(allocator *al, uint64 addr);
+typedef refcount (*dec_ref_fn)(allocator *al, uint64 addr, page_type type);
+typedef refcount (*generic_ref_fn)(allocator *al, uint64 addr);
 
 typedef platform_status (*get_super_addr_fn)(allocator        *al,
                                              allocator_root_id spl_id,
@@ -182,19 +184,19 @@ allocator_alloc(allocator *al, uint64 *addr, page_type type)
    return al->ops->alloc(al, addr, type);
 }
 
-static inline uint8
+static inline refcount
 allocator_inc_ref(allocator *al, uint64 addr)
 {
    return al->ops->inc_ref(al, addr);
 }
 
-static inline uint8
+static inline refcount
 allocator_dec_ref(allocator *al, uint64 addr, page_type type)
 {
    return al->ops->dec_ref(al, addr, type);
 }
 
-static inline uint8
+static inline refcount
 allocator_get_refcount(allocator *al, uint64 addr)
 {
    return al->ops->get_ref(al, addr);
@@ -268,18 +270,18 @@ allocator_page_valid(allocator *al, uint64 addr)
 
    uint64 base_addr = allocator_config_extent_base_addr(allocator_cfg, addr);
    if ((base_addr != 0) && (addr < allocator_cfg->capacity)) {
-      uint8 refcount = allocator_get_refcount(al, base_addr);
-      if (refcount == 0) {
+      refcount rfc = allocator_get_refcount(al, base_addr);
+      if (rfc == 0) {
          platform_error_log(
             "%s():%d: Trying to access an unreferenced extent."
             " base_addr=%lu, addr=%lu, allocator_get_refcount()=%d\n",
             __func__,
             __LINE__,
             base_addr,
             addr,
-            refcount);
+            rfc);
       }
-      return (refcount != 0);
+      return (rfc != 0);
    } else {
       platform_error_log("%s():%d: Extent out of allocator capacity range."
                          " base_addr=%lu, addr=%lu"