Separate io_u from ioengine [2/3] - move io_u functions

[fio.git] / mutex.c

diff --git a/mutex.c b/mutex.c
index 758092218477e0eb5dc0da8a5049aba2f6e9e908..d8c482519909ff334ac5929565908232f541ac24 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -22,6 +22,12 @@ void __fio_mutex_remove(struct fio_mutex *mutex)
 {
        assert(mutex->magic == FIO_MUTEX_MAGIC);
        pthread_cond_destroy(&mutex->cond);
+
+       /*
+        * Ensure any subsequent attempt to grab this mutex will fail
+        * with an assert, instead of just silently hanging.
+        */
+       memset(mutex, 0, sizeof(*mutex));
 }
 
 void fio_mutex_remove(struct fio_mutex *mutex)
@@ -41,7 +47,7 @@ int cond_init_pshared(pthread_cond_t *cond)
                return ret;
        }
 
-#ifdef FIO_HAVE_PSHARED_MUTEX
+#ifdef CONFIG_PSHARED
        ret = pthread_condattr_setpshared(&cattr, PTHREAD_PROCESS_SHARED);
        if (ret) {
                log_err("pthread_condattr_setpshared: %s\n", strerror(ret));
@@ -71,7 +77,7 @@ int mutex_init_pshared(pthread_mutex_t *mutex)
        /*
         * Not all platforms support process shared mutexes (FreeBSD)
         */
-#ifdef FIO_HAVE_PSHARED_MUTEX
+#ifdef CONFIG_PSHARED
        ret = pthread_mutexattr_setpshared(&mattr, PTHREAD_PROCESS_SHARED);
        if (ret) {
                log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
@@ -156,7 +162,7 @@ int fio_mutex_down_timeout(struct fio_mutex *mutex, unsigned int msecs)
        t.tv_nsec = tv_s.tv_usec * 1000;
 
        t.tv_sec += msecs / 1000;
-       t.tv_nsec += ((msecs * 1000000) % 1000000000);
+       t.tv_nsec += ((msecs * 1000000ULL) % 1000000000);
        if (t.tv_nsec >= 1000000000) {
                t.tv_nsec -= 1000000000;
                t.tv_sec++;
@@ -281,7 +287,7 @@ struct fio_rwlock *fio_rwlock_init(void)
                log_err("pthread_rwlockattr_init: %s\n", strerror(ret));
                goto err;
        }
-#ifdef FIO_HAVE_PSHARED_MUTEX
+#ifdef CONFIG_PSHARED
        ret = pthread_rwlockattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
        if (ret) {
                log_err("pthread_rwlockattr_setpshared: %s\n", strerror(ret));