void timespec_add_msec(struct timespec *ts, unsigned int msec)
{
- unsigned long adj_nsec = 1000000 * msec;
+ uint64_t adj_nsec = 1000000ULL * msec;
ts->tv_nsec += adj_nsec;
if (adj_nsec >= 1000000000) {
- unsigned long adj_sec = adj_nsec / 1000000000UL;
+ uint64_t adj_sec = adj_nsec / 1000000000;
- ts->tv_nsec -= adj_sec * 1000000000UL;
+ ts->tv_nsec -= adj_sec * 1000000000;
ts->tv_sec += adj_sec;
}
- if (ts->tv_nsec >= 1000000000UL){
- ts->tv_nsec -= 1000000000UL;
+ if (ts->tv_nsec >= 1000000000){
+ ts->tv_nsec -= 1000000000;
ts->tv_sec++;
}
}
if (ts >= 1000000) {
req.tv_sec = ts / 1000000;
ts -= 1000000 * req.tv_sec;
+ /*
+ * Limit sleep to ~1 second at most, otherwise we
+ * don't notice then someone signaled the job to
+ * exit manually.
+ */
+ if (req.tv_sec > 1)
+ req.tv_sec = 1;
} else
req.tv_sec = 0;
return td->o.ramp_time && !td->ramp_time_over;
}
-static void parent_update_ramp(struct thread_data *td)
+static bool parent_update_ramp(struct thread_data *td)
{
struct thread_data *parent = td->parent;
if (!parent || parent->ramp_time_over)
- return;
+ return false;
reset_all_stats(parent);
- parent->ramp_time_over = 1;
+ parent->ramp_time_over = true;
td_set_runstate(parent, TD_RAMP);
+ return true;
}
bool ramp_time_over(struct thread_data *td)
return true;
if (utime_since_now(&td->epoch) >= td->o.ramp_time) {
- td->ramp_time_over = 1;
+ td->ramp_time_over = true;
reset_all_stats(td);
+ reset_io_stats(td);
td_set_runstate(td, TD_RAMP);
- parent_update_ramp(td);
+
+ /*
+ * If we have a parent, the parent isn't doing IO. Hence
+ * the parent never enters do_io(), which will switch us
+ * from RAMP -> RUNNING. Do this manually here.
+ */
+ if (parent_update_ramp(td))
+ td_set_runstate(td, TD_RUNNING);
+
return true;
}