}
}
-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;
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_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;
+ 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;
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_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)
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;
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;
+ 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;
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);
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;
return 0;
}
-unsigned long long steadystate_bw_mean(struct thread_stat *ts)
+uint64_t steadystate_bw_mean(struct thread_stat *ts)
{
int i;
- unsigned long long sum;
+ uint64_t sum;
for (i = 0, sum = 0; i < ts->ss_dur; i++)
sum += ts->ss_bw_data[i];
return sum / ts->ss_dur;
}
-unsigned long long steadystate_iops_mean(struct thread_stat *ts)
+uint64_t steadystate_iops_mean(struct thread_stat *ts)
{
int i;
- unsigned long long sum;
+ uint64_t sum;
for (i = 0, sum = 0; i < ts->ss_dur; i++)
sum += ts->ss_iops_data[i];