fix bugs

Author: trdtnguyen

build_mysql.sh

@@ -11,12 +11,12 @@ 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"
+#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"
 #######################################
 
 ##### Simulate latency PL-NVM######################
-BUILD_NAME="-DUNIV_PMEM_SIM_LATENCY -DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME"
+#BUILD_NAME="-DUNIV_PMEM_SIM_LATENCY -DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_STAT -DUNIV_PMEMOBJ_PAGE_LOG -DUNIV_PMEMOBJ_PART_PL -DUNIV_PMEMOBJ_PL -DUNIV_TRACE_RECOVERY_TIME"
 
 #NO TX no persist less, use for simulation latency
 #BUILD_NAME="-DUNIV_PMEM_SIM_LATENCY -DUNIV_PMEMOBJ_NO_TX -DUNIV_OPENMP -DUNIV_PMEMOBJ_BLOOM -DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_BUF_PARTITION -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_PMEMOBJ_BUF_RECOVERY -DUNIV_TRACE_FLUSH_TIME"
@@ -89,7 +89,8 @@ BUILD_NAME="-DUNIV_PMEM_SIM_LATENCY -DUNIV_PMEMOBJ_PERSIST -DUNIV_PMEMOBJ_PPL_ST
 ## 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 -DUNIV_PMEMOBJ_BUF_STAT -DUNIV_TRACE_FLUSH_TIME"
+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
 #BUILD_NAME="-DUNIV_PMEMOBJ_BUF -DUNIV_PMEMOBJ_LSB -DUNIV_PMEMOBJ_BUF_FLUSHER -DUNIV_TRACE_FLUSH_TIME"

storage/innobase/buf/buf0flu.cc

@@ -5072,7 +5072,9 @@ DECLARE_THREAD(pm_buf_flush_list_cleaner_coordinator)(
 				D_RW(gb_pmw->pbuf->spec_list)->cur_pages);
 
 		//pm_bloom_stats(gb_pmw->pbuf->bf);
-		pm_cbf_stats(gb_pmw->pbuf->cbf);
+		
+		/*print the BloomFilter stat info*/
+		//pm_cbf_stats(gb_pmw->pbuf->cbf);
 #else
 		printf("cur free list = %zu, cur spec_list = %zu\n",
 			   	D_RW(gb_pmw->pbuf->free_pool)->cur_lists,

storage/innobase/ibuf/ibuf0ibuf.cc

@@ -2127,9 +2127,6 @@ ibuf_remove_free_page(void)
 	pages from the free list, but they take them from the start, and
 	the free list was so long that they cannot have taken the last
 	page from it. */
-//#if defined (UNIV_PMEMOBJ_PART_PL)
-//	printf("ibuf_remove_free_page() page (%zu, %zu)\n", IBUF_SPACE_ID, page_no);
-//#endif
 	fseg_free_page(header_page + IBUF_HEADER + IBUF_TREE_SEG_HEADER,
 		       IBUF_SPACE_ID, page_no, false, &mtr);
 

storage/innobase/mtr/mtr0mtr.cc

@@ -44,7 +44,7 @@ extern volatile int64 gb_write_log_time;
 extern volatile int64 gb_n_write_log;
 #endif
 
-#if defined (UNIV_PMEMOBJ_PART_PL) || defined (UNIV_PMEMOBJ_WAL_ELR)
+#if defined (UNIV_PMEMOBJ_PART_PL) || defined (UNIV_PMEMOBJ_WAL_ELR) || defined(UNIV_PMEMOBJ_WAL)
 #include "my_pmemobj.h"
 extern PMEM_WRAPPER* gb_pmw; 
 #endif /* UNIV_PMEMOBJ_PART_PL */
@@ -1369,7 +1369,7 @@ mtr_t::Command::execute()
 #endif
 }
 
-#else //old method
+#else //old method for UNIV_SKIPLOG
 
 // In PL-NVM, we keep log records in our data structure
 // This function just release the resource without writing any logs
@@ -1410,8 +1410,9 @@ mtr_t::Command::execute()
 	release_resources();
 }
 #endif //UNIV_PMEMOBJ_PART_PL
-#elif defined (UNIV_PMEMOBJ_WAL) && defined (UNIV_PMEMOBJ_WAL_ELR)
-	//Early lock release
+//#elif defined (UNIV_PMEMOBJ_WAL) && defined (UNIV_PMEMOBJ_WAL_ELR)
+#elif defined (UNIV_PMEMOBJ_WAL)
+	//Centralized logging methods: regular or Early lock release
 void
 mtr_t::Command::execute()
 {
@@ -1596,7 +1597,10 @@ mtr_t::Command::execute()
 #if defined(UNIV_PMEMOBJ_LOG) || defined(UNIV_PMEMOBJ_WAL)
 		// update the lsn and buf_free
 		gb_pmw->plogbuf->lsn = log->lsn;
+		pmemobj_persist(gb_pmw->pop, &gb_pmw->plogbuf->lsn, sizeof(gb_pmw->plogbuf->lsn));
+
 		gb_pmw->plogbuf->buf_free = log->buf_free;	
+		pmemobj_persist(gb_pmw->pop, &gb_pmw->plogbuf->buf_free, sizeof(gb_pmw->plogbuf->buf_free));
 #endif /*UNIV_PMEMOBJ_LOG */
 		srv_stats.log_write_requests.inc();
 
@@ -1611,21 +1615,26 @@ mtr_t::Command::execute()
 	if (m_impl->m_made_dirty) {
 		log_flush_order_mutex_enter();
 	}
-
+#if defined (UNIV_PMEMOBJ_WAL_ELR)
 	/* It is now safe to release the log mutex because the
 	flush_order mutex will ensure that we are the first one
 	to insert into the flush list. */
 	log_mutex_exit();
+#endif //UNIV_PMEMOBJ_WAL_ELR
 
 	//now we do the memcpy
 	TX_BEGIN(gb_pmw->pop) {
 		TX_MEMCPY(start_cpy, start_log_ptr, len_cpy);
 	} TX_ONABORT {
 	} TX_END
+
 	gb_pmw->plogbuf->need_recv = true;
+	pmemobj_persist(gb_pmw->pop, &gb_pmw->plogbuf->need_recv, sizeof(gb_pmw->plogbuf->need_recv));
 
 	m_impl->m_mtr->m_commit_lsn = m_end_lsn;
-
+#if !defined(UNIV_PMEMOBJ_WAL_ELR)
+	log_mutex_exit();
+#endif
 	release_blocks();
 
 	if (m_impl->m_made_dirty) {