From: Martin Mares <mj@ucw.cz>
Date: Sat, 9 Dec 2006 20:58:13 +0000 (+0100)
Subject: Converted asio to use the global ucwlib lock.
X-Git-Tag: holmes-import~506^2~13^2~204
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a46de3a8cefbe34d11b389687e2ca310bd81fcfe;p=libucw.git

Converted asio to use the global ucwlib lock.
---

diff --git a/lib/asio.c b/lib/asio.c
index 228d10bf..312dd607 100644
--- a/lib/asio.c
+++ b/lib/asio.c
@@ -11,6 +11,7 @@
 
 #include "lib/lib.h"
 #include "lib/asio.h"
+#include "lib/threads.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -18,13 +19,6 @@
 
 static uns asio_num_users;
 static struct worker_pool asio_wpool;
-static pthread_mutex_t asio_init_lock;
-
-static void CONSTRUCTOR
-asio_global_init(void)
-{
-  pthread_mutex_init(&asio_init_lock, NULL);
-}
 
 static void
 asio_init_unlocked(void)
@@ -51,9 +45,9 @@ asio_cleanup_unlocked(void)
 void
 asio_init_queue(struct asio_queue *q)
 {
-  pthread_mutex_lock(&asio_init_lock);
+  ucwlib_lock();
   asio_init_unlocked();
-  pthread_mutex_unlock(&asio_init_lock);
+  ucwlib_unlock();
 
   DBG("ASIO: New queue %p", q);
   ASSERT(q->buffer_size);
@@ -85,9 +79,9 @@ asio_cleanup_queue(struct asio_queue *q)
 
   work_queue_cleanup(&q->queue);
 
-  pthread_mutex_lock(&asio_init_lock);
+  ucwlib_lock();
   asio_cleanup_unlocked();
-  pthread_mutex_unlock(&asio_init_lock);
+  ucwlib_unlock();
 }
 
 struct asio_request *