check valid PMEM memory using pmem_is_pmem

Author: trdtnguyen

build_mysql.sh

@@ -11,7 +11,7 @@ IS_DEBUG=0
 #BUILD_NAME="-DUNIV_PMEMOBJ_WAL -DUNIV_TRACE_FLUSH_TIME"
 #BUILD_NAME="-DUNIV_PMEMOBJ_WAL -DUNIV_PMEMOBJ_WAL_ELR -DUNIV_TRACE_FLUSH_TIME"
 #BUILD_NAME="-DUNIV_NVM_LOG -DUNIV_PMEMOBJ_WAL -DUNIV_TRACE_FLUSH_TIME"
-#BUILD_NAME="-DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME" #benchmark
+BUILD_NAME="-DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME" #benchmark
 #BUILD_NAME="-DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PART_PL_DEBUG -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_FLUSH_TIME"
 #######################################
 
@@ -89,7 +89,7 @@ IS_DEBUG=0
 ## EVEN + BLOOM
 #BUILD_NAME="-DUNIV_OPENMP -DUNIV_PMEMOBJ_BLOOM -DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_PMEMOBJ_BUF_RECOVERY -DUNIV_PMEMOBJ_BUF_STAT -DUNIV_TRACE_FLUSH_TIME"
 ## LESS + BLOOM
-BUILD_NAME="-DUNIV_OPENMP -DUNIV_PMEMOBJ_BLOOM -DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_BUF_PARTITION -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_PMEMOBJ_BUF_RECOVERY"
+#BUILD_NAME="-DUNIV_OPENMP -DUNIV_PMEMOBJ_BLOOM -DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_BUF_PARTITION -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_PMEMOBJ_BUF_RECOVERY"
 #BUILD_NAME="-DUNIV_OPENMP -DUNIV_PMEMOBJ_BLOOM -DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_BUF_PARTITION -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_PMEMOBJ_BUF_RECOVERY -DUNIV_PMEMOBJ_BUF_STAT -DUNIV_TRACE_FLUSH_TIME" # Paper writing
 
 #LSB

storage/innobase/pmem/pmem0log.cc

@@ -25,6 +25,7 @@
 #include "os0file.h"
 
 #if defined (UNIV_PMEMOBJ_PL)
+#include <libpmem.h>
 
 #if defined (UNIV_PMEMOBJ_PL)
 //static FILE* debug_ptxl_file = fopen("pll_debug.txt","a");
@@ -160,6 +161,13 @@ pm_wrapper_page_log_alloc_or_open(
 		printf("Total NVDIMM allocated = \t\t %f (MB)\n", (pmw->ppl->pmem_alloc_size * 1.0)/ (1024*1024));
 		float log_file_size_MB = PMEM_LOG_FILE_SIZE * 4 * 1024 * 1.0 / (1024 * 1024);
 		printf("Log files %zu x %f (MB) = \t %f (MB)\n", PMEM_N_LOG_BUCKETS, log_file_size_MB, (PMEM_N_LOG_BUCKETS * log_file_size_MB));
+
+		/*Test PMEM memory, we should ensure the allocated memory is persistent*/
+		/*pmem_is_pmem() require libpmem.h*/
+		bool is_pmem = pmem_is_pmem(pmw->ppl->p_align, pmw->ppl->pmem_alloc_size);
+		unsigned char*  end_addr = pmw->ppl->p_align + pmw->ppl->pmem_alloc_size;
+		printf("Memory address from %zu to %zu isPMEM = %d \n", pmw->ppl->p_align, end_addr, is_pmem);
+
 		printf(" =================================\n");
 
 	}

storage/innobase/pmem/pmem0wrapper.cc

@@ -43,6 +43,17 @@ PMEM_WRAPPER* pm_wrapper_create(const char* path, const size_t pool_size){
 		fprintf(stderr, "PMEM_ERROR: checking version fail: %s \n", pmemobj_errormsg());
 	}
 
+	/*Further checks */
+	int flush;
+	char *e = getenv("PMEM_NO_FLUSH");
+	printf("[PMEM_INFO] getenv PMEM_NO_FLUSH return %s\n", e);
+	if (e && (strcmp(e, "1") == 0)) {
+		flush = 0;
+		printf("Forced not flushing CPU_cache\n");
+	} else if (e && (strcmp(e, "0") == 0)) {
+		flush = 1;
+		printf("Forced flushing CPU_cache\n");
+	}
 
 	pmw =  (PMEM_WRAPPER*) malloc(sizeof(PMEM_WRAPPER));
 	if (!pmw)