fio: link fio code with gui code

Signed-off-by: Stephen M. Cameron <stephenmcameron@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/Makefile b/Makefile
index 76072973e056f8ccfae5d013b08c2c07b7078f75..c795ea48e6e02aaef8f528e0aea405f032402051 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ UNAME  := $(shell uname)
 GTKCFLAGS = `pkg-config gtk+-2.0 --cflags`
 GTKLDFLAGS = `pkg-config gtk+-2.0 --libs`
 
-SOURCE := gettime.c fio.c ioengines.c init.c stat.c log.c time.c filesetup.c \
+SOURCE := gettime.c ioengines.c init.c stat.c log.c time.c filesetup.c \
                eta.c verify.c memory.c io_u.c parse.c mutex.c options.c \
                rbtree.c smalloc.c filehash.c profile.c debug.c lib/rand.c \
                lib/num2str.c lib/ieee754.c $(wildcard crc/*.c) engines/cpu.c \
@@ -67,7 +67,12 @@ ifneq (,$(findstring CYGWIN,$(UNAME)))
   CC     = x86_64-w64-mingw32-gcc
 endif
 
+FIO_SOURCE = $(SOURCE) fio.c
+GFIO_SOURCE = $(SOURCE) gfio.c
+
 OBJS = $(SOURCE:.c=.o)
+FIO_OBJS = $(OBJS) fio.o
+GFIO_OBJS = $(OBJS) gfio.o
 
 T_SMALLOC_OBJS = t/stest.o
 T_SMALLOC_OBJS += mutex.o smalloc.o t/log.o
@@ -108,8 +113,8 @@ t/stest: $(T_SMALLOC_OBJS)
 t/ieee754: $(T_IEEE_OBJS)
        $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IEEE_OBJS) $(LIBS) $(LDFLAGS)
 
-fio: $(OBJS)
-       $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
+fio: $(FIO_OBJS)
+       $(QUIET_CC)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(FIO_OBJS) $(LIBS) $(LDFLAGS)
 
 .depend: $(SOURCE)
        $(QUIET_DEP)$(CC) -MM $(CFLAGS) $(CPPFLAGS) $(SOURCE) 1> .depend
@@ -133,7 +138,8 @@ ifneq ($(wildcard .depend),)
 include .depend
 endif
 
-gfio:  gfio.c
-       $(CC) ${CFLAGS} ${GTKCFLAGS} ${GTKLDFLAGS} -pthread -o gfio gfio.c
+gfio:  $(OBJS) gfio.c
+       $(CC) ${CPPFLAGS} ${CFLAGS} ${GTKCFLAGS} ${LDFLAGS} ${GTKLDFLAGS} -pthread -o gfio $(OBJS) gfio.c $(LIBS) ${LDFLAGS}
+
 
 

diff --git a/gfio.c b/gfio.c
index af4d24a93ec0eff5cbd49ca9849a102908ae287c..ed9b1f5148d14913e497fd33fbc4a2e6faecafd8 100644 (file)
--- a/gfio.c
+++ b/gfio.c
@@ -20,8 +20,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
+#include <locale.h>
+
 #include <gtk/gtk.h>
 
+#include "fio_initialization.h"
+#include "fio.h"
+
+static struct client_ops *gfio_client_ops = &fio_client_ops;
+
 #define ARRAYSIZE(x) (sizeof((x)) / (sizeof((x)[0])))
 
 typedef void (*clickfunction)(GtkWidget *widget, gpointer data);
@@ -96,10 +103,12 @@ static void init_ui(int *argc, char **argv[], struct gui *ui)
        gtk_widget_show_all(ui->window);
 }
 
-int main(int argc, char *argv[])
+int main(int argc, char *argv[], char *envp[])
 {
        struct gui ui;
 
+       if (initialize_fio(envp))
+               return 1;
        init_ui(&argc, &argv, &ui);
        gtk_main();
        return 0;