filebench/filebench.patch

   1 diff -urN filebench-1.4.4/bin/filebench filebench-1.4.4.port/bin/filebench
   2 --- filebench-1.4.4/bin/filebench       2008-10-31 14:38:00.000000000 -0400
   3 +++ filebench-1.4.4.port/bin/filebench  2009-04-02 17:28:48.000000000 -0400
   4 @@ -31,8 +31,8 @@
   5  my $QUIT = 0;
   6  my $USE_XANADU = 0;
   7  my $TIMEOUT = 60;
   8 -my $FILEBENCH = "/opt/filebench";
   9 -my $PROG = "/opt/filebench/bin/go_filebench";
  10 +my $FILEBENCH = "/usr/share/filebench";
  11 +my $PROG = "/usr/bin/go_filebench";
  12  my $FSCRIPT;
  13  my $SCRIPT_NO;
  14  my @CONFLIST;
  15 diff -urN filebench-1.4.4/configure.in filebench-1.4.4.port/configure.in
  16 --- filebench-1.4.4/configure.in        2009-03-17 10:13:16.000000000 -0400
  17 +++ filebench-1.4.4.port/configure.in   2009-04-02 17:22:50.000000000 -0400
  18 @@ -80,7 +80,7 @@
  19         ##DEFINES="-DLINUX_PORT -D_XOPEN_SOURCE=500 -D_LARGEFILE_SOURCE64 -D_FILE_OFFSET_BITS=64 -D__USE_LARGEFILE64 -D__USE_UNIX98"
  20         DEFINES="-DLINUX_PORT -D_GNU_SOURCE -D__USE_LARGEFILE64"
  21         CFLAGS="${CFLAGS=} -O -I/usr/include/nptl -DYYDEBUG=1"
  22 -       LDLIBS="-lm  -lm -lpthread -laio -lfl -lrt -ltecla -lsocket -lnsl"
  23 +       LDLIBS="-lm  -lm -lpthread -laio -lfl -lrt -ltecla -lnsl"
  24         LFLAGS="-t"
  25         YFLAGS="-d"
  26          AC_DEFINE(HAVE_OFF64_T, 1,
  27 diff -urN filebench-1.4.4/filebench/fb_avl.h filebench-1.4.4.port/filebench/fb_avl.h
  28 --- filebench-1.4.4/filebench/fb_avl.h  2009-03-16 15:53:31.000000000 -0400
  29 +++ filebench-1.4.4.port/filebench/fb_avl.h     2009-04-02 17:24:28.000000000 -0400
  30 @@ -155,6 +155,8 @@
  31  #define        AVL_INDEX2CHILD(x)      ((x) & 1)
  32  #define        AVL_MKINDEX(n, c)       ((avl_index_t)(n) | (c))
  33
  34 +#define ulong_t unsigned long
  35 +#define uint_t unsigned int
  36
  37  /*
  38   * The tree structure. The fields avl_root, avl_compar, and avl_offset come
  39 diff -urN filebench-1.4.4/filebench/multi_client_sync.c filebench-1.4.4.port/filebench/multi_client_sync.c
  40 --- filebench-1.4.4/filebench/multi_client_sync.c       2009-03-16 15:53:21.000000000 -0400
  41 +++ filebench-1.4.4.port/filebench/multi_client_sync.c  2009-04-02 17:24:41.000000000 -0400
  42 @@ -65,7 +65,7 @@
  43                 return (FILEBENCH_ERROR);
  44         }
  45
  46 -       if (gethostbyname_r(master_name, &master_info, buffer, MCS_MSGLENGTH,
  47 +       if (gethostbyname_r(master_name, &master_info, buffer, MCS_MSGLENGTH,NULL,
  48             &error_num) == NULL) {
  49                 filebench_log(LOG_ERROR, "could not locate sync master");
  50                 return (FILEBENCH_ERROR);
  51 diff -urN filebench-1.4.4/filebench/multi_client_sync.h filebench-1.4.4.port/filebench/multi_client_sync.h
  52 --- filebench-1.4.4/filebench/multi_client_sync.h       2009-03-16 15:53:32.000000000 -0400
  53 +++ filebench-1.4.4.port/filebench/multi_client_sync.h  2009-04-02 17:24:41.000000000 -0400
  54 @@ -28,7 +28,7 @@
  55
  56  #include <sys/types.h>
  57  #include <sys/socket.h>
  58 -#include <inet/ip.h>
  59 +#include <netinet/ip.h>
  60
  61  int mc_sync_open_sock(char *master_name, int master_port, char *client_name);
  62  int mc_sync_synchronize(int synch_point);