| commit | 1e5324e723116a5faf9da686993cc79c14d62d4b | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Wed Nov 14 14:25:31 2012 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Wed Nov 14 14:25:31 2012 -0700 |
| tree | 3706f8810ba16359cf3f48f9b9c12784f99f7987 | |
| parent | f681d0bac9c42e5d6bcb3601d2f3cfaa1c2cefb4 [diff] [blame] | |
| parent | 108fea772db5f1dd91e2fb67737e3e0d36827b76 [diff] [blame] |
Merge branch 'master' into gfio Conflicts: Makefile backend.c client.c fio.h options.c parse.c parse.h server.c server.h Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/client.h b/client.h index 341d260..10d6ec3 100644 --- a/client.h +++ b/client.h
@@ -42,10 +42,12 @@ int is_sock; int disk_stats_shown; unsigned int jobs; + unsigned int nr_stat; int error; int signal; int ipv6; int sent_job; + int did_stat; uint32_t type; uint32_t thread_number;