mutex: fixup fio_mutex_down_timeout()

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/backend.c b/backend.c
index e37fffb7b183e36d0b0d6a05f9db73603e700479..a2a6cec2ce267769a0a08891fe58dd60f807e2af 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -2117,7 +2117,7 @@ reap:
                                        *fio_debug_jobp = pid;
                        }
                        dprint(FD_MUTEX, "wait on startup_mutex\n");
-                       if (fio_mutex_down_timeout(startup_mutex, 10)) {
+                       if (fio_mutex_down_timeout(startup_mutex, 10000)) {
                                log_err("fio: job startup hung? exiting.\n");
                                fio_terminate_threads(TERMINATE_ALL);
                                fio_abort = 1;

diff --git a/mutex.c b/mutex.c
index 7612b32ba26d89e06f55116f0dc236fef5ebfe70..a48e37d0f11a947efbdcb6a278c59b82b58b3372 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -92,12 +92,15 @@ struct fio_mutex *fio_mutex_init(int value)
        return NULL;
 }
 
-static bool mutex_timed_out(struct timeval *t, unsigned int seconds)
+static bool mutex_timed_out(struct timeval *t, unsigned int msecs)
 {
-       return mtime_since_now(t) >= seconds * 1000;
+       struct timeval now;
+
+       gettimeofday(&now, NULL);
+       return mtime_since(t, &now) >= msecs;
 }
 
-int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
+int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int msecs)
 {
        struct timeval tv_s;
        struct timespec t;
@@ -106,30 +109,36 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int seconds)
        assert(mutex->magic == FIO_MUTEX_MAGIC);
 
        gettimeofday(&tv_s, NULL);
-       t.tv_sec = tv_s.tv_sec + seconds;
+       t.tv_sec = tv_s.tv_sec;
        t.tv_nsec = tv_s.tv_usec * 1000;
 
+       t.tv_sec += msecs / 1000;
+       t.tv_nsec += ((msecs * 1000000) % 1000000000);
+       if (t.tv_nsec >= 1000000000) {
+               t.tv_nsec -= 1000000000;
+               t.tv_sec++;
+       }
+
        pthread_mutex_lock(&mutex->lock);
 
+       mutex->waiters++;
        while (!mutex->value && !ret) {
-               mutex->waiters++;
-
                /*
                 * Some platforms (FreeBSD 9?) seems to return timed out
                 * way too early, double check.
                 */
                ret = pthread_cond_timedwait(&mutex->cond, &mutex->lock, &t);
-               if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, seconds))
+               if (ret == ETIMEDOUT && !mutex_timed_out(&tv_s, msecs))
                        ret = 0;
-
-               mutex->waiters--;
        }
+       mutex->waiters--;
 
        if (!ret) {
                mutex->value--;
                pthread_mutex_unlock(&mutex->lock);
        }
 
+       pthread_mutex_unlock(&mutex->lock);
        return ret;
 }
 

diff --git a/server.c b/server.c
index cf01733bd015f767c4c279b9b54d6fd5ed2ec05b..5871228d04b8878dd27c1514ea542055cfad9d4e 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1445,7 +1445,7 @@ int fio_server_get_verify_state(const char *name, int threadnumber,
        /*
         * Wait for the backend to receive the reply
         */
-       if (fio_mutex_down_timeout(&rep->lock, 10)) {
+       if (fio_mutex_down_timeout(&rep->lock, 10000)) {
                log_err("fio: timed out waiting for reply\n");
                goto fail;
        }