summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2019-08-15 09:16:19 -0600
committerJens Axboe <axboe@kernel.dk>2019-08-15 09:16:19 -0600
commitcd8920a40ef04625d9e76f63fa09fcaac9e9977e (patch)
treebbdedd35759abefd36c73240796839588e45e1a2
parentdc54b6ca3209c2da3df30e96d097f6de29d56d24 (diff)
downloadfio-cd8920a40ef04625d9e76f63fa09fcaac9e9977e.tar.gz
fio-cd8920a40ef04625d9e76f63fa09fcaac9e9977e.tar.bz2
stat: ensure that struct jobs_eta packs nicely
It has two holes in it, and some weird mid-struct packing. Let's clean it up. Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--server.h2
-rw-r--r--stat.h15
2 files changed, 10 insertions, 7 deletions
diff --git a/server.h b/server.h
index abb23bad..ac713252 100644
--- a/server.h
+++ b/server.h
@@ -48,7 +48,7 @@ struct fio_net_cmd_reply {
};
enum {
- FIO_SERVER_VER = 78,
+ FIO_SERVER_VER = 79,
FIO_SERVER_MAX_FRAGMENT_PDU = 1024,
FIO_SERVER_MAX_CMD_MB = 2048,
diff --git a/stat.h b/stat.h
index c209ab6c..ba7e290d 100644
--- a/stat.h
+++ b/stat.h
@@ -258,13 +258,15 @@ struct thread_stat {
uint32_t nr_pending; \
uint32_t nr_setting_up; \
\
- uint64_t m_rate[DDIR_RWDIR_CNT], t_rate[DDIR_RWDIR_CNT]; \
+ uint64_t m_rate[DDIR_RWDIR_CNT]; \
+ uint64_t t_rate[DDIR_RWDIR_CNT]; \
uint64_t rate[DDIR_RWDIR_CNT]; \
- uint32_t m_iops[DDIR_RWDIR_CNT] __attribute__((packed)); \
- uint32_t t_iops[DDIR_RWDIR_CNT] __attribute__((packed)); \
- uint32_t iops[DDIR_RWDIR_CNT] __attribute__((packed)); \
- uint64_t elapsed_sec __attribute__((packed)); \
- uint64_t eta_sec __attribute__((packed)); \
+ uint32_t m_iops[DDIR_RWDIR_CNT]; \
+ uint32_t t_iops[DDIR_RWDIR_CNT]; \
+ uint32_t iops[DDIR_RWDIR_CNT]; \
+ uint32_t pad; \
+ uint64_t elapsed_sec; \
+ uint64_t eta_sec; \
uint32_t is_pow2; \
uint32_t unit_base; \
\
@@ -276,6 +278,7 @@ struct thread_stat {
* Network 'copy' of run_str[] \
*/ \
uint32_t nr_threads; \
+ uint32_t pad2; \
uint8_t run_str[]; \
}