projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix two error paths
[fio.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 3f654f02b860c66ccfe501a807c92b7522bf563d..65e95be6c9f4a5a485075e09eccea7033c62356e 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-15,7
+15,7
@@
include config-host.mak
endif
DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
endif
DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
-CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(DEBUGFLAGS)
+CPPFLAGS= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-DFIO_INTERNAL
$(DEBUGFLAGS)
OPTFLAGS= -O3 -g -ffast-math
CFLAGS = -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS)
LIBS += -lm $(EXTLIBS)
OPTFLAGS= -O3 -g -ffast-math
CFLAGS = -std=gnu99 -Wwrite-strings -Wall -Wdeclaration-after-statement $(OPTFLAGS) $(EXTFLAGS) $(BUILD_CFLAGS)
LIBS += -lm $(EXTLIBS)
@@
-35,7
+35,8
@@
SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
cconv.c lib/prio_tree.c json.c lib/zipf.c lib/axmap.c \
lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
lib/hweight.c lib/getrusage.c idletime.c td_error.c \
cconv.c lib/prio_tree.c json.c lib/zipf.c lib/axmap.c \
lib/lfsr.c gettime-thread.c helpers.c lib/flist_sort.c \
lib/hweight.c lib/getrusage.c idletime.c td_error.c \
- profiles/tiobench.c profiles/act.c io_u_queue.c
+ profiles/tiobench.c profiles/act.c io_u_queue.c filelock.c \
+ lib/tp.c
ifdef CONFIG_64BIT_LLP64
CFLAGS += -DBITS_PER_LONG=32
ifdef CONFIG_64BIT_LLP64
CFLAGS += -DBITS_PER_LONG=32
@@
-76,6
+77,9
@@
endif
ifdef CONFIG_WINDOWSAIO
SOURCE += engines/windowsaio.c
endif
ifdef CONFIG_WINDOWSAIO
SOURCE += engines/windowsaio.c
endif
+ifdef CONFIG_RBD
+ SOURCE += engines/rbd.c
+endif
ifndef CONFIG_STRSEP
SOURCE += lib/strsep.c
endif
ifndef CONFIG_STRSEP
SOURCE += lib/strsep.c
endif
@@
-88,6
+92,14
@@
endif
ifndef CONFIG_INET_ATON
SOURCE += lib/inet_aton.c
endif
ifndef CONFIG_INET_ATON
SOURCE += lib/inet_aton.c
endif
+ifdef CONFIG_GFAPI
+ SOURCE += engines/glusterfs.c
+ SOURCE += engines/glusterfs_sync.c
+ SOURCE += engines/glusterfs_async.c
+ ifdef CONFIG_GF_FADVISE
+ CFLAGS += "-DGFAPI_USE_FADVISE"
+ endif
+endif
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
ifeq ($(CONFIG_TARGET_OS), Linux)
SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \
@@
-210,7
+222,7
@@
FIO-VERSION-FILE: FORCE
override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
override CFLAGS += -DFIO_VERSION='"$(FIO_VERSION)"'
-.c.o: FORCE FIO-VERSION-FILE
+%.o : %.c
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $*.c > $*.d
@mv -f $*.d $*.d.tmp
$(QUIET_CC)$(CC) -o $@ $(CFLAGS) $(CPPFLAGS) -c $<
@$(CC) -MM $(CFLAGS) $(CPPFLAGS) $*.c > $*.d
@mv -f $*.d $*.d.tmp
@@
-271,10
+283,10
@@
t/lfsr-test: $(T_LFSR_TEST_OBJS)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_LFSR_TEST_OBJS) $(LIBS)
clean: FORCE
$(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_LFSR_TEST_OBJS) $(LIBS)
clean: FORCE
- -rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d config-host.mak config-host.h
+ -rm -f .depend $(FIO_OBJS) $(GFIO_OBJS) $(OBJS) $(T_OBJS) $(PROGS) $(T_PROGS) core.* core gfio FIO-VERSION-FILE *.d
lib/*.d crc/*.d engines/*.d profiles/*.d t/*.d
config-host.mak config-host.h
distclean: clean FORCE
distclean: clean FORCE
- @rm -f cscope.out
+ @rm -f cscope.out
fio.pdf fio_generate_plots.pdf fio2gnuplot.pdf
cscope:
@cscope -b -R
cscope:
@cscope -b -R
@@
-282,6
+294,11
@@
cscope:
tools/plot/fio2gnuplot.1:
@cat tools/plot/fio2gnuplot.manpage | txt2man -t fio2gnuplot > tools/plot/fio2gnuplot.1
tools/plot/fio2gnuplot.1:
@cat tools/plot/fio2gnuplot.manpage | txt2man -t fio2gnuplot > tools/plot/fio2gnuplot.1
+doc: tools/plot/fio2gnuplot.1
+ @man -t ./fio.1 | ps2pdf - fio.pdf
+ @man -t tools/fio_generate_plots.1 | ps2pdf - fio_generate_plots.pdf
+ @man -t tools/plot/fio2gnuplot.1 | ps2pdf - fio2gnuplot.pdf
+
install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
install: $(PROGS) $(SCRIPTS) tools/plot/fio2gnuplot.1 FORCE
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
$(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)