From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 21 Jul 2014 09:30:34 +0000 (+0200)
Subject: stream-service: Restart accepting without blocking
X-Git-Tag: 5.2.1dr1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22e90cad00c59d723a2edbf953d5e250e0462022;p=thirdparty%2Fstrongswan.git

stream-service: Restart accepting without blocking

Calling on_accept() sometimes lead to deadlocks when service->destroy()
was called concurrently.  That is, two threads waiting in on_accept() but
the last worker would only wake one due to the call to signal().  Calling
broadcast() wouldn't help either as that could lead to crashes if the thread
that called destroy() is woken first.

This is also more efficient as a constant pool of concurrent workers can
be maintained, otherwise peaks at the limit were followed by only a single
worker being active.
---

diff --git a/src/libstrongswan/networking/streams/stream_service.c b/src/libstrongswan/networking/streams/stream_service.c
index 7358c580ef..07d9cfdef1 100644
--- a/src/libstrongswan/networking/streams/stream_service.c
+++ b/src/libstrongswan/networking/streams/stream_service.c
@@ -92,6 +92,11 @@ typedef struct {
 	private_stream_service_t *this;
 } async_data_t;
 
+/**
+ * Forward declaration
+ */
+static bool watch(private_stream_service_t *this, int fd, watcher_event_t event);
+
 /**
  * Clean up accept data
  */
@@ -103,8 +108,8 @@ static void destroy_async_data(async_data_t *data)
 	if (this->active-- == this->cncrncy)
 	{
 		/* leaving concurrency limit, restart accept()ing. */
-		this->public.on_accept(&this->public, this->cb, this->data,
-							   this->prio, this->cncrncy);
+		lib->watcher->add(lib->watcher, this->fd,
+						  WATCHER_READ, (watcher_cb_t)watch, this);
 	}
 	this->condvar->signal(this->condvar);
 	this->mutex->unlock(this->mutex);