Rebase changes

Author: OmSaran

splitfs/common.mk

@@ -40,6 +40,7 @@ LEDGER_REDIS=0
 LEDGER_TAR=0
 LEDGER_GIT=0
 LEDGER_RSYNC=0
+LEDGER_ROCKSDB=0
 
 LEDGER_TRACE_FP=1
 
@@ -91,7 +92,7 @@ COPTIMIZATIONS = -O3 -m64
 #-march=core2 -minline-all-stringops -m64 -fprefetch-loop-arrays
 #-mno-align-stringops
 #-DTRACE_FP_CALLS=$(LEDGER_TRACE_FP)
-CFLAGS = -DPRINT_DEBUG_FILE=$(LEDGER_DEBUG) -DDATA_JOURNALING_ENABLED=$(LEDGER_DATAJ) -DPOSIX_ENABLED=$(LEDGER_POSIX) -DTRACE_FP_CALLS=$(LEDGER_TRACE_FP) -DNVM_DELAY=$(DELAYS) -DNON_TEMPORAL_WRITES=$(MOVNTI) -DSYSCALL_APPENDS=$(SYS_APPENDS) -DPASS_THROUGH_CALLS=$(SYS_PASS_THROUGH) -DBG_CLEANING=$(LEDGER_DR_BG_CLEAN) -DINSTRUMENT_CALLS=$(LEDGER_INSTRU) -DWORKLOAD_YCSB=$(LEDGER_YCSB) -DWORKLOAD_TPCC=$(LEDGER_TPCC) -DWORKLOAD_REDIS=$(LEDGER_REDIS) -DWORKLOAD_TAR=$(LEDGER_TAR) -DWORKLOAD_GIT=$(LEDGER_GIT) -DWORKLOAD_RSYNC=$(LEDGER_RSYNC) -DSHOW_DEBUG=$(LIBNVP_DEBUG) -DSPIN_ON_ERROR=$(LIBNVP_SPIN_ON_ERROR) -Wno-unused-variable -Wall -Wundef -pthread -fPIC $(COPTIMIZATIONS) -D$(SYSTEM_TYPE) -DUSE_PTHREAD_LOCK=$(USE_PTHREAD_LOCK) -DUSE_SCHED_GETCPU=$(USE_SCHED_GETCPU) -DINTEGRITY_CHECK=$(INTEGRITY_CHECK) -DMEASURE_TIMING=$(MEASURE_TIMING) -DUSE_SINGLE_LOCK=$(USE_SINGLE_LOCK) -DENABLE_FSYNC_TO_BS=$(ENABLE_FSYNC_TO_BS) -DENABLE_FSYNC_TO_CACHE=$(ENABLE_FSYNC_TO_CACHE) -DENABLE_FALLOC=$(ENABLE_FALLOC) -DUSE_BTREE=$(USE_BTREE) -DUNMAP_ON_CLOSE=$(UNMAP_ON_CLOSE)
+CFLAGS = -DPRINT_DEBUG_FILE=$(LEDGER_DEBUG) -DDATA_JOURNALING_ENABLED=$(LEDGER_DATAJ) -DPOSIX_ENABLED=$(LEDGER_POSIX) -DTRACE_FP_CALLS=$(LEDGER_TRACE_FP) -DNVM_DELAY=$(DELAYS) -DNON_TEMPORAL_WRITES=$(MOVNTI) -DSYSCALL_APPENDS=$(SYS_APPENDS) -DPASS_THROUGH_CALLS=$(SYS_PASS_THROUGH) -DBG_CLEANING=$(LEDGER_DR_BG_CLEAN) -DINSTRUMENT_CALLS=$(LEDGER_INSTRU) -DWORKLOAD_YCSB=$(LEDGER_YCSB) -DWORKLOAD_TPCC=$(LEDGER_TPCC) -DWORKLOAD_REDIS=$(LEDGER_REDIS) -DWORKLOAD_TAR=$(LEDGER_TAR) -DWORKLOAD_ROCKSDB=$(LEDGER_ROCKSDB) -DWORKLOAD_GIT=$(LEDGER_GIT) -DWORKLOAD_RSYNC=$(LEDGER_RSYNC) -DSHOW_DEBUG=$(LIBNVP_DEBUG) -DSPIN_ON_ERROR=$(LIBNVP_SPIN_ON_ERROR) -Wno-unused-variable -Wall -Wundef -pthread -fPIC $(COPTIMIZATIONS) -D$(SYSTEM_TYPE) -DUSE_PTHREAD_LOCK=$(USE_PTHREAD_LOCK) -DUSE_SCHED_GETCPU=$(USE_SCHED_GETCPU) -DINTEGRITY_CHECK=$(INTEGRITY_CHECK) -DMEASURE_TIMING=$(MEASURE_TIMING) -DUSE_SINGLE_LOCK=$(USE_SINGLE_LOCK) -DENABLE_FSYNC_TO_BS=$(ENABLE_FSYNC_TO_BS) -DENABLE_FSYNC_TO_CACHE=$(ENABLE_FSYNC_TO_CACHE) -DENABLE_FALLOC=$(ENABLE_FALLOC) -DUSE_BTREE=$(USE_BTREE) -DUNMAP_ON_CLOSE=$(UNMAP_ON_CLOSE)
 
 CXXFLAGS=$(CFLAGS)
 

splitfs/fileops_nvp.c

@@ -1667,7 +1667,7 @@ void nvp_free_dr_mmaps()
 		_nvp_fileops->UNLINK(new_path);
 		__atomic_fetch_sub(&num_drs_left, 1, __ATOMIC_SEQ_CST);
 	}
-	lfds711_queue_umm_cleanup( &qs_over, NULL );
+	// lfds711_queue_umm_cleanup( &qs_over, NULL );
 
 	for (i = 0; i < full_dr_idx; i++) {
 		addr = _nvp_full_drs[i].start_addr;
@@ -4316,7 +4316,7 @@ RETT_OPEN _nvp_OPEN(INTF_OPEN)
 		nvf->canWrite = 1;
 	} else if(oflag&O_WRONLY) {
 
-#if WORKLOAD_TAR | WORKLOAD_GIT | WORKLOAD_RSYNC | WORKLOAD_TPCC
+#if WORKLOAD_TAR | WORKLOAD_GIT | WORKLOAD_RSYNC | WORKLOAD_ROCKSDB
 
 		nvf->posix = 0;
 		nvf->canRead = 1;
@@ -5013,7 +5013,6 @@ RETT_FCNTL _nvp_FCNTL(INTF_FCNTL)
 	DEBUG("CALL: _nvp_FCNTL\n");
 
 	struct NVFile* nvf = &_nvp_fd_lookup[file];
-	NVP_CHECK_NVF_VALID(nvf);
 
 	va_list ap;
 	void* arg;
@@ -6658,12 +6657,12 @@ RETT_POSIX_FALLOCATE64 _nvp_POSIX_FALLOCATE64(INTF_POSIX_FALLOCATE64)
 
 	struct NVFile *nvf = &_nvp_fd_lookup[file];
 
-	NVP_CHECK_NVF_VALID_WR(nvf);
-
 	if(nvf->posix) {
 		return _nvp_fileops->POSIX_FALLOCATE64(CALL_POSIX_FALLOCATE64);
 	}
 
+	NVP_CHECK_NVF_VALID_WR(nvf);
+
 	int cpuid = GET_CPUID();
 
 	struct NVTable_maps *tbl_app = &_nvp_tbl_mmaps[nvf->node->serialno % APPEND_TBL_MAX];
@@ -6700,12 +6699,12 @@ RETT_FALLOCATE _nvp_FALLOCATE(INTF_FALLOCATE)
 
 	struct NVFile *nvf = &_nvp_fd_lookup[file];
 
-	NVP_CHECK_NVF_VALID(nvf);
-
 	if(nvf->posix) {
 		return _nvp_fileops->FALLOCATE(CALL_FALLOCATE);
 	}
 
+	NVP_CHECK_NVF_VALID(nvf);
+
 	int cpuid = GET_CPUID();
 
 	struct NVTable_maps *tbl_app = &_nvp_tbl_mmaps[nvf->node->serialno % APPEND_TBL_MAX];
@@ -6740,16 +6739,17 @@ RETT_FALLOCATE _nvp_FALLOCATE(INTF_FALLOCATE)
  * is an overwrite.
 */
 RETT_SYNC_FILE_RANGE _nvp_SYNC_FILE_RANGE(INTF_SYNC_FILE_RANGE) {
+	CHECK_RESOLVE_FILEOPS(_nvp_);
 	RETT_SYNC_FILE_RANGE result = 0;
 
 	struct NVFile *nvf = &_nvp_fd_lookup[file];
 
-	NVP_CHECK_NVF_VALID(nvf);
-
 	if(nvf->posix) {
 		return _nvp_fileops->SYNC_FILE_RANGE(CALL_SYNC_FILE_RANGE);
 	}
 
+	NVP_CHECK_NVF_VALID(nvf);
+
 #if POSIX_ENABLED
 	return _nvp_posix_sync_file_range(CALL_SYNC_FILE_RANGE, nvf);
 #endif

splitfs/log.c

@@ -199,7 +199,7 @@ void init_op_log() {
 		assert(0);
 	}
 
-	ret =  posix_fallocate(op_log_fd, 0, OP_LOG_SIZE);
+	ret =  _hub_find_fileop("posix")->POSIX_FALLOCATE(op_log_fd, 0, OP_LOG_SIZE);
 	if (ret < 0) {
 		MSG("%s: posix_fallocate op log failed. Err = %s\n",
 		    __func__, strerror(errno));