[asterisk-commits] oej: branch oej/bufo-manager-contexts-trunk r379996 - /team/oej/bufo-manager-...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jan 23 02:02:36 CST 2013
Author: oej
Date: Wed Jan 23 02:02:33 2013
New Revision: 379996
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=379996
Log:
Add two missing files
I keep wondering how every file except the one changed in this branch ended up in conflict...
Added:
team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c (with props)
team/oej/bufo-manager-contexts-trunk/tests/test_threadpool.c (with props)
Added: team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c?view=auto&rev=379996
==============================================================================
--- team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c (added)
+++ team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c Wed Jan 23 02:02:33 2013
@@ -1,0 +1,469 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2012-2013, Digium, Inc.
+ *
+ * Mark Michelson <mmichelson at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*!
+ * \file
+ * \brief taskprocessor unit tests
+ *
+ * \author Mark Michelson <mmichelson at digium.com>
+ *
+ */
+
+/*** MODULEINFO
+ <depend>TEST_FRAMEWORK</depend>
+ <support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/test.h"
+#include "asterisk/taskprocessor.h"
+#include "asterisk/module.h"
+#include "asterisk/astobj2.h"
+
+/*!
+ * \brief userdata associated with baseline taskprocessor test
+ */
+struct task_data {
+ /* Condition used to signal to queuing thread that task was executed */
+ ast_cond_t cond;
+ /* Lock protecting the condition */
+ ast_mutex_t lock;
+ /*! Boolean indicating that the task was run */
+ int task_complete;
+};
+
+/*!
+ * \brief Queued task for baseline test.
+ *
+ * The task simply sets a boolean to indicate the
+ * task has been run and then signals a condition
+ * saying it's complete
+ */
+static int task(void *data)
+{
+ struct task_data *task_data = data;
+ SCOPED_MUTEX(lock, &task_data->lock);
+ task_data->task_complete = 1;
+ ast_cond_signal(&task_data->cond);
+ return 0;
+}
+
+/*!
+ * \brief Baseline test for default taskprocessor
+ *
+ * This test ensures that when a task is added to a taskprocessor that
+ * has been allocated with a default listener that the task gets executed
+ * as expected
+ */
+AST_TEST_DEFINE(default_taskprocessor)
+{
+ struct ast_taskprocessor *tps;
+ struct task_data task_data;
+ struct timeval start;
+ struct timespec ts;
+ enum ast_test_result_state res = AST_TEST_PASS;
+ int timedwait_res;
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "default_taskprocessor";
+ info->category = "/main/taskprocessor/";
+ info->summary = "Test of default taskproccesor";
+ info->description =
+ "Ensures that a queued task gets executed.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tps = ast_taskprocessor_get("test", TPS_REF_DEFAULT);
+
+ if (!tps) {
+ ast_test_status_update(test, "Unable to create test taskprocessor\n");
+ return AST_TEST_FAIL;
+ }
+
+ start = ast_tvnow();
+
+ ts.tv_sec = start.tv_sec + 30;
+ ts.tv_nsec = start.tv_usec * 1000;
+
+ ast_cond_init(&task_data.cond, NULL);
+ ast_mutex_init(&task_data.lock);
+ task_data.task_complete = 0;
+
+ ast_taskprocessor_push(tps, task, &task_data);
+ ast_mutex_lock(&task_data.lock);
+ while (!task_data.task_complete) {
+ timedwait_res = ast_cond_timedwait(&task_data.cond, &task_data.lock, &ts);
+ if (timedwait_res == ETIMEDOUT) {
+ break;
+ }
+ }
+ ast_mutex_unlock(&task_data.lock);
+
+ if (!task_data.task_complete) {
+ ast_test_status_update(test, "Queued task did not execute!\n");
+ res = AST_TEST_FAIL;
+ goto test_end;
+ }
+
+test_end:
+ tps = ast_taskprocessor_unreference(tps);
+ ast_mutex_destroy(&task_data.lock);
+ ast_cond_destroy(&task_data.cond);
+ return res;
+}
+
+#define NUM_TASKS 20000
+
+/*!
+ * \brief Relevant data associated with taskprocessor load test
+ */
+static struct load_task_data {
+ /*! Condition used to indicate a task has completed executing */
+ ast_cond_t cond;
+ /*! Lock used to protect the condition */
+ ast_mutex_t lock;
+ /*! Counter of the number of completed tasks */
+ int tasks_completed;
+ /*! Storage for task-specific data */
+ int task_rand[NUM_TASKS];
+} load_task_results;
+
+/*!
+ * \brief a queued task to be used in the taskprocessor load test
+ *
+ * The task increments the number of tasks executed and puts the passed-in
+ * data into the next slot in the array of random data.
+ */
+static int load_task(void *data)
+{
+ int *randdata = data;
+ SCOPED_MUTEX(lock, &load_task_results.lock);
+ load_task_results.task_rand[load_task_results.tasks_completed++] = *randdata;
+ ast_cond_signal(&load_task_results.cond);
+ return 0;
+}
+
+/*!
+ * \brief Load test for taskprocessor with default listener
+ *
+ * This test queues a large number of tasks, each with random data associated.
+ * The test ensures that all of the tasks are run and that the tasks are executed
+ * in the same order that they were queued
+ */
+AST_TEST_DEFINE(default_taskprocessor_load)
+{
+ struct ast_taskprocessor *tps;
+ struct timeval start;
+ struct timespec ts;
+ enum ast_test_result_state res = AST_TEST_PASS;
+ int timedwait_res;
+ int i;
+ int rand_data[NUM_TASKS];
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "default_taskprocessor_load";
+ info->category = "/main/taskprocessor/";
+ info->summary = "Load test of default taskproccesor";
+ info->description =
+ "Ensure that a large number of queued tasks are executed in the proper order.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tps = ast_taskprocessor_get("test", TPS_REF_DEFAULT);
+
+ if (!tps) {
+ ast_test_status_update(test, "Unable to create test taskprocessor\n");
+ return AST_TEST_FAIL;
+ }
+
+ start = ast_tvnow();
+
+ ts.tv_sec = start.tv_sec + 60;
+ ts.tv_nsec = start.tv_usec * 1000;
+
+ ast_cond_init(&load_task_results.cond, NULL);
+ ast_mutex_init(&load_task_results.lock);
+ load_task_results.tasks_completed = 0;
+
+ for (i = 0; i < NUM_TASKS; ++i) {
+ rand_data[i] = ast_random();
+ ast_taskprocessor_push(tps, load_task, &rand_data[i]);
+ }
+
+ ast_mutex_lock(&load_task_results.lock);
+ while (load_task_results.tasks_completed < NUM_TASKS) {
+ timedwait_res = ast_cond_timedwait(&load_task_results.cond, &load_task_results.lock, &ts);
+ if (timedwait_res == ETIMEDOUT) {
+ break;
+ }
+ }
+ ast_mutex_unlock(&load_task_results.lock);
+
+ if (load_task_results.tasks_completed != NUM_TASKS) {
+ ast_test_status_update(test, "Unexpected number of tasks executed. Expected %d but got %d\n",
+ NUM_TASKS, load_task_results.tasks_completed);
+ res = AST_TEST_FAIL;
+ goto test_end;
+ }
+
+ for (i = 0; i < NUM_TASKS; ++i) {
+ if (rand_data[i] != load_task_results.task_rand[i]) {
+ ast_test_status_update(test, "Queued tasks did not execute in order\n");
+ res = AST_TEST_FAIL;
+ goto test_end;
+ }
+ }
+
+test_end:
+ tps = ast_taskprocessor_unreference(tps);
+ ast_mutex_destroy(&load_task_results.lock);
+ ast_cond_destroy(&load_task_results.cond);
+ return res;
+}
+
+/*!
+ * \brief Private data for the test taskprocessor listener
+ */
+struct test_listener_pvt {
+ /* Counter of number of tasks pushed to the queue */
+ int num_pushed;
+ /* Counter of number of times the queue was emptied */
+ int num_emptied;
+ /* Counter of number of times that a pushed task occurred on an empty queue */
+ int num_was_empty;
+ /* Boolean indicating whether the shutdown callback was called */
+ int shutdown;
+};
+
+/*!
+ * \brief test taskprocessor listener's alloc callback
+ */
+static void *test_listener_pvt_alloc(void)
+{
+ struct test_listener_pvt *pvt;
+
+ pvt = ast_calloc(1, sizeof(*pvt));
+ return pvt;
+}
+
+/*!
+ * \brief test taskprocessor listener's start callback
+ */
+static int test_start(struct ast_taskprocessor_listener *listener)
+{
+ return 0;
+}
+
+/*!
+ * \brief test taskprocessor listener's task_pushed callback
+ *
+ * Adjusts private data's stats as indicated by the parameters.
+ */
+static void test_task_pushed(struct ast_taskprocessor_listener *listener, int was_empty)
+{
+ struct test_listener_pvt *pvt = ast_taskprocessor_listener_get_user_data(listener);
+ ++pvt->num_pushed;
+ if (was_empty) {
+ ++pvt->num_was_empty;
+ }
+}
+
+/*!
+ * \brief test taskprocessor listener's emptied callback.
+ */
+static void test_emptied(struct ast_taskprocessor_listener *listener)
+{
+ struct test_listener_pvt *pvt = ast_taskprocessor_listener_get_user_data(listener);
+ ++pvt->num_emptied;
+}
+
+/*!
+ * \brief test taskprocessor listener's shutdown callback.
+ */
+static void test_shutdown(struct ast_taskprocessor_listener *listener)
+{
+ struct test_listener_pvt *pvt = ast_taskprocessor_listener_get_user_data(listener);
+ pvt->shutdown = 1;
+}
+
+static const struct ast_taskprocessor_listener_callbacks test_callbacks = {
+ .start = test_start,
+ .task_pushed = test_task_pushed,
+ .emptied = test_emptied,
+ .shutdown = test_shutdown,
+};
+
+/*!
+ * \brief Queued task for taskprocessor listener test.
+ *
+ * Does nothing.
+ */
+static int listener_test_task(void *ignore)
+{
+ return 0;
+}
+
+/*!
+ * \brief helper to ensure that statistics the listener is keeping are what we expect
+ *
+ * \param test The currently-running test
+ * \param pvt The private data for the taskprocessor listener
+ * \param num_pushed The expected current number of tasks pushed to the processor
+ * \param num_emptied The expected current number of times the taskprocessor has become empty
+ * \param num_was_empty The expected current number of times that tasks were pushed to an empty taskprocessor
+ * \retval -1 Stats were not as expected
+ * \retval 0 Stats were as expected
+ */
+static int check_stats(struct ast_test *test, const struct test_listener_pvt *pvt, int num_pushed, int num_emptied, int num_was_empty)
+{
+ if (pvt->num_pushed != num_pushed) {
+ ast_test_status_update(test, "Unexpected number of tasks pushed. Expected %d but got %d\n",
+ num_pushed, pvt->num_pushed);
+ return -1;
+ }
+
+ if (pvt->num_emptied != num_emptied) {
+ ast_test_status_update(test, "Unexpected number of empties. Expected %d but got %d\n",
+ num_emptied, pvt->num_emptied);
+ return -1;
+ }
+
+ if (pvt->num_was_empty != num_was_empty) {
+ ast_test_status_update(test, "Unexpected number of empties. Expected %d but got %d\n",
+ num_was_empty, pvt->num_emptied);
+ return -1;
+ }
+
+ return 0;
+}
+
+/*!
+ * \brief Test for a taskprocessor with custom listener.
+ *
+ * This test pushes tasks to a taskprocessor with a custom listener, executes the taskss,
+ * and destroys the taskprocessor.
+ *
+ * The test ensures that the listener's callbacks are called when expected and that the data
+ * being passed in is accurate.
+ */
+AST_TEST_DEFINE(taskprocessor_listener)
+{
+ struct ast_taskprocessor *tps = NULL;
+ struct ast_taskprocessor_listener *listener = NULL;
+ struct test_listener_pvt *pvt = NULL;
+ enum ast_test_result_state res = AST_TEST_PASS;
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "taskprocessor_listener";
+ info->category = "/main/taskprocessor/";
+ info->summary = "Test of taskproccesor listeners";
+ info->description =
+ "Ensures that listener callbacks are called when expected.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ pvt = test_listener_pvt_alloc();
+ if (!pvt) {
+ ast_test_status_update(test, "Unable to allocate test taskprocessor listener user data\n");
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_taskprocessor_listener_alloc(&test_callbacks, pvt);
+ if (!listener) {
+ ast_test_status_update(test, "Unable to allocate test taskprocessor listener\n");
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ tps = ast_taskprocessor_create_with_listener("test_listener", listener);
+ if (!tps) {
+ ast_test_status_update(test, "Unable to allocate test taskprocessor\n");
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ ast_taskprocessor_push(tps, listener_test_task, NULL);
+
+ if (check_stats(test, pvt, 1, 0, 1) < 0) {
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ ast_taskprocessor_push(tps, listener_test_task, NULL);
+
+ if (check_stats(test, pvt, 2, 0, 1) < 0) {
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ ast_taskprocessor_execute(tps);
+
+ if (check_stats(test, pvt, 2, 0, 1) < 0) {
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ ast_taskprocessor_execute(tps);
+
+ if (check_stats(test, pvt, 2, 1, 1) < 0) {
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+ tps = ast_taskprocessor_unreference(tps);
+
+ if (!pvt->shutdown) {
+ res = AST_TEST_FAIL;
+ goto test_exit;
+ }
+
+test_exit:
+ ao2_cleanup(listener);
+ /* This is safe even if tps is NULL */
+ ast_taskprocessor_unreference(tps);
+ ast_free(pvt);
+ return res;
+}
+
+static int unload_module(void)
+{
+ ast_test_unregister(default_taskprocessor);
+ ast_test_unregister(default_taskprocessor_load);
+ ast_test_unregister(taskprocessor_listener);
+ return 0;
+}
+
+static int load_module(void)
+{
+ ast_test_register(default_taskprocessor);
+ ast_test_register(default_taskprocessor_load);
+ ast_test_register(taskprocessor_listener);
+ return AST_MODULE_LOAD_SUCCESS;
+}
+
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "taskprocessor test module");
Propchange: team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/oej/bufo-manager-contexts-trunk/tests/test_taskprocessor.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: team/oej/bufo-manager-contexts-trunk/tests/test_threadpool.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/bufo-manager-contexts-trunk/tests/test_threadpool.c?view=auto&rev=379996
==============================================================================
--- team/oej/bufo-manager-contexts-trunk/tests/test_threadpool.c (added)
+++ team/oej/bufo-manager-contexts-trunk/tests/test_threadpool.c Wed Jan 23 02:02:33 2013
@@ -1,0 +1,1430 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
+ *
+ * Copyright (C) 2012-2013, Digium, Inc.
+ *
+ * Mark Michelson <mmichelson at digium.com>
+ *
+ * See http://www.asterisk.org for more information about
+ * the Asterisk project. Please do not directly contact
+ * any of the maintainers of this project for assistance;
+ * the project provides a web site, mailing lists and IRC
+ * channels for your use.
+ *
+ * This program is free software, distributed under the terms of
+ * the GNU General Public License Version 2. See the LICENSE file
+ * at the top of the source tree.
+ */
+
+/*!
+ * \file
+ * \brief threadpool unit tests
+ *
+ * \author Mark Michelson <mmichelson at digium.com>
+ *
+ */
+
+/*** MODULEINFO
+ <depend>TEST_FRAMEWORK</depend>
+ <support_level>core</support_level>
+ ***/
+
+#include "asterisk.h"
+
+#include "asterisk/test.h"
+#include "asterisk/threadpool.h"
+#include "asterisk/module.h"
+#include "asterisk/lock.h"
+#include "asterisk/astobj2.h"
+#include "asterisk/logger.h"
+
+struct test_listener_data {
+ int num_active;
+ int num_idle;
+ int task_pushed;
+ int num_tasks;
+ int empty_notice;
+ int was_empty;
+ ast_mutex_t lock;
+ ast_cond_t cond;
+};
+
+static struct test_listener_data *test_alloc(void)
+{
+ struct test_listener_data *tld = ast_calloc(1, sizeof(*tld));
+ if (!tld) {
+ return NULL;
+ }
+ ast_mutex_init(&tld->lock);
+ ast_cond_init(&tld->cond, NULL);
+ return tld;
+}
+
+static void test_state_changed(struct ast_threadpool *pool,
+ struct ast_threadpool_listener *listener,
+ int active_threads,
+ int idle_threads)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ SCOPED_MUTEX(lock, &tld->lock);
+ tld->num_active = active_threads;
+ tld->num_idle = idle_threads;
+ ast_log(LOG_NOTICE, "Thread state: %d active, %d idle\n", tld->num_active, tld->num_idle);
+ ast_cond_signal(&tld->cond);
+}
+
+static void test_task_pushed(struct ast_threadpool *pool,
+ struct ast_threadpool_listener *listener,
+ int was_empty)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ SCOPED_MUTEX(lock, &tld->lock);
+ tld->task_pushed = 1;
+ ++tld->num_tasks;
+ tld->was_empty = was_empty;
+ ast_cond_signal(&tld->cond);
+}
+
+static void test_emptied(struct ast_threadpool *pool,
+ struct ast_threadpool_listener *listener)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ SCOPED_MUTEX(lock, &tld->lock);
+ tld->empty_notice = 1;
+ ast_cond_signal(&tld->cond);
+}
+
+static void test_shutdown(struct ast_threadpool_listener *listener)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ ast_cond_destroy(&tld->cond);
+ ast_mutex_destroy(&tld->lock);
+}
+
+static const struct ast_threadpool_listener_callbacks test_callbacks = {
+ .state_changed = test_state_changed,
+ .task_pushed = test_task_pushed,
+ .emptied = test_emptied,
+ .shutdown = test_shutdown,
+};
+
+struct simple_task_data {
+ int task_executed;
+ ast_mutex_t lock;
+ ast_cond_t cond;
+};
+
+static struct simple_task_data *simple_task_data_alloc(void)
+{
+ struct simple_task_data *std = ast_calloc(1, sizeof(*std));
+
+ if (!std) {
+ return NULL;
+ }
+ ast_mutex_init(&std->lock);
+ ast_cond_init(&std->cond, NULL);
+ return std;
+}
+
+static int simple_task(void *data)
+{
+ struct simple_task_data *std = data;
+ SCOPED_MUTEX(lock, &std->lock);
+ std->task_executed = 1;
+ ast_cond_signal(&std->cond);
+ return 0;
+}
+
+static enum ast_test_result_state wait_until_thread_state(struct ast_test *test, struct test_listener_data *tld, int num_active, int num_idle)
+{
+ struct timeval start = ast_tvnow();
+ struct timespec end = {
+ .tv_sec = start.tv_sec + 5,
+ .tv_nsec = start.tv_usec * 1000
+ };
+ enum ast_test_result_state res = AST_TEST_PASS;
+ SCOPED_MUTEX(lock, &tld->lock);
+
+ while (!(tld->num_active == num_active && tld->num_idle == num_idle)) {
+ if (ast_cond_timedwait(&tld->cond, &tld->lock, &end) == ETIMEDOUT) {
+ break;
+ }
+ }
+
+ if (tld->num_active != num_active && tld->num_idle != num_idle) {
+ ast_test_status_update(test, "Number of active threads and idle threads not what was expected.\n");
+ ast_test_status_update(test, "Expected %d active threads but got %d\n", num_active, tld->num_active);
+ ast_test_status_update(test, "Expected %d idle threads but got %d\n", num_idle, tld->num_idle);
+ res = AST_TEST_FAIL;
+ }
+
+ return res;
+}
+
+static void wait_for_task_pushed(struct ast_threadpool_listener *listener)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ struct timeval start = ast_tvnow();
+ struct timespec end = {
+ .tv_sec = start.tv_sec + 5,
+ .tv_nsec = start.tv_usec * 1000
+ };
+ SCOPED_MUTEX(lock, &tld->lock);
+
+ while (!tld->task_pushed) {
+ if (ast_cond_timedwait(&tld->cond, lock, &end) == ETIMEDOUT) {
+ break;
+ }
+ }
+}
+
+static enum ast_test_result_state wait_for_completion(struct ast_test *test, struct simple_task_data *std)
+{
+ struct timeval start = ast_tvnow();
+ struct timespec end = {
+ .tv_sec = start.tv_sec + 5,
+ .tv_nsec = start.tv_usec * 1000
+ };
+ enum ast_test_result_state res = AST_TEST_PASS;
+ SCOPED_MUTEX(lock, &std->lock);
+
+ while (!std->task_executed) {
+ if (ast_cond_timedwait(&std->cond, lock, &end) == ETIMEDOUT) {
+ break;
+ }
+ }
+
+ if (!std->task_executed) {
+ ast_test_status_update(test, "Task execution did not occur\n");
+ res = AST_TEST_FAIL;
+ }
+ return res;
+}
+
+static enum ast_test_result_state wait_for_empty_notice(struct ast_test *test, struct test_listener_data *tld)
+{
+ struct timeval start = ast_tvnow();
+ struct timespec end = {
+ .tv_sec = start.tv_sec + 5,
+ .tv_nsec = start.tv_usec * 1000
+ };
+ enum ast_test_result_state res = AST_TEST_PASS;
+ SCOPED_MUTEX(lock, &tld->lock);
+
+ while (!tld->empty_notice) {
+ if (ast_cond_timedwait(&tld->cond, lock, &end) == ETIMEDOUT) {
+ break;
+ }
+ }
+
+ if (!tld->empty_notice) {
+ ast_test_status_update(test, "Test listener not notified that threadpool is empty\n");
+ res = AST_TEST_FAIL;
+ }
+
+ return res;
+}
+
+static enum ast_test_result_state listener_check(
+ struct ast_test *test,
+ struct ast_threadpool_listener *listener,
+ int task_pushed,
+ int was_empty,
+ int num_tasks,
+ int num_active,
+ int num_idle,
+ int empty_notice)
+{
+ struct test_listener_data *tld = ast_threadpool_listener_get_user_data(listener);
+ enum ast_test_result_state res = AST_TEST_PASS;
+
+ if (tld->task_pushed != task_pushed) {
+ ast_test_status_update(test, "Expected task %sto be pushed, but it was%s\n",
+ task_pushed ? "" : "not ", tld->task_pushed ? "" : " not");
+ res = AST_TEST_FAIL;
+ }
+ if (tld->was_empty != was_empty) {
+ ast_test_status_update(test, "Expected %sto be empty, but it was%s\n",
+ was_empty ? "" : "not ", tld->was_empty ? "" : " not");
+ res = AST_TEST_FAIL;
+ }
+ if (tld->num_tasks!= num_tasks) {
+ ast_test_status_update(test, "Expected %d tasks to be pushed, but got %d\n",
+ num_tasks, tld->num_tasks);
+ res = AST_TEST_FAIL;
+ }
+ if (tld->num_active != num_active) {
+ ast_test_status_update(test, "Expected %d active threads, but got %d\n",
+ num_active, tld->num_active);
+ res = AST_TEST_FAIL;
+ }
+ if (tld->num_idle != num_idle) {
+ ast_test_status_update(test, "Expected %d idle threads, but got %d\n",
+ num_idle, tld->num_idle);
+ res = AST_TEST_FAIL;
+ }
+ if (tld->empty_notice != empty_notice) {
+ ast_test_status_update(test, "Expected %s empty notice, but got %s\n",
+ was_empty ? "an" : "no", tld->task_pushed ? "one" : "none");
+ res = AST_TEST_FAIL;
+ }
+
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_push)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std = NULL;
+ struct test_listener_data *tld = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "push";
+ info->category = "/main/threadpool/";
+ info->summary = "Test task";
+ info->description =
+ "Basic threadpool test";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std = simple_task_data_alloc();
+ if (!std) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std);
+
+ wait_for_task_pushed(listener);
+
+ res = listener_check(test, listener, 1, 1, 1, 0, 0, 0);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_initial_threads)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 3,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "initial_threads";
+ info->category = "/main/threadpool/";
+ info->summary = "Test threadpool initialization state";
+ info->description =
+ "Ensure that a threadpool created with a specific size contains the\n"
+ "proper number of idle threads.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 3);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(tld);
+ return res;
+}
+
+
+AST_TEST_DEFINE(threadpool_thread_creation)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "thread_creation";
+ info->category = "/main/threadpool/";
+ info->summary = "Test threadpool thread creation";
+ info->description =
+ "Ensure that threads can be added to a threadpool";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ /* Now let's create a thread. It should start active, then go
+ * idle immediately
+ */
+ ast_threadpool_set_size(pool, 1);
+
+ res = wait_until_thread_state(test, tld, 0, 1);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_thread_destruction)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "thread_destruction";
+ info->category = "/main/threadpool/";
+ info->summary = "Test threadpool thread destruction";
+ info->description =
+ "Ensure that threads are properly destroyed in a threadpool";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ ast_threadpool_set_size(pool, 3);
+
+ res = wait_until_thread_state(test, tld, 0, 3);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 0, 0, 0, 0, 3, 0);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ ast_threadpool_set_size(pool, 2);
+
+ res = wait_until_thread_state(test, tld, 0, 2);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_thread_timeout)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 2,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "thread_timeout";
+ info->category = "/main/threadpool/";
+ info->summary = "Test threadpool thread timeout";
+ info->description =
+ "Ensure that a thread with a two second timeout dies as expected.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ ast_threadpool_set_size(pool, 1);
+
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 0, 0, 0, 0, 1, 0);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 0);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 0, 0, 0, 0, 0, 0);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_one_task_one_thread)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "one_task_one_thread";
+ info->category = "/main/threadpool/";
+ info->summary = "Test a single task with a single thread";
+ info->description =
+ "Push a task into an empty threadpool, then add a thread to the pool.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std = simple_task_data_alloc();
+ if (!std) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std);
+
+ ast_threadpool_set_size(pool, 1);
+
+ /* Threads added to the pool are active when they start,
+ * so the newly-created thread should immediately execute
+ * the waiting task.
+ */
+ res = wait_for_completion(test, std);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_for_empty_notice(test, tld);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ /* After completing the task, the thread should go idle */
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 1, 1, 1, 0, 1, 1);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std);
+ ast_free(tld);
+ return res;
+
+}
+
+AST_TEST_DEFINE(threadpool_one_thread_one_task)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "one_thread_one_task";
+ info->category = "/main/threadpool/";
+ info->summary = "Test a single thread with a single task";
+ info->description =
+ "Add a thread to the pool and then push a task to it.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std = simple_task_data_alloc();
+ if (!std) {
+ goto end;
+ }
+
+ ast_threadpool_set_size(pool, 1);
+
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std);
+
+ res = wait_for_completion(test, std);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_for_empty_notice(test, tld);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ /* After completing the task, the thread should go idle */
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 1, 1, 1, 0, 1, 1);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_one_thread_multiple_tasks)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std1 = NULL;
+ struct simple_task_data *std2 = NULL;
+ struct simple_task_data *std3 = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 0,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "one_thread_multiple_tasks";
+ info->category = "/main/threadpool/";
+ info->summary = "Test a single thread with multiple tasks";
+ info->description =
+ "Add a thread to the pool and then push three tasks to it.";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std1 = simple_task_data_alloc();
+ std2 = simple_task_data_alloc();
+ std3 = simple_task_data_alloc();
+ if (!std1 || !std2 || !std3) {
+ goto end;
+ }
+
+ ast_threadpool_set_size(pool, 1);
+
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std1);
+ ast_threadpool_push(pool, simple_task, std2);
+ ast_threadpool_push(pool, simple_task, std3);
+
+ res = wait_for_completion(test, std1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+ res = wait_for_completion(test, std2);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+ res = wait_for_completion(test, std3);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_for_empty_notice(test, tld);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 1, 0, 3, 0, 1, 1);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std1);
+ ast_free(std2);
+ ast_free(std3);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_auto_increment)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std1 = NULL;
+ struct simple_task_data *std2 = NULL;
+ struct simple_task_data *std3 = NULL;
+ struct simple_task_data *std4 = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 3,
+ .initial_size = 0,
+ .max_size = 0,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "auto_increment";
+ info->category = "/main/threadpool/";
+ info->summary = "Test that the threadpool grows as tasks are added";
+ info->description =
+ "Create an empty threadpool and push a task to it. Once the task is\n"
+ "pushed, the threadpool should add three threads and be able to\n"
+ "handle the task. The threads should then go idle\n";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std1 = simple_task_data_alloc();
+ std2 = simple_task_data_alloc();
+ std3 = simple_task_data_alloc();
+ std4 = simple_task_data_alloc();
+ if (!std1 || !std2 || !std3 || !std4) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std1);
+
+ /* Pushing the task should result in the threadpool growing
+ * by three threads. This will allow the task to actually execute
+ */
+ res = wait_for_completion(test, std1);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_for_empty_notice(test, tld);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 3);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ /* Now push three tasks into the pool and ensure the pool does not
+ * grow.
+ */
+ ast_threadpool_push(pool, simple_task, std2);
+ ast_threadpool_push(pool, simple_task, std3);
+ ast_threadpool_push(pool, simple_task, std4);
+
+ res = wait_for_completion(test, std2);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+ res = wait_for_completion(test, std3);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+ res = wait_for_completion(test, std4);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_for_empty_notice(test, tld);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 3);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+ res = listener_check(test, listener, 1, 0, 4, 0, 3, 1);
+
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std1);
+ ast_free(std2);
+ ast_free(std3);
+ ast_free(std4);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_max_size)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
+ struct ast_threadpool_options options = {
+ .version = AST_THREADPOOL_OPTIONS_VERSION,
+ .idle_timeout = 0,
+ .auto_increment = 3,
+ .initial_size = 0,
+ .max_size = 2,
+ };
+
+ switch (cmd) {
+ case TEST_INIT:
+ info->name = "max_size";
+ info->category = "/main/threadpool/";
+ info->summary = "Test that the threadpool does not exceed its maximum size restriction";
+ info->description =
+ "Create an empty threadpool and push a task to it. Once the task is\n"
+ "pushed, the threadpool should attempt to grow by three threads, but the\n"
+ "pool's restrictions should only allow two threads to be added.\n";
+ return AST_TEST_NOT_RUN;
+ case TEST_EXECUTE:
+ break;
+ }
+
+ tld = test_alloc();
+ if (!tld) {
+ return AST_TEST_FAIL;
+ }
+
+ listener = ast_threadpool_listener_alloc(&test_callbacks, tld);
+ if (!listener) {
+ goto end;
+ }
+
+ pool = ast_threadpool_create(info->name, listener, &options);
+ if (!pool) {
+ goto end;
+ }
+
+ std = simple_task_data_alloc();
+ if (!std) {
+ goto end;
+ }
+
+ ast_threadpool_push(pool, simple_task, std);
+
+ res = wait_for_completion(test, std);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = wait_until_thread_state(test, tld, 0, 2);
+ if (res == AST_TEST_FAIL) {
+ goto end;
+ }
+
+ res = listener_check(test, listener, 1, 1, 1, 0, 2, 1);
+end:
+ ast_threadpool_shutdown(pool);
+ ao2_cleanup(listener);
+ ast_free(std);
+ ast_free(tld);
+ return res;
+}
+
+AST_TEST_DEFINE(threadpool_reactivation)
+{
+ struct ast_threadpool *pool = NULL;
+ struct ast_threadpool_listener *listener = NULL;
+ struct simple_task_data *std1 = NULL;
+ struct simple_task_data *std2 = NULL;
+ enum ast_test_result_state res = AST_TEST_FAIL;
+ struct test_listener_data *tld = NULL;
[... 415 lines stripped ...]
More information about the asterisk-commits
mailing list