projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixup two compile warnings
[fio.git]
/
iolog.c
diff --git
a/iolog.c
b/iolog.c
index d4213dbec5bb282d0fba9c8cfb317a660273d722..2b7b0babf085e6185e6a077464a27c23db1ca761 100644
(file)
--- a/
iolog.c
+++ b/
iolog.c
@@
-674,14
+674,19
@@
void free_log(struct io_log *log)
sfree(log);
}
sfree(log);
}
-
static
inline unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
+inline unsigned long hist_sum(int j, int stride, unsigned int *io_u_plat,
unsigned int *io_u_plat_last)
{
unsigned long sum;
int k;
unsigned int *io_u_plat_last)
{
unsigned long sum;
int k;
- for (k = sum = 0; k < stride; k++)
- sum += io_u_plat[j + k] - io_u_plat_last[j + k];
+ if (io_u_plat_last) {
+ for (k = sum = 0; k < stride; k++)
+ sum += io_u_plat[j + k] - io_u_plat_last[j + k];
+ } else {
+ for (k = sum = 0; k < stride; k++)
+ sum += io_u_plat[j + k];
+ }
return sum;
}
return sum;
}
@@
-709,7
+714,7
@@
static void flush_hist_samples(FILE *f, int hist_coarseness, void *samples,
for (i = 0; i < nr_samples; i++) {
s = __get_sample(samples, log_offset, i);
for (i = 0; i < nr_samples; i++) {
s = __get_sample(samples, log_offset, i);
- entry = (struct io_u_plat_entry *) s->val;
+ entry = (struct io_u_plat_entry *)
(uintptr_t)
s->val;
io_u_plat = entry->io_u_plat;
entry_before = flist_first_entry(&entry->list, struct io_u_plat_entry, list);
io_u_plat = entry->io_u_plat;
entry_before = flist_first_entry(&entry->list, struct io_u_plat_entry, list);
@@
-1062,9
+1067,9
@@
void flush_log(struct io_log *log, bool do_append)
if (log == log->td->clat_hist_log)
flush_hist_samples(f, log->hist_coarseness, cur_log->log,
if (log == log->td->clat_hist_log)
flush_hist_samples(f, log->hist_coarseness, cur_log->log,
-
cur_log->nr_samples * log_entry_sz(
log));
+
log_sample_sz(log, cur_
log));
else
else
- flush_samples(f, cur_log->log,
cur_log->nr_samples * log_entry_sz(
log));
+ flush_samples(f, cur_log->log,
log_sample_sz(log, cur_
log));
sfree(cur_log);
}
sfree(cur_log);
}