td_set_runstate(td, TD_RUNNING);
}
-/*
- * Not really an io thread, all it does is burn CPU cycles in the specified
- * manner.
- */
-static void do_cpuio(struct thread_data *td)
-{
- struct timeval e;
- int split = 100 / td->cpuload;
- int i = 0;
-
- while (!td->terminate) {
- fio_gettime(&e, NULL);
-
- if (runtime_exceeded(td, &e))
- break;
-
- if (!(i % split))
- __usec_sleep(10000);
- else
- usec_sleep(td, 10000);
-
- i++;
- }
-}
-
/*
* Main IO worker function. It retrieves io_u's to process and queues
* and reaps them, checking for rate and errors along the way.
int i, max_units;
char *p;
- if (td->io_ops->flags & FIO_CPUIO)
- return 0;
-
if (td->io_ops->flags & FIO_SYNCIO)
max_units = 1;
else
FILE *f;
int ret;
- if (td->io_ops->flags & FIO_CPUIO)
+ if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
sprintf(tmp, "%s/queue/scheduler", td->sysfs_root);
td->ts.stat_io_bytes[0] = td->ts.stat_io_bytes[1] = 0;
td->this_io_bytes[0] = td->this_io_bytes[1] = 0;
td->zone_bytes = 0;
+ td->rate_bytes = 0;
td->last_was_sync = 0;
fio_sem_up(startup_sem);
fio_sem_down(td->mutex);
+ /*
+ * the ->mutex semaphore is now no longer used, close it to avoid
+ * eating a file descriptor
+ */
+ fio_sem_remove(td->mutex);
+
if (!td->create_serialize && setup_files(td))
goto err;
prune_io_piece_log(td);
- if (td->io_ops->flags & FIO_CPUIO)
- do_cpuio(td);
- else
- do_io(td);
+ do_io(td);
clear_state = 1;
* ->io_ops is NULL for a thread that has closed its
* io engine
*/
- if (td->io_ops && td->io_ops->flags & FIO_CPUIO)
+ if (td->io_ops && !strcmp(td->io_ops->name, "cpuio"))
cputhreads++;
if (!td->pid || td->runstate == TD_REAPED)
perror("pthread_join");
}
- fio_sem_remove(td->mutex);
-
(*nr_running)--;
(*m_rate) -= td->ratemin;
(*t_rate) -= td->rate;