Merge branch 'libpmemblk' of https://github.com/bgbhpe/fio

diff --combined Makefile
index b0204b3cdd6352a1ded3caf326c1a5a0f592d4f2,16cbb61e1f5e499ef5121a3e5237f259f4c27f8c..1926f54e19f4aa53b4f38fe2247a63f6364294f0
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -26,7 -26,7 +26,7 @@@ OPTFLAGS= -g -ffast-mat
  CFLAGS        = -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS) -I. -I$(SRCDIR)
  LIBS  += -lm $(EXTLIBS)
  PROGS = fio
 -SCRIPTS = $(addprefix $(SRCDIR)/,tools/fio_generate_plots tools/plot/fio2gnuplot tools/genfio)
 +SCRIPTS = $(addprefix $(SRCDIR)/,tools/fio_generate_plots tools/plot/fio2gnuplot tools/genfio tools/fiologpaser.py)
  
  ifndef CONFIG_FIO_NO_OPT
    CFLAGS += -O3
@@@ -124,6 -124,9 +124,9 @@@ ifdef CONFIG_MT
    SOURCE += oslib/libmtd.c
    SOURCE += oslib/libmtd_legacy.c
  endif
+ ifdef CONFIG_PMEMBLK
+   SOURCE += engines/pmemblk.c
+ endif
  
  ifeq ($(CONFIG_TARGET_OS), Linux)
    SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
@@@ -231,12 -234,6 +234,12 @@@ T_DEDUPE_PROGS = t/fio-dedup
  T_VS_OBJS = t/verify-state.o t/log.o crc/crc32c.o crc/crc32c-intel.o t/debug.o
  T_VS_PROGS = t/fio-verify-state
  
 +T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o
 +T_PIPE_ASYNC_PROGS = t/read-to-pipe-async
 +
 +T_MEMLOCK_OBJS = t/memlock.o
 +T_MEMLOCK_PROGS = t/memlock
 +
  T_OBJS = $(T_SMALLOC_OBJS)
  T_OBJS += $(T_IEEE_OBJS)
  T_OBJS += $(T_ZIPF_OBJS)
@@@ -246,8 -243,6 +249,8 @@@ T_OBJS += $(T_GEN_RAND_OBJS
  T_OBJS += $(T_BTRACE_FIO_OBJS)
  T_OBJS += $(T_DEDUPE_OBJS)
  T_OBJS += $(T_VS_OBJS)
 +T_OBJS += $(T_PIPE_ASYNC_OBJS)
 +T_OBJS += $(T_MEMLOCK_OBJS)
  
  ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS)))
      T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
@@@ -380,12 -375,6 +383,12 @@@ cairo_text_helpers.o: cairo_text_helper
  printing.o: printing.c printing.h
        $(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $<
  
 +t/read-to-pipe-async: $(T_PIPE_ASYNC_OBJS)
 +      $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_PIPE_ASYNC_OBJS) $(LIBS)
 +
 +t/memlock: $(T_MEMLOCK_OBJS)
 +      $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_MEMLOCK_OBJS) $(LIBS)
 +
  t/stest: $(T_SMALLOC_OBJS)
        $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_SMALLOC_OBJS) $(LIBS)
  
@@@ -438,8 -427,6 +441,8 @@@ doc: tools/plot/fio2gnuplot.
        @man -t tools/fio_generate_plots.1 | ps2pdf - fio_generate_plots.pdf
        @man -t tools/plot/fio2gnuplot.1 | ps2pdf - fio2gnuplot.pdf
  
 +test:
 +
  install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
        $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)