bus->listen() and the controller wrappers accept a timeout to wait for callbacks

[strongswan.git] / src / libcharon / bus / bus.c

diff --git a/src/libcharon/bus/bus.c b/src/libcharon/bus/bus.c
index f2f59d7..74bd0ec 100644 (file)
--- a/src/libcharon/bus/bus.c
+++ b/src/libcharon/bus/bus.c
@@ -151,11 +151,20 @@ static void listener_cleanup(cleanup_data_t *data)
        entry_destroy(data->entry);
 }
 
        entry_destroy(data->entry);
 }
 

-METHOD(bus_t, listen_, void,
-       private_bus_t *this, listener_t *listener, job_t *job)
+METHOD(bus_t, listen_, bool,
+       private_bus_t *this, listener_t *listener, job_t *job, u_int timeout)

 {
 {

-       bool old;
+       bool old, timed_out = FALSE;

        cleanup_data_t data;
        cleanup_data_t data;

+       timeval_t tv, add;
+
+       if (timeout)
+       {
+               add.tv_sec = timeout / 1000;
+               add.tv_usec = (timeout - (add.tv_sec * 1000)) * 1000;
+               time_monotonic(&tv);
+               timeradd(&tv, &add, &tv);
+       }

 
        data.this = this;
        data.entry = entry_create(listener, TRUE);
 
        data.this = this;
        data.entry = entry_create(listener, TRUE);


@@ -168,13 +177,26 @@ METHOD(bus_t, listen_, void,
        old = thread_cancelability(TRUE);
        while (data.entry->blocker)
        {
        old = thread_cancelability(TRUE);
        while (data.entry->blocker)
        {

-               data.entry->condvar->wait(data.entry->condvar, this->mutex);
+               if (timeout)
+               {
+                       if (data.entry->condvar->timed_wait_abs(data.entry->condvar,
+                                                                                                   this->mutex, tv))
+                       {
+                               timed_out = TRUE;
+                               break;
+                       }
+               }
+               else
+               {
+                       data.entry->condvar->wait(data.entry->condvar, this->mutex);
+               }

        }
        thread_cancelability(old);
        thread_cleanup_pop(FALSE);
        /* unlock mutex */
        thread_cleanup_pop(TRUE);
        entry_destroy(data.entry);
        }
        thread_cancelability(old);
        thread_cleanup_pop(FALSE);
        /* unlock mutex */
        thread_cleanup_pop(TRUE);
        entry_destroy(data.entry);

+       return timed_out;

 }
 
 METHOD(bus_t, set_sa, void,
 }
 
 METHOD(bus_t, set_sa, void,