bool steadystate_enabled = false;
+void steadystate_free(struct thread_data *td)
+{
+ free(td->ss.iops_data);
+ free(td->ss.bw_data);
+ td->ss.iops_data = NULL;
+ td->ss.bw_data = NULL;
+}
+
static void steadystate_alloc(struct thread_data *td)
{
- int i;
+ td->ss.bw_data = calloc(td->ss.dur, sizeof(uint64_t));
+ td->ss.iops_data = calloc(td->ss.dur, sizeof(uint64_t));
- td->ss.bw_data = malloc(td->ss.dur * sizeof(unsigned long));
- td->ss.iops_data = malloc(td->ss.dur * sizeof(unsigned long));
- /* initialize so that it is obvious if the cache is not full in the output */
- for (i = 0; i < td->ss.dur; i++)
- td->ss.iops_data[i] = td->ss.bw_data[i] = 0;
+ td->ss.state |= FIO_SS_DATA;
}
void steadystate_setup(void)
{
- int i, prev_groupid;
struct thread_data *td, *prev_td;
+ int i, prev_groupid;
if (!steadystate_enabled)
return;
prev_groupid = -1;
prev_td = NULL;
for_each_td(td, i) {
- if (td->ts.ss == NULL)
+ if (!td->ss.dur)
continue;
if (!td->o.group_reporting) {
}
if (prev_groupid != td->groupid) {
- if (prev_td != NULL) {
- prev_td->ss.state |= __FIO_SS_DATA;
+ if (prev_td)
steadystate_alloc(prev_td);
- }
prev_groupid = td->groupid;
}
prev_td = td;
}
- if (prev_td != NULL && prev_td->o.group_reporting) {
- prev_td->ss.state |= __FIO_SS_DATA;
+ if (prev_td && prev_td->o.group_reporting)
steadystate_alloc(prev_td);
- }
}
-static bool steadystate_slope(unsigned long iops, unsigned long bw,
+static bool steadystate_slope(uint64_t iops, uint64_t bw,
struct thread_data *td)
{
int i, j;
double result;
struct steadystate_data *ss = &td->ss;
- unsigned long new_val;
+ uint64_t new_val;
ss->bw_data[ss->tail] = bw;
ss->iops_data[ss->tail] = iops;
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_IOPS)
new_val = iops;
else
new_val = bw;
- if (ss->tail < ss->head || (ss->tail - ss->head == ss->dur - 1)) {
- if (ss->sum_y == 0) { /* first time through */
- for(i = 0; i < ss->dur; i++) {
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_BUFFER_FULL || ss->tail - ss->head == ss->dur - 1) {
+ if (!(ss->state & FIO_SS_BUFFER_FULL)) {
+ /* first time through */
+ for(i = 0, ss->sum_y = 0; i < ss->dur; i++) {
+ if (ss->state & FIO_SS_IOPS)
ss->sum_y += ss->iops_data[i];
else
ss->sum_y += ss->bw_data[i];
- j = ss->head + i;
- if (j >= ss->dur)
- j -= ss->dur;
- if (ss->state & __FIO_SS_IOPS)
+ j = (ss->head + i) % ss->dur;
+ if (ss->state & FIO_SS_IOPS)
ss->sum_xy += i * ss->iops_data[j];
else
ss->sum_xy += i * ss->bw_data[j];
}
+ ss->state |= FIO_SS_BUFFER_FULL;
} else { /* easy to update the sums */
ss->sum_y -= ss->oldest_y;
ss->sum_y += new_val;
ss->sum_xy = ss->sum_xy - ss->sum_y + ss->dur * new_val;
}
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_IOPS)
ss->oldest_y = ss->iops_data[ss->head];
else
ss->oldest_y = ss->bw_data[ss->head];
*/
ss->slope = (ss->sum_xy - (double) ss->sum_x * ss->sum_y / ss->dur) /
(ss->sum_x_sq - (double) ss->sum_x * ss->sum_x / ss->dur);
- if (ss->state & __FIO_SS_PCT)
+ if (ss->state & FIO_SS_PCT)
ss->criterion = 100.0 * ss->slope / (ss->sum_y / ss->dur);
else
ss->criterion = ss->slope;
dprint(FD_STEADYSTATE, "sum_y: %llu, sum_xy: %llu, slope: %f, "
"criterion: %f, limit: %f\n",
- ss->sum_y, ss->sum_xy, ss->slope,
- ss->criterion, ss->limit);
+ (unsigned long long) ss->sum_y,
+ (unsigned long long) ss->sum_xy,
+ ss->slope, ss->criterion, ss->limit);
result = ss->criterion * (ss->criterion < 0.0 ? -1.0 : 1.0);
if (result < ss->limit)
return false;
}
-static bool steadystate_deviation(unsigned long iops, unsigned long bw,
+static bool steadystate_deviation(uint64_t iops, uint64_t bw,
struct thread_data *td)
{
int i;
ss->bw_data[ss->tail] = bw;
ss->iops_data[ss->tail] = iops;
- if (ss->tail < ss->head || (ss->tail - ss->head == ss->dur - 1)) {
- if (ss->sum_y == 0) { /* first time through */
- for(i = 0; i < ss->dur; i++)
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_BUFFER_FULL || ss->tail - ss->head == ss->dur - 1) {
+ if (!(ss->state & FIO_SS_BUFFER_FULL)) {
+ /* first time through */
+ for(i = 0, ss->sum_y = 0; i < ss->dur; i++)
+ if (ss->state & FIO_SS_IOPS)
ss->sum_y += ss->iops_data[i];
else
ss->sum_y += ss->bw_data[i];
+ ss->state |= FIO_SS_BUFFER_FULL;
} else { /* easy to update the sum */
ss->sum_y -= ss->oldest_y;
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_IOPS)
ss->sum_y += ss->iops_data[ss->tail];
else
ss->sum_y += ss->bw_data[ss->tail];
}
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_IOPS)
ss->oldest_y = ss->iops_data[ss->head];
else
ss->oldest_y = ss->bw_data[ss->head];
ss->deviation = 0.0;
for (i = 0; i < ss->dur; i++) {
- if (ss->state & __FIO_SS_IOPS)
+ if (ss->state & FIO_SS_IOPS)
diff = ss->iops_data[i] - mean;
else
diff = ss->bw_data[i] - mean;
ss->deviation = max(ss->deviation, diff * (diff < 0.0 ? -1.0 : 1.0));
}
- if (ss->state & __FIO_SS_PCT)
+ if (ss->state & FIO_SS_PCT)
ss->criterion = 100.0 * ss->deviation / mean;
else
ss->criterion = ss->deviation;
dprint(FD_STEADYSTATE, "sum_y: %llu, mean: %f, max diff: %f, "
"objective: %f, limit: %f\n",
- ss->sum_y, mean, ss->deviation,
- ss->criterion, ss->limit);
+ (unsigned long long) ss->sum_y, mean,
+ ss->deviation, ss->criterion, ss->limit);
if (ss->criterion < ss->limit)
return true;
int i, j, ddir, prev_groupid, group_ramp_time_over = 0;
unsigned long rate_time;
struct thread_data *td, *td2;
- struct timeval now;
- unsigned long group_bw = 0, group_iops = 0;
- unsigned long long td_iops;
- unsigned long long td_bytes;
+ struct timespec now;
+ uint64_t group_bw = 0, group_iops = 0;
+ uint64_t td_iops, td_bytes;
bool ret;
prev_groupid = -1;
struct steadystate_data *ss = &td->ss;
if (!ss->dur || td->runstate <= TD_SETTING_UP ||
- td->runstate >= TD_EXITED || (ss->state & __FIO_SS_ATTAINED))
+ td->runstate >= TD_EXITED || !ss->state ||
+ ss->state & FIO_SS_ATTAINED)
continue;
td_iops = 0;
prev_groupid = td->groupid;
fio_gettime(&now, NULL);
- if (ss->ramp_time && !(ss->state & __FIO_SS_RAMP_OVER)) {
+ if (ss->ramp_time && !(ss->state & FIO_SS_RAMP_OVER)) {
/*
* Begin recording data one second after ss->ramp_time
* has elapsed
*/
if (utime_since(&td->epoch, &now) >= (ss->ramp_time + 1000000L))
- ss->state |= __FIO_SS_RAMP_OVER;
+ ss->state |= FIO_SS_RAMP_OVER;
}
td_io_u_lock(td);
- for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++) {
+ for (ddir = 0; ddir < DDIR_RWDIR_CNT; ddir++) {
td_iops += td->io_blocks[ddir];
td_bytes += td->io_bytes[ddir];
}
* prev_iops/bw the first time through after ss->ramp_time
* is done.
*/
- if (ss->state & __FIO_SS_RAMP_OVER) {
+ if (ss->state & FIO_SS_RAMP_OVER) {
group_bw += 1000 * (td_bytes - ss->prev_bytes) / rate_time;
group_iops += 1000 * (td_iops - ss->prev_iops) / rate_time;
++group_ramp_time_over;
ss->prev_iops = td_iops;
ss->prev_bytes = td_bytes;
- if (td->o.group_reporting && !(ss->state & __FIO_SS_DATA))
+ if (td->o.group_reporting && !(ss->state & FIO_SS_DATA))
continue;
/*
dprint(FD_STEADYSTATE, "steadystate_check() thread: %d, "
"groupid: %u, rate_msec: %ld, "
- "iops: %lu, bw: %lu, head: %d, tail: %d\n",
- i, td->groupid, rate_time, group_iops,
- group_bw, ss->head, ss->tail);
+ "iops: %llu, bw: %llu, head: %d, tail: %d\n",
+ i, td->groupid, rate_time,
+ (unsigned long long) group_iops,
+ (unsigned long long) group_bw,
+ ss->head, ss->tail);
- if (td->o.ss & __FIO_SS_SLOPE)
+ if (ss->state & FIO_SS_SLOPE)
ret = steadystate_slope(group_iops, group_bw, td);
else
ret = steadystate_deviation(group_iops, group_bw, td);
if (td->o.group_reporting) {
for_each_td(td2, j) {
if (td2->groupid == td->groupid) {
- td2->ss.state |= __FIO_SS_ATTAINED;
+ td2->ss.state |= FIO_SS_ATTAINED;
fio_mark_td_terminate(td2);
}
}
} else {
- ss->state |= __FIO_SS_ATTAINED;
+ ss->state |= FIO_SS_ATTAINED;
fio_mark_td_terminate(td);
}
}
ss->limit = o->ss_limit.u.f;
ss->ramp_time = o->ss_ramp_time;
- ss->state = o->ss;
+ ss->state = o->ss_state;
if (!td->ss.ramp_time)
- ss->state |= __FIO_SS_RAMP_OVER;
+ ss->state |= FIO_SS_RAMP_OVER;
ss->sum_x = o->ss_dur * (o->ss_dur - 1) / 2;
ss->sum_x_sq = (o->ss_dur - 1) * (o->ss_dur) * (2*o->ss_dur - 1) / 6;
-
- td->ts.ss = ss;
}
/* make sure that ss options are consistent within reporting group */
return 0;
}
+
+uint64_t steadystate_bw_mean(struct thread_stat *ts)
+{
+ int i;
+ uint64_t sum;
+
+ for (i = 0, sum = 0; i < ts->ss_dur; i++)
+ sum += ts->ss_bw_data[i];
+
+ return sum / ts->ss_dur;
+}
+
+uint64_t steadystate_iops_mean(struct thread_stat *ts)
+{
+ int i;
+ uint64_t sum;
+
+ for (i = 0, sum = 0; i < ts->ss_dur; i++)
+ sum += ts->ss_iops_data[i];
+
+ return sum / ts->ss_dur;
+}
projects / fio.git / blobdiff