|
|
|
@ -162,6 +162,26 @@ static void wait_for_task_pushed(struct ast_threadpool_listener *listener)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static enum ast_test_result_state wait_for_completion(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) {
|
|
|
|
|
ast_cond_timedwait(&std->cond, lock, &end);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!std->task_executed) {
|
|
|
|
|
res = AST_TEST_FAIL;
|
|
|
|
|
}
|
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static enum ast_test_result_state listener_check(
|
|
|
|
|
struct ast_test *test,
|
|
|
|
|
struct ast_threadpool_listener *listener,
|
|
|
|
@ -358,11 +378,77 @@ end:
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
|
case TEST_INIT:
|
|
|
|
|
info->name = "threadpool_one_task_one_thread";
|
|
|
|
|
info->category = "/main/threadpool/";
|
|
|
|
|
info->summary = "Test a single task with a single thread";
|
|
|
|
|
info->description =
|
|
|
|
|
"Ensure that a thread executes the added task";
|
|
|
|
|
return AST_TEST_NOT_RUN;
|
|
|
|
|
case TEST_EXECUTE:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
listener = ast_threadpool_listener_alloc(&test_callbacks);
|
|
|
|
|
if (!listener) {
|
|
|
|
|
return AST_TEST_FAIL;
|
|
|
|
|
}
|
|
|
|
|
tld = listener->private_data;
|
|
|
|
|
|
|
|
|
|
pool = ast_threadpool_create(listener, 0);
|
|
|
|
|
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(std);
|
|
|
|
|
|
|
|
|
|
if (res == AST_TEST_FAIL) {
|
|
|
|
|
goto end;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* After completing the task, the thread should go idle */
|
|
|
|
|
WAIT_WHILE(tld, tld->num_idle == 0);
|
|
|
|
|
|
|
|
|
|
res = listener_check(test, listener, 1, 1, 1, 0, 1, 1);
|
|
|
|
|
|
|
|
|
|
end:
|
|
|
|
|
if (pool) {
|
|
|
|
|
ast_threadpool_shutdown(pool);
|
|
|
|
|
}
|
|
|
|
|
ao2_cleanup(listener);
|
|
|
|
|
ast_free(std);
|
|
|
|
|
return res;
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int unload_module(void)
|
|
|
|
|
{
|
|
|
|
|
ast_test_unregister(threadpool_push);
|
|
|
|
|
ast_test_unregister(threadpool_thread_creation);
|
|
|
|
|
ast_test_unregister(threadpool_thread_destruction);
|
|
|
|
|
ast_test_unregister(threadpool_one_task_one_thread);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -371,6 +457,7 @@ static int load_module(void)
|
|
|
|
|
ast_test_register(threadpool_push);
|
|
|
|
|
ast_test_register(threadpool_thread_creation);
|
|
|
|
|
ast_test_register(threadpool_thread_destruction);
|
|
|
|
|
ast_test_register(threadpool_one_task_one_thread);
|
|
|
|
|
return AST_MODULE_LOAD_SUCCESS;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|