Fixed a silly bug.

[libucw.git] / lib / asio.c

diff --git a/lib/asio.c b/lib/asio.c
index 1102352ef3c05e9fe87de30faacfdde8d6b7027a..f8249515eb82c9f4cdc616396762eaeb83b4fffd 100644 (file)
--- a/lib/asio.c
+++ b/lib/asio.c
@@ -11,6 +11,7 @@
 
 #include "lib/lib.h"
 #include "lib/asio.h"
 
 #include "lib/lib.h"
 #include "lib/asio.h"

+#include "lib/threads.h"

 
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>


@@ -20,19 +21,18 @@ static uns asio_num_users;
 static struct worker_pool asio_wpool;
 
 static void
 static struct worker_pool asio_wpool;
 
 static void

-asio_init(void)
+asio_init_unlocked(void)

 {
   if (asio_num_users++)
     return;
 
   DBG("ASIO: INIT");
   asio_wpool.num_threads = 1;
 {
   if (asio_num_users++)
     return;
 
   DBG("ASIO: INIT");
   asio_wpool.num_threads = 1;

-  asio_wpool.stack_size = 65536;

   worker_pool_init(&asio_wpool);
 }
 
 static void
   worker_pool_init(&asio_wpool);
 }
 
 static void

-asio_cleanup(void)
+asio_cleanup_unlocked(void)

 {
   if (--asio_num_users)
     return;
 {
   if (--asio_num_users)
     return;


@@ -44,13 +44,16 @@ asio_cleanup(void)
 void
 asio_init_queue(struct asio_queue *q)
 {
 void
 asio_init_queue(struct asio_queue *q)
 {

-  asio_init();
+  ucwlib_lock();
+  asio_init_unlocked();
+  ucwlib_unlock();

 
   DBG("ASIO: New queue %p", q);
   ASSERT(q->buffer_size);
   q->allocated_requests = 0;
   q->running_requests = 0;
   q->running_writebacks = 0;
 
   DBG("ASIO: New queue %p", q);
   ASSERT(q->buffer_size);
   q->allocated_requests = 0;
   q->running_requests = 0;
   q->running_writebacks = 0;

+  q->use_count = 0;

   clist_init(&q->idle_list);
   clist_init(&q->done_list);
   work_queue_init(&asio_wpool, &q->queue);
   clist_init(&q->idle_list);
   clist_init(&q->done_list);
   work_queue_init(&asio_wpool, &q->queue);


@@ -74,7 +77,10 @@ asio_cleanup_queue(struct asio_queue *q)
     }
 
   work_queue_cleanup(&q->queue);
     }
 
   work_queue_cleanup(&q->queue);

-  asio_cleanup();
+
+  ucwlib_lock();
+  asio_cleanup_unlocked();
+  ucwlib_unlock();

 }
 
 struct asio_request *
 }
 
 struct asio_request *


@@ -170,7 +176,7 @@ asio_submit(struct asio_request *r)
   q->running_requests++;
   r->submitted = 1;
   r->work.go = asio_handler;
   q->running_requests++;
   r->submitted = 1;
   r->work.go = asio_handler;

-  r->work.returned = NULL;
+  r->work.priority = 0;

   work_submit(&q->queue, &r->work);
 }
 
   work_submit(&q->queue, &r->work);
 }