fix DBW bugs that don't flush DBW in buf_dblwr_update()

Author: trdtnguyen

storage/innobase/buf/buf0dblwr.cc

@@ -847,7 +847,11 @@ buf_dblwr_update(
 			mutex_exit(&buf_dblwr->mutex);
 			/* This will finish the batch. Sync data files
 			to the disk. */
+#if defined (UNIV_PMEMOBJ_DBW)
+			//We do not need this flush 
+#else //original
 			fil_flush_file_spaces(FIL_TYPE_TABLESPACE);
+#endif
 			mutex_enter(&buf_dblwr->mutex);
 			/* We can now reuse the doublewrite memory buffer: */
 			buf_dblwr->first_free = 0;

storage/innobase/srv/srv0start.cc

@@ -2868,11 +2868,25 @@ innobase_shutdown_for_mysql(void)
 #endif
 	pm_wrapper_free(gb_pmw);
 #endif
+
 #if defined (UNIV_TRACE_FLUSH_TIME)
 	printf("=== > TRACE FLUSH TIME: total flush time (ms) = %zu\n ", gb_flush_time);
-	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME: total flush time (ms) = %zu", gb_flush_time);
+//Add the method name in the trace out
+#if defined (UNIV_PMEMOBJ_DBW)
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_DBW: total flush time (ms) = %zu", gb_flush_time);
+#elif defined (UNIV_PMEMOBJ_BUF) && defined (UNIV_PMEMOBJ_WAL)
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_WAL_LESS: total flush time (ms) = %zu", gb_flush_time);
+#elif defined (UNIV_PMEMOBJ_BUF) && defined (UNIV_PMEMOBJ_BUF_PARTITION)
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_PARTITION: total flush time (ms) = %zu", gb_flush_time);
+#elif defined (UNIV_PMEMOBJ_BUF)
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_EVEN: total flush time (ms) = %zu", gb_flush_time);
+#elif defined (UNIV_PMEMOBJ_WAL)
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_WAL: total flush time (ms) = %zu", gb_flush_time);
+#else
+	fprintf(gb_trace_file, "\n===>TRACE_FLUSH_TIME_ORI: total flush time (ms) = %zu", gb_flush_time);
+#endif //defined (UNIV_PMEMOBJ_DBW)
 	fclose(gb_trace_file);
-#endif 
+#endif  //defined (UNIV_TRACE_FLUSH_TIME)
 
 	/* 2. Make all threads created by InnoDB to exit */
 	srv_shutdown_all_bg_threads();