Extend memkind allocator variant by libpmem dependency

src/Makefile

@@ -193,7 +193,7 @@ endif
 
 ifeq ($(MALLOC),memkind)
 	FINAL_CFLAGS+= -DUSE_MEMKIND
-	FINAL_LIBS+= -lmemkind -ldaxctl
+	FINAL_LIBS+= -lmemkind -ldaxctl -lpmem
 endif
 
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)

src/sds.c

@@ -44,6 +44,9 @@ const char *SDS_NOINIT = "SDS_NOINIT";
 #define SDS_GENERAL_VARIANT  0
 #define SDS_DRAM_VARIANT     1
 
+#define SDS_ON_PMEM          0
+#define SDS_ON_DRAM          1
+
 static inline int sdsHdrSize(char type) {
     switch(type&SDS_TYPE_MASK) {
         case SDS_TYPE_5:
@@ -93,18 +96,24 @@ static sds _sdsnewlen(const void *init, size_t initlen, int on_dram) {
     void *sh;
     sds s;
     char type = sdsReqType(initlen);
+    int sds_place;
+
     /* Empty strings are usually created in order to append. Use type 8
      * since type 5 is not good at this. */
     if (type == SDS_TYPE_5 && initlen == 0) type = SDS_TYPE_8;
     int hdrlen = sdsHdrSize(type);
     unsigned char *fp; /* flags pointer. */
+    if ((on_dram == SDS_GENERAL_VARIANT) && (hdrlen+initlen+1) >= zmalloc_get_threshold()) {
+        sds_place = SDS_ON_PMEM;
+    } else {
+        sds_place = SDS_ON_DRAM;
+    }
 
-    sh = (on_dram == SDS_DRAM_VARIANT) ? s_dram_malloc(hdrlen+initlen+1)
-                                       : s_malloc(hdrlen+initlen+1);
+    sh = (sds_place == SDS_ON_DRAM) ? s_dram_malloc(hdrlen+initlen+1) : s_pmem_malloc(hdrlen+initlen+1);
     if (init==SDS_NOINIT)
         init = NULL;
     else if (!init)
-        memset(sh, 0, hdrlen+initlen+1);
+        (sds_place == SDS_ON_DRAM) ? memset(sh, 0, hdrlen+initlen+1) : zmemset_pmem(sh, 0, hdrlen+initlen+1);
     if (sh == NULL) return NULL;
     s = (char*)sh+hdrlen;
     fp = ((unsigned char*)s)-1;
@@ -142,9 +151,10 @@ static sds _sdsnewlen(const void *init, size_t initlen, int on_dram) {
             break;
         }
     }
-    if (initlen && init)
-        memcpy(s, init, initlen);
     s[initlen] = '\0';
+    if (initlen && init)
+        (sds_place == SDS_ON_DRAM) ? memcpy(s, init, initlen) : zmemcpy_pmem(s, init, initlen);
+
     return s;
 }
 

src/sdsalloc.h

@@ -41,6 +41,8 @@
 
 #include "zmalloc.h"
 #define s_malloc zmalloc
+#define s_dram_malloc zmalloc_dram
+#define s_pmem_malloc zmalloc_pmem
 #define s_realloc zrealloc
 #define s_free zfree
 #define s_dram_malloc zmalloc_dram

src/zmalloc.c

@@ -75,6 +75,7 @@ void zlibc_free(void *ptr) {
 #define dallocx(ptr,flags) je_dallocx(ptr,flags)
 #elif defined(USE_MEMKIND)
 #include <errno.h>
+#include <libpmem.h>
 #define malloc(size) memkind_malloc(MEMKIND_DEFAULT,size)
 #define calloc(count,size) memkind_calloc(MEMKIND_DEFAULT,count,size)
 #define realloc_dram(ptr,size) memkind_realloc(MEMKIND_DEFAULT,ptr,size)
@@ -102,7 +103,7 @@ static void zfree_pmem(void *ptr) {
     zmalloc_pmem_not_available();
 }
 
-static void *zmalloc_pmem(size_t size) {
+void *zmalloc_pmem(size_t size) {
     (void)(size);
     zmalloc_pmem_not_available();
     return NULL;
@@ -120,6 +121,22 @@ static void *zrealloc_pmem(void *ptr, size_t size) {
     zmalloc_pmem_not_available();
     return NULL;
 }
+
+void *zmemcpy_pmem(void *dst, const void *src, size_t num) {
+    (void)(dst);
+    (void)(src);
+    (void)(num);
+    zmalloc_pmem_not_available();
+    return NULL;
+}
+
+void *zmemset_pmem(void *ptr, int value, size_t num) {
+    (void)(ptr);
+    (void)(value);
+    (void)(num);
+    zmalloc_pmem_not_available();
+    return NULL;
+}
 #endif
 
 #define update_zmalloc_stat_alloc(__n) do { \
@@ -201,7 +218,7 @@ static void zfree_pmem(void *ptr) {
 #endif
 }
 
-static void *zmalloc_pmem(size_t size) {
+void *zmalloc_pmem(size_t size) {
     void *ptr = memkind_malloc(MEMKIND_DAX_KMEM, size+PREFIX_SIZE);
     if (!ptr && errno==ENOMEM) zmalloc_oom_handler(size);
 #ifdef HAVE_MALLOC_SIZE
@@ -260,6 +277,14 @@ static void *zrealloc_pmem(void *ptr, size_t size) {
     return (char*)newptr+PREFIX_SIZE;
 #endif
 }
+
+void *zmemcpy_pmem(void *dst, const void *src, size_t num) {
+    return pmem_memcpy(dst, src, num, PMEM_F_MEM_NONTEMPORAL|PMEM_F_MEM_NODRAIN);
+}
+
+void *zmemset_pmem(void *ptr, int value, size_t num) {
+    return pmem_memset(ptr, value, num, PMEM_F_MEM_NONTEMPORAL|PMEM_F_MEM_NODRAIN);
+}
 #endif
 
 void *zmalloc(size_t size) {

src/zmalloc.h

@@ -108,6 +108,9 @@ size_t zmalloc_get_threshold(void);
 void *zmalloc_dram(size_t size);
 void *zcalloc_dram(size_t size);
 void *zrealloc_dram(void *ptr, size_t size);
+void *zmalloc_pmem(size_t size);
+void *zmemcpy_pmem(void *dst, const void *src, size_t num);
+void *zmemset_pmem(void *ptr, int value, size_t num);
 
 #ifdef HAVE_DEFRAG
 void zfree_no_tcache(void *ptr);