Moved mutex.c to a separate folder in order to cleanly wrap other threading primitives (and utils/mutex.h is now threading.h).

src/libstrongswan/Makefile.am

@@ -43,6 +43,7 @@ credentials/ietf_attributes/ietf_attributes.c credentials/ietf_attributes/ietf_a
 database/database.h database/database_factory.h database/database_factory.c \
 fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \
 selectors/traffic_selector.c selectors/traffic_selector.h \
+threading.h threading/mutex.c \
 utils.h utils.c \
 utils/host.c utils/host.h \
 utils/identification.c utils/identification.h \
@@ -52,7 +53,6 @@ utils/linked_list.c utils/linked_list.h \
 utils/hashtable.c utils/hashtable.h \
 utils/enumerator.c utils/enumerator.h \
 utils/optionsfrom.c utils/optionsfrom.h \
-utils/mutex.c utils/mutex.h \
 utils/backtrace.c utils/backtrace.h \
 plugins/plugin_loader.c plugins/plugin_loader.h plugins/plugin.h
 

src/libstrongswan/attributes/attribute_manager.c

@@ -17,7 +17,7 @@
 
 #include <debug.h>
 #include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
 
 typedef struct private_attribute_manager_t private_attribute_manager_t;
 

src/libstrongswan/credentials/credential_factory.c

@@ -20,7 +20,7 @@
 
 #include <debug.h>
 #include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
 #include <credentials/certificates/x509.h>
 
 ENUM(credential_type_names, CRED_PRIVATE_KEY, CRED_CERTIFICATE,

src/libstrongswan/credentials/keys/key_encoding.c

@@ -19,7 +19,7 @@
 
 #include <utils/linked_list.h>
 #include <utils/hashtable.h>
-#include <utils/mutex.h>
+#include <threading.h>
 
 typedef struct private_key_encoding_t private_key_encoding_t;
 

src/libstrongswan/crypto/crypto_factory.c

@@ -16,7 +16,7 @@
 #include "crypto_factory.h"
 
 #include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
 #include <utils/linked_list.h>
 #include <crypto/crypto_tester.h>
 

src/libstrongswan/database/database_factory.c

@@ -16,7 +16,7 @@
 #include "database_factory.h"
 
 #include <utils/linked_list.h>
-#include <utils/mutex.h>
+#include <threading.h>
 
 typedef struct private_database_factory_t private_database_factory_t;
 

src/libstrongswan/fetcher/fetcher_manager.c

@@ -16,7 +16,7 @@
 #include "fetcher_manager.h"
 
 #include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
 #include <utils/linked_list.h>
 
 typedef struct private_fetcher_manager_t private_fetcher_manager_t;

src/libstrongswan/library.h

@@ -40,6 +40,9 @@
  * @defgroup plugins plugins
  * @ingroup libstrongswan
  *
+ * @defgroup threading threading
+ * @ingroup libstrongswan
+ *
  * @defgroup utils utils
  * @ingroup libstrongswan
  */

src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c

@@ -24,7 +24,7 @@
 
 #include <library.h>
 #include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
 
 #include <errno.h>
 #include <gcrypt.h>

src/libstrongswan/plugins/mysql/mysql_database.c

@@ -21,7 +21,7 @@
 #include "mysql_database.h"
 
 #include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
 #include <utils/linked_list.h>
 
 /* Older mysql.h headers do not define it, but we need it. It is not returned

src/libstrongswan/plugins/openssl/openssl_plugin.c

@@ -23,7 +23,7 @@
 #include "openssl_plugin.h"
 
 #include <library.h>
-#include <utils/mutex.h>
+#include <threading.h>
 #include "openssl_util.h"
 #include "openssl_crypter.h"
 #include "openssl_hasher.h"

src/libstrongswan/plugins/sqlite/sqlite_database.c

@@ -19,7 +19,7 @@
 #include <unistd.h>
 #include <library.h>
 #include <debug.h>
-#include <utils/mutex.h>
+#include <threading.h>
 
 typedef struct private_sqlite_database_t private_sqlite_database_t;
 

src/libstrongswan/threading.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Tobias Brunner
+ * Copyright (C) 2008-2009 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -15,12 +15,12 @@
  */
 
 /**
- * @defgroup mutex mutex
- * @{ @ingroup utils
+ * @defgroup threading threading
+ * @{ @ingroup libstrongswan
  */
 
-#ifndef MUTEX_H_
-#define MUTEX_H_
+#ifndef THREADING_H_
+#define THREADING_H_
 
 typedef struct mutex_t mutex_t;
 typedef struct condvar_t condvar_t;
@@ -213,4 +213,4 @@ condvar_t *condvar_create(condvar_type_t type);
  */
 rwlock_t *rwlock_create(rwlock_type_t type);
 
-#endif /** MUTEX_H_ @}*/
+#endif /** THREADING_H_ @}*/

src/libstrongswan/threading/mutex.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008 Tobias Brunner
+ * Copyright (C) 2008-2009 Tobias Brunner
  * Copyright (C) 2008 Martin Willi
  * Hochschule fuer Technik Rapperswil
  *
@@ -20,8 +20,7 @@
 #include <time.h>
 #include <errno.h>
 
-#include "mutex.h"
-
+#include <threading.h>
 #include <library.h>
 #include <debug.h>