thread: Add a function to pop and call all registered cleanup handlers
authorMartin Willi <martin@revosec.ch>
Tue, 14 Apr 2015 06:59:01 +0000 (08:59 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 15 Apr 2015 12:38:43 +0000 (14:38 +0200)
src/libstrongswan/tests/suites/test_threading.c
src/libstrongswan/threading/thread.c
src/libstrongswan/threading/thread.h
src/libstrongswan/threading/windows/thread.c

index 55a4cd7..9a9fdd8 100644 (file)
@@ -1517,6 +1517,36 @@ START_TEST(test_cleanup_pop)
 }
 END_TEST
 
+static void *cleanup_popall_run(void *data)
+{
+       thread_cleanup_push(cleanup3, data);
+       thread_cleanup_push(cleanup2, data);
+       thread_cleanup_push(cleanup1, data);
+
+       thread_cleanup_popall();
+       return NULL;
+}
+
+START_TEST(test_cleanup_popall)
+{
+       thread_t *threads[THREADS];
+       uintptr_t values[THREADS];
+       int i;
+
+       for (i = 0; i < THREADS; i++)
+       {
+               values[i] = 1;
+               threads[i] = thread_create(cleanup_popall_run, &values[i]);
+       }
+       for (i = 0; i < THREADS; i++)
+       {
+               threads[i]->join(threads[i]);
+               ck_assert_int_eq(values[i], 4);
+       }
+}
+END_TEST
+
+
 static thread_value_t *tls[10];
 
 static void *tls_run(void *data)
@@ -1697,6 +1727,7 @@ Suite *threading_suite_create()
        tcase_add_test(tc, test_cleanup_exit);
        tcase_add_test(tc, test_cleanup_cancel);
        tcase_add_test(tc, test_cleanup_pop);
+       tcase_add_test(tc, test_cleanup_popall);
        suite_add_tcase(s, tc);
 
        tc = tcase_create("thread local storage");
index 91a2d34..7a243e8 100644 (file)
@@ -402,6 +402,23 @@ void thread_cleanup_pop(bool execute)
 /**
  * Described in header.
  */
+void thread_cleanup_popall()
+{
+       private_thread_t *this = (private_thread_t*)thread_current();
+       cleanup_handler_t *handler;
+
+       while (this->cleanup_handlers->get_count(this->cleanup_handlers))
+       {
+               this->cleanup_handlers->remove_last(this->cleanup_handlers,
+                                                                                       (void**)&handler);
+               handler->cleanup(handler->arg);
+               free(handler);
+       }
+}
+
+/**
+ * Described in header.
+ */
 bool thread_cancelability(bool enable)
 {
 #ifdef HAVE_PTHREAD_CANCEL
index 3827554..c247728 100644 (file)
@@ -124,6 +124,16 @@ void thread_cleanup_push(thread_cleanup_t cleanup, void *arg);
 void thread_cleanup_pop(bool execute);
 
 /**
+ * Pop and execute all cleanup handlers in reverse order of registration.
+ *
+ * This function is for very special purposes only, where the caller exactly
+ * knows which cleanup handlers have been pushed. For regular use, a caller
+ * should thread_cleanup_pop() exactly the number of handlers it pushed
+ * using thread_cleanup_push().
+ */
+void thread_cleanup_popall();
+
+/**
  * Enable or disable the cancelability of the current thread. The current
  * value is returned.
  *
index e76758f..6105247 100644 (file)
@@ -562,6 +562,26 @@ void thread_cleanup_pop(bool execute)
 /**
  * Described in header.
  */
+void thread_cleanup_popall()
+{
+       private_thread_t *this;
+       cleanup_t cleanup = {};
+       bool old;
+
+       this = get_current_thread();
+       while (array_count(this->cleanup))
+       {
+               old = set_leak_detective(FALSE);
+               array_remove(this->cleanup, -1, &cleanup);
+               set_leak_detective(old);
+
+               cleanup.cb(cleanup.arg);
+       }
+}
+
+/**
+ * Described in header.
+ */
 bool thread_cancelability(bool enable)
 {
        private_thread_t *this;