[PATCH] Get rid of FIO_INST_PREFIX

We don't need it anymore, since we link in known io engines and unknown
ones have to be given with a full path.

Also fixup Makefiles for Solaris and FreeBSD, they were a bit outdated.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

diff --git a/Makefile b/Makefile
index 1ebad6af78ca7e0292096855b5f9ea8e09a0d97f..07ec6a9b116c700f0cff39f652542df36ac54623 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,10 +18,6 @@ prefix = /usr/local
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/fio
 
 bindir = $(prefix)/bin
 libdir = $(prefix)/lib/fio
 

-FIO_INST_DIR = $(subst ','\'',$(prefix))
-
-CFLAGS += '-D_INST_PREFIX="$(FIO_INST_DIR)"'
-

 all: depend $(PROGS) $(SCRIPTS)
 
 fio: $(OBJS)
 all: depend $(PROGS) $(SCRIPTS)
 
 fio: $(OBJS)

diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD
index ce7b05663b64333b627826a1cb6c2cbe646287da..06cdc80b20a8a4fbe9f287f08308f93f881de28f 100644 (file)
--- a/Makefile.FreeBSD
+++ b/Makefile.FreeBSD
@@ -3,11 +3,17 @@ CFLAGS        = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS  = fio
 SCRIPTS = fio_generate_plots
 
 PROGS  = fio
 SCRIPTS = fio_generate_plots
 

-OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
+       filesetup.o eta.o verify.o memory.o io_u.o parse.o
+
+OBJS += engines/fio-engine-cpu.o
+OBJS += engines/fio-engine-mmap.o
+OBJS += engines/fio-engine-posixaio.o
+OBJS += engines/fio-engine-sync.o

 
 all: depend $(PROGS) $(SCRIPTS)
 
 
 all: depend $(PROGS) $(SCRIPTS)
 

-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+fio: $(OBJS)

        $(CC) $(CFLAGS) -o $@ $(OBJS) -lpthread -lm
 
 clean:
        $(CC) $(CFLAGS) -o $@ $(OBJS) -lpthread -lm
 
 clean:

diff --git a/Makefile.solaris b/Makefile.solaris
index 295928c77d0c9411260f1609e45b728088417946..442a1030c489239702ed40b9f462e07c19cf2aae 100644 (file)
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -3,11 +3,17 @@ CFLAGS        = -Wall -O2 -g -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 PROGS  = fio
 SCRIPTS = fio_generate_plots
 
 PROGS  = fio
 SCRIPTS = fio_generate_plots
 

-OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+OBJS = fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
+       filesetup.o eta.o verify.o memory.o io_u.o parse.o
+
+OBJS += engines/fio-engine-cpu.o
+OBJS += engines/fio-engine-mmap.o
+OBJS += engines/fio-engine-posixaio.o
+OBJS += engines/fio-engine-sync.o

 
 all: depend $(PROGS) $(SCRIPTS)
 
 
 all: depend $(PROGS) $(SCRIPTS)
 

-fio: fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o
+fio: $(OBJS)

        $(CC) $(CFLAGS) -o $@ $(OBJS) -lc -lpthread -lm -laio -lrt
 
 clean:
        $(CC) $(CFLAGS) -o $@ $(OBJS) -lc -lpthread -lm -laio -lrt
 
 clean:

diff --git a/fio.c b/fio.c
index ed14c41f0c645bc5c9378b84d183e89c81955d34..42ac0c9b0d7dd0904b90bfd2451c4681ac42b48a 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -45,7 +45,6 @@ int groupid = 0;
 int thread_number = 0;
 int shm_id = 0;
 int temp_stall_ts;
 int thread_number = 0;
 int shm_id = 0;
 int temp_stall_ts;

-const char *fio_inst_prefix = _INST_PREFIX;

 
 static volatile int startup_sem;
 
 
 static volatile int startup_sem;
 

diff --git a/fio.h b/fio.h
index 1115c62ea3b7555fdaf6e43368b15c6e3086099e..faa06a4f4c280a687e76fc545f2ccb25f775c128 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -355,7 +355,6 @@ extern int groupid;
 extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;
 extern int terse_output;
 extern FILE *f_out;
 extern FILE *f_err;

-extern const char *fio_inst_prefix;

 extern int temp_stall_ts;
 
 extern struct thread_data *threads;
 extern int temp_stall_ts;
 
 extern struct thread_data *threads;