[libvirt] [PATCH] util: ensure virMutexInit is not recursive

Eric Blake eblake at redhat.com
Thu Mar 18 17:32:16 UTC 2010


POSIX states that creation of a mutex with default attributes
is unspecified whether the mutex is recursive or non-recursive.
We specifically want non-recursive (deadlock is desirable in
flushing out coding bugs that used our mutex incorrectly).

* src/util/threads-pthread.c (virMutexInit): Specifically request
non-recursive mutex, rather than relying on unspecified default.
---
 src/util/threads-pthread.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c
index ad42483..2f0746b 100644
--- a/src/util/threads-pthread.c
+++ b/src/util/threads-pthread.c
@@ -1,7 +1,7 @@
 /*
  * threads-pthread.c: basic thread synchronization primitives
  *
- * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright (C) 2009-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,10 @@ void virThreadOnExit(void)
 int virMutexInit(virMutexPtr m)
 {
     int ret;
-    if ((ret = pthread_mutex_init(&m->lock, NULL)) != 0) {
+    pthread_mutexattr_t attr;
+    pthread_mutexattr_init(&attr);
+    pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
+    if ((ret = pthread_mutex_init(&m->lock, &attr)) != 0) {
         errno = ret;
         return -1;
     }
-- 
1.6.6.1




More information about the libvir-list mailing list