Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
static unsigned int rate[2], iops[2];
static int linelen_last;
static int eta_good;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
if (temp_stall_ts || terse_output || eta_print == FIO_ETA_NEVER)
return;
eta_sec = 0;
for_each_td(td, i) {
eta_sec = 0;
for_each_td(td, i) {
+ if (!i2p && is_power_of_2(td->o.kb_base))
+ i2p = 1;
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
if (exitall_on_terminate) {
if (eta_secs[i] < eta_sec)
eta_sec = eta_secs[i];
if (m_rate || t_rate) {
char *tr, *mr;
if (m_rate || t_rate) {
char *tr, *mr;
- mr = num2str(m_rate, 4, 0, 1);
- tr = num2str(t_rate, 4, 0, 1);
+ mr = num2str(m_rate, 4, 0, i2p);
+ tr = num2str(t_rate, 4, 0, i2p);
printf(", CR=%s/%s KB/s", tr, mr);
free(tr);
free(mr);
printf(", CR=%s/%s KB/s", tr, mr);
free(tr);
free(mr);
sprintf(perc_str, "%3.1f%% done", perc);
}
sprintf(perc_str, "%3.1f%% done", perc);
}
- rate_str[0] = num2str(rate[0], 5, 10, 1);
- rate_str[1] = num2str(rate[1], 5, 10, 1);
+ rate_str[0] = num2str(rate[0], 5, 10, i2p);
+ rate_str[1] = num2str(rate[1], 5, 10, i2p);
iops_str[0] = num2str(iops[0], 4, 1, 0);
iops_str[1] = num2str(iops[1], 4, 1, 0);
iops_str[0] = num2str(iops[0], 4, 1, 0);
iops_str[1] = num2str(iops[1], 4, 1, 0);
#include "parse.h"
#include "lib/fls.h"
#include "parse.h"
#include "lib/fls.h"
-unsigned int fio_kb_base = 1024;
-
#define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var)
/*
#define td_var_offset(var) ((size_t) &((struct thread_options *)0)->var)
/*
- if (str_to_decimal(fname, &val, 1)) {
+ if (str_to_decimal(fname, &val, 1, &td)) {
log_err("fio: bssplit conversion failed\n");
free(td->o.bssplit);
return 1;
log_err("fio: bssplit conversion failed\n");
free(td->o.bssplit);
return 1;
- fio_kb_base = td->o.kb_base;
__options_mem(td, 0);
#endif
}
__options_mem(td, 0);
#endif
}
+
+unsigned int fio_get_kb_base(void *data)
+{
+ struct thread_data *td = data;
+ unsigned int kb_base = 0;
+
+ if (td)
+ kb_base = td->o.kb_base;
+ if (!kb_base)
+ kb_base = 1024;
+
+ return kb_base;
+}
#include "debug.h"
static struct fio_option *fio_options;
#include "debug.h"
static struct fio_option *fio_options;
-extern unsigned int fio_kb_base;
+extern unsigned int fio_get_kb_base(void *);
static int vp_cmp(const void *p1, const void *p2)
{
static int vp_cmp(const void *p1, const void *p2)
{
-static unsigned long long get_mult_bytes(char c)
+static unsigned long long get_mult_bytes(char c, void *data)
+ unsigned int kb_base = fio_get_kb_base(data);
unsigned long long ret = 1;
switch (c) {
unsigned long long ret = 1;
switch (c) {
break;
case 'p':
case 'P':
break;
case 'p':
case 'P':
- ret *= (unsigned long long) fio_kb_base;
+ ret *= (unsigned long long) kb_base;
- ret *= (unsigned long long) fio_kb_base;
+ ret *= (unsigned long long) kb_base;
- ret *= (unsigned long long) fio_kb_base;
+ ret *= (unsigned long long) kb_base;
- ret *= (unsigned long long) fio_kb_base;
+ ret *= (unsigned long long) kb_base;
- ret *= (unsigned long long) fio_kb_base;
+ ret *= (unsigned long long) kb_base;
/*
* convert string into decimal value, noting any size suffix
*/
/*
* convert string into decimal value, noting any size suffix
*/
-int str_to_decimal(const char *str, long long *val, int kilo)
+int str_to_decimal(const char *str, long long *val, int kilo, void *data)
- *val *= get_mult_bytes(str[len - 1]);
+ *val *= get_mult_bytes(str[len - 1], data);
else
*val *= get_mult_time(str[len - 1]);
return 0;
}
else
*val *= get_mult_time(str[len - 1]);
return 0;
}
-static int check_str_bytes(const char *p, long long *val)
+static int check_str_bytes(const char *p, long long *val, void *data)
- return str_to_decimal(p, val, 1);
+ return str_to_decimal(p, val, 1, data);
}
static int check_str_time(const char *p, long long *val)
{
}
static int check_str_time(const char *p, long long *val)
{
- return str_to_decimal(p, val, 0);
+ return str_to_decimal(p, val, 0, NULL);
}
void strip_blank_front(char **p)
}
void strip_blank_front(char **p)
-static int check_range_bytes(const char *str, long *val)
+static int check_range_bytes(const char *str, long *val, void *data)
return 1;
if (sscanf(str, "%lu%c", val, &suffix) == 2) {
return 1;
if (sscanf(str, "%lu%c", val, &suffix) == 2) {
- *val *= get_mult_bytes(suffix);
+ *val *= get_mult_bytes(suffix, data);
if (is_time)
ret = check_str_time(ptr, &ull);
else
if (is_time)
ret = check_str_time(ptr, &ull);
else
- ret = check_str_bytes(ptr, &ull);
+ ret = check_str_bytes(ptr, &ull, data);
- if (!check_range_bytes(p1, &ul1) &&
- !check_range_bytes(p2, &ul2)) {
+ if (!check_range_bytes(p1, &ul1, data) &&
+ !check_range_bytes(p2, &ul2, data)) {
ret = 0;
if (ul1 > ul2) {
unsigned long foo = ul1;
ret = 0;
if (ul1 > ul2) {
unsigned long foo = ul1;
extern void strip_blank_front(char **);
extern void strip_blank_end(char *);
extern void strip_blank_front(char **);
extern void strip_blank_end(char *);
-extern int str_to_decimal(const char *, long long *, int);
+extern int str_to_decimal(const char *, long long *, int, void *);
/*
* Handlers for the options
/*
* Handlers for the options