Add a read/write lock implementation

Add virRWLock backed up by a POSIX rwlock primitive

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
(cherry picked from commit c065984b58000a44c90588198d222a314ac532fd)

Conflicts:
  src/libvirt_private.syms
   - virThreadCancel (in context) was introduced after 1.0.3 branch

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index dd44ba61c01e7851928870bf76e6651a7cd3e901..987762893ef6b4aa82200866c62f19c18ce0e753 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1744,6 +1744,11 @@ virMutexInitRecursive;
 virMutexLock;
 virMutexUnlock;
 virOnce;
+virRWLockDestroy;
+virRWLockInit;
+virRWLockRead;
+virRWLockUnlock;
+virRWLockWrite;
 virThreadCreate;
 virThreadID;
 virThreadInitialize;

diff --git a/src/util/virthread.h b/src/util/virthread.h
index c59a2cfddf77ff6d25a0629f16716bd4367f5ba4..bc98cba7939bc74288ace2e26c76e3e651f4777f 100644 (file)
--- a/src/util/virthread.h
+++ b/src/util/virthread.h
@@ -28,6 +28,9 @@
 typedef struct virMutex virMutex;
 typedef virMutex *virMutexPtr;
 
+typedef struct virRWLock virRWLock;
+typedef virRWLock *virRWLockPtr;
+
 typedef struct virCond virCond;
 typedef virCond *virCondPtr;
 
@@ -85,6 +88,13 @@ void virMutexLock(virMutexPtr m);
 void virMutexUnlock(virMutexPtr m);
 
 
+int virRWLockInit(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK;
+void virRWLockDestroy(virRWLockPtr m);
+
+void virRWLockRead(virRWLockPtr m);
+void virRWLockWrite(virRWLockPtr m);
+void virRWLockUnlock(virRWLockPtr m);
+
 
 int virCondInit(virCondPtr c) ATTRIBUTE_RETURN_CHECK;
 int virCondDestroy(virCondPtr c);

diff --git a/src/util/virthreadpthread.c b/src/util/virthreadpthread.c
index 9f02ba1b04a7e6b7035e79a2d60ed950d7521ef9..481ba2697b13a329e7cc585f2cb320469f5e8b2a 100644 (file)
--- a/src/util/virthreadpthread.c
+++ b/src/util/virthreadpthread.c
@@ -91,6 +91,39 @@ void virMutexUnlock(virMutexPtr m)
 }
 
 
+int virRWLockInit(virRWLockPtr m)
+{
+    int ret;
+    ret = pthread_rwlock_init(&m->lock, NULL);
+    if (ret != 0) {
+        errno = ret;
+        return -1;
+    }
+    return 0;
+}
+
+void virRWLockDestroy(virRWLockPtr m)
+{
+    pthread_rwlock_destroy(&m->lock);
+}
+
+
+void virRWLockRead(virRWLockPtr m)
+{
+    pthread_rwlock_rdlock(&m->lock);
+}
+
+void virRWLockWrite(virRWLockPtr m)
+{
+    pthread_rwlock_wrlock(&m->lock);
+}
+
+
+void virRWLockUnlock(virRWLockPtr m)
+{
+    pthread_rwlock_unlock(&m->lock);
+}
+
 int virCondInit(virCondPtr c)
 {
     int ret;

diff --git a/src/util/virthreadpthread.h b/src/util/virthreadpthread.h
index b9f1319fc1098dec24ae2bf32a697f1f73f0e4f2..cb607d0d72a1c6b630498e46deb603f47167ef0d 100644 (file)
--- a/src/util/virthreadpthread.h
+++ b/src/util/virthreadpthread.h
@@ -27,6 +27,10 @@ struct virMutex {
     pthread_mutex_t lock;
 };
 
+struct virRWLock {
+    pthread_rwlock_t lock;
+};
+
 struct virCond {
     pthread_cond_t cond;
 };

diff --git a/src/util/virthreadwin32.c b/src/util/virthreadwin32.c
index 0ad7e5c57029964a70bbb32a435d5ac9c775ad20..dc96533dced40e7e04d1deec6e53d7087a96d4cb 100644 (file)
--- a/src/util/virthreadwin32.c
+++ b/src/util/virthreadwin32.c
@@ -121,6 +121,25 @@ void virMutexUnlock(virMutexPtr m)
 }
 
 
+int virRWLockInit(virRWLockPtr m ATTRIBUTE_UNUSED)
+{
+    errno = ENOSYS;
+    return -1;
+}
+
+void virRWLockDestroy(virRWLockPtr m ATTRIBUTE_UNUSED)
+{}
+
+
+void virRWLockRead(virRWLockPtr m ATTRIBUTE_UNUSED)
+{}
+
+void virRWLockWrite(virRWLockPtr m ATTRIBUTE_UNUSED)
+{}
+
+
+void virRWLockUnlock(virRWLockPtr m ATTRIBUTE_UNUSED)
+{}
 
 int virCondInit(virCondPtr c)
 {

diff --git a/src/util/virthreadwin32.h b/src/util/virthreadwin32.h
index fc12847a8986953f3995d2b16022516c14e96772..5f8dfd36783a11133b4b1d80cafc696d7a73b323 100644 (file)
--- a/src/util/virthreadwin32.h
+++ b/src/util/virthreadwin32.h
@@ -30,6 +30,10 @@ struct virMutex {
     HANDLE lock;
 };
 
+struct virRWLock {
+    bool ignored;
+};
+
 struct virCond {
     virMutex lock;
     unsigned int nwaiters;