Robj/indirection support

Makefile

@@ -399,10 +399,15 @@ CLOCKCACHE_SYS = $(OBJDIR)/$(SRCDIR)/clockcache.o	  \
                  $(UTIL_SYS)                        \
                  $(PLATFORM_IO_SYS)
 
+BLOB_SYS = $(OBJDIR)/$(SRCDIR)/blob.o        \
+           $(OBJDIR)/$(SRCDIR)/blob_build.o        \
+           $(OBJDIR)/$(SRCDIR)/data_internal.o   \
+           $(OBJDIR)/$(SRCDIR)/data_blob_build.o   \
+           $(OBJDIR)/$(SRCDIR)/mini_allocator.o  \
+				 	 $(CLOCKCACHE_SYS)
+
 BTREE_SYS = $(OBJDIR)/$(SRCDIR)/btree.o           \
-            $(OBJDIR)/$(SRCDIR)/data_internal.o   \
-            $(OBJDIR)/$(SRCDIR)/mini_allocator.o  \
-            $(CLOCKCACHE_SYS)
+						$(BLOB_SYS)
 
 #################################################################
 # The dependencies of each mini unit test.
@@ -415,13 +420,21 @@ $(BINDIR)/$(UNITDIR)/misc_test: $(UTIL_SYS) $(COMMON_UNIT_TESTOBJ)
 $(BINDIR)/$(UNITDIR)/util_test: $(UTIL_SYS)            \
                                 $(COMMON_UNIT_TESTOBJ)
 
-$(BINDIR)/$(UNITDIR)/btree_test: $(OBJDIR)/$(UNIT_TESTSDIR)/btree_test_common.o \
+$(BINDIR)/$(UNITDIR)/blob_test: $(OBJDIR)/$(UNIT_TESTSDIR)/cache_test_common.o \
+                                $(OBJDIR)/$(TESTS_DIR)/config.o                \
+                                $(OBJDIR)/$(TESTS_DIR)/test_data.o             \
+                                $(COMMON_UNIT_TESTOBJ)                         \
+                                $(BLOB_SYS)
+
+$(BINDIR)/$(UNITDIR)/btree_test: $(OBJDIR)/$(UNIT_TESTSDIR)/cache_test_common.o \
+																 $(OBJDIR)/$(UNIT_TESTSDIR)/btree_test_common.o \
                                  $(OBJDIR)/$(TESTS_DIR)/config.o                \
                                  $(OBJDIR)/$(TESTS_DIR)/test_data.o             \
                                  $(COMMON_UNIT_TESTOBJ)                         \
                                  $(BTREE_SYS)
 
-$(BINDIR)/$(UNITDIR)/btree_stress_test: $(OBJDIR)/$(UNIT_TESTSDIR)/btree_test_common.o  \
+$(BINDIR)/$(UNITDIR)/btree_stress_test: $(OBJDIR)/$(UNIT_TESTSDIR)/cache_test_common.o \
+																 				$(OBJDIR)/$(UNIT_TESTSDIR)/btree_test_common.o  \
                                         $(OBJDIR)/$(TESTS_DIR)/config.o                 \
                                         $(OBJDIR)/$(TESTS_DIR)/test_data.o              \
                                         $(COMMON_UNIT_TESTOBJ)                          \

include/splinterdb/data.h

@@ -45,6 +45,7 @@ typedef enum message_type {
  */
 typedef struct message {
    message_type type;
+   void        *cc; // Will always be NULL when passed to user call-backs
    slice        data;
 } message;
 
@@ -66,6 +67,12 @@ message_length(message msg)
    return slice_length(msg.data);
 }
 
+static inline const _Bool
+message_isblob(message msg)
+{
+   return msg.cc != NULL;
+}
+
 static inline const void *
 message_data(message msg)
 {

include/splinterdb/splinterdb.h

@@ -196,7 +196,7 @@ splinterdb_update(const splinterdb *kvsb, slice key, slice delta);
 // Lookups
 
 // Size of opaque data required to hold a lookup result
-#define SPLINTERDB_LOOKUP_BUFSIZE (6 * sizeof(void *))
+#define SPLINTERDB_LOOKUP_BUFSIZE (7 * sizeof(void *))
 
 // A lookup result is stored and parsed from here
 //

src/allocator.h

@@ -41,6 +41,8 @@ typedef uint64 allocator_root_id;
  *
  * - PAGE_TYPE_LOG        : struct shard_log_hdr{} + computed offsets
  *
+ * - PAGE_TYPE_BLOB       : raw user data (see blob.c)
+ *
  * - PAGE_TYPE_SUPERBLOCK : struct trunk_super_block{}
  * ----------------------------------------------------------------------------
  */
@@ -52,6 +54,7 @@ typedef enum page_type {
    PAGE_TYPE_MEMTABLE,
    PAGE_TYPE_FILTER,
    PAGE_TYPE_LOG,
+   PAGE_TYPE_BLOB,
    PAGE_TYPE_SUPERBLOCK,
    PAGE_TYPE_MISC, // Used mainly as a testing hook, for cache access testing.
    NUM_PAGE_TYPES,
@@ -63,6 +66,7 @@ static const char *const page_type_str[] = {"invalid",
                                             "memtable",
                                             "filter",
                                             "log",
+                                            "blob",
                                             "superblock",
                                             "misc"};