Merge branch 'master' into gfio
authorJens Axboe <axboe@kernel.dk>
Wed, 9 Jan 2013 13:10:36 +0000 (14:10 +0100)
committerJens Axboe <axboe@kernel.dk>
Wed, 9 Jan 2013 13:10:36 +0000 (14:10 +0100)
Conflicts:
client.c
server.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
1  2 
HOWTO
Makefile
backend.c
engines/libaio.c
filesetup.c
fio.1
init.c
server.h
stat.h

diff --cc HOWTO
Simple merge
diff --cc Makefile
+++ b/Makefile
@@@ -4,9 -2,9 +2,9 @@@ CC ?= gc
  DEBUGFLAGS = -D_FORTIFY_SOURCE=2 -DFIO_INC_DEBUG
  CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
        $(DEBUGFLAGS)
- OPTFLAGS= -O3 -g $(EXTFLAGS)
+ OPTFLAGS= -O3 -g -ffast-math $(EXTFLAGS)
  CFLAGS        = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
 -LIBS  = -lm $(EXTLIBS)
 +LIBS  = -lm -lz $(EXTLIBS)
  PROGS = fio
  SCRIPTS = fio_generate_plots
  UNAME  := $(shell uname)
diff --cc backend.c
+++ b/backend.c
@@@ -1013,11 -1014,10 +1016,13 @@@ static void *thread_main(void *data
        } else
                td->pid = gettid();
  
+       fio_local_clock_init(td->o.use_thread);
        dprint(FD_PROCESS, "jobs pid=%d started\n", (int) td->pid);
  
 +      if (is_backend)
 +              fio_server_send_start(td);
 +
        INIT_FLIST_HEAD(&td->io_u_freelist);
        INIT_FLIST_HEAD(&td->io_u_busylist);
        INIT_FLIST_HEAD(&td->io_u_requeues);
Simple merge
diff --cc filesetup.c
Simple merge
diff --cc fio.1
Simple merge
diff --cc init.c
Simple merge
diff --cc server.h
+++ b/server.h
@@@ -27,10 -25,10 +27,10 @@@ struct fio_net_cmd 
         */
        uint16_t cmd_crc16;     /* cmd checksum */
        uint16_t pdu_crc16;     /* payload checksum */
-       uint8_t payload[0];     /* payload */
+       uint8_t payload[];      /* payload */
  };
  
 -struct fio_net_int_cmd {
 +struct fio_net_cmd_reply {
        struct flist_head list;
        struct timeval tv;
        uint64_t saved_tag;
@@@ -101,16 -91,9 +101,16 @@@ struct cmd_single_line_pdu 
  
  struct cmd_line_pdu {
        uint16_t lines;
-       struct cmd_single_line_pdu options[0];
 +      uint16_t client_type;
+       struct cmd_single_line_pdu options[];
  };
  
 +struct cmd_job_pdu {
 +      uint32_t buf_len;
 +      uint32_t client_type;
 +      uint8_t buf[0];
 +};
 +
  struct cmd_start_pdu {
        uint32_t jobs;
        uint32_t stat_outputs;
diff --cc stat.h
Simple merge