*fio_debug_jobp = pid;
}
dprint(FD_MUTEX, "wait on startup_mutex\n");
- fio_mutex_down(startup_mutex);
+ if (fio_mutex_down_timeout(startup_mutex, 10)) {
+ log_err("fio: job startup hung? exiting.\n");
+ terminate_threads(TERMINATE_ALL);
+ fio_abort = 1;
+ nr_started--;
+ break;
+ }
dprint(FD_MUTEX, "done waiting on startup_mutex\n");
}
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
+#include <time.h>
#include <pthread.h>
#include <sys/mman.h>
return NULL;
}
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+{
+ struct timespec t;
+ int ret = 0;
+
+ clock_gettime(CLOCK_REALTIME, &t);
+ t.tv_sec += seconds;
+
+ pthread_mutex_lock(&mutex->lock);
+
+ while (!mutex->value && !ret) {
+ mutex->waiters++;
+ ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
+ mutex->waiters--;
+ }
+
+ if (!ret) {
+ mutex->value--;
+ pthread_mutex_unlock(&mutex->lock);
+ }
+
+ return ret;
+}
+
void fio_mutex_down(struct fio_mutex *mutex)
{
pthread_mutex_lock(&mutex->lock);
extern struct fio_mutex *fio_mutex_init(int);
extern void fio_mutex_remove(struct fio_mutex *);
extern void fio_mutex_down(struct fio_mutex *);
+extern int fio_mutex_down_timeout(struct fio_mutex *, unsigned int);
extern void fio_mutex_down_read(struct fio_mutex *);
extern void fio_mutex_down_write(struct fio_mutex *);
extern void fio_mutex_up(struct fio_mutex *);