kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 16:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

taskpool: Fix some references to threadpool that should be taskpool.

Browse Source 
Resolves: #1478
This commit is contained in:
George Joseph
2025-10-10 06:26:05 -06:00
committed by github-actions[bot]
parent fab46493b3
commit 21df9edc38
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/stasis.h
View File

@@ -649,7 +649,7 @@ struct stasis_subscription *__stasis_subscribe(struct stasis_topic *topic,
#define stasis_subscribe(topic, callback, data) __stasis_subscribe(topic, callback, data, __FILE__, __LINE__, __PRETTY_FUNCTION__)
/*!
* \brief Create a subscription whose callbacks occur on a thread pool
* \brief Create a subscription whose callbacks occur on a task pool
*
* In addition to being AO2 managed memory (requiring an ao2_cleanup() to free
* up this reference), the subscription must be explicitly unsubscribed from its
@@ -659,7 +659,7 @@ struct stasis_subscription *__stasis_subscribe(struct stasis_topic *topic,
* always happen on the same thread. The invocation order of different subscriptions
* is unspecified.
*
* Unlike \ref stasis_subscribe, this function will explicitly use a threadpool to
* Unlike \ref stasis_subscribe, this function will explicitly use a taskpool to
* dispatch items to its \c callback. This form of subscription should be used
* when many subscriptions may be made to the specified \c topic.
*

4
include/asterisk/stasis_internal.h
View File

@@ -54,7 +54,7 @@
* \param needs_mailbox Determines whether or not the subscription requires a mailbox.
* Subscriptions with mailboxes will be delivered on some non-publisher thread;
* subscriptions without mailboxes will be delivered on the publisher thread.
* \param use_thread_pool Use the thread pool for the subscription. This is only
* \param use_task_pool Use the task pool for the subscription. This is only
* relevant if \c needs_mailbox is non-zero.
* \param file, lineno, func
* \return New \ref stasis_subscription object.
@@ -66,7 +66,7 @@ struct stasis_subscription *internal_stasis_subscribe(
stasis_subscription_cb callback,
void *data,
int needs_mailbox,
int use_thread_pool,
int use_task_pool,
const char *file,
int lineno,
const char *func);

2
include/asterisk/stasis_message_router.h
View File

@@ -63,7 +63,7 @@ struct stasis_message_router *__stasis_message_router_create(
* \brief Create a new message router object.
*
* The subscription created for this message router will dispatch
* callbacks on a thread pool.
* callbacks on a task pool.
*
* \param topic Topic to subscribe route to.
*

4
main/stasis_message_router.c
View File

@@ -203,7 +203,7 @@ static void router_dispatch(void *data,
}
static struct stasis_message_router *stasis_message_router_create_internal(
struct stasis_topic *topic, int use_thread_pool, const char *file, int lineno,
struct stasis_topic *topic, int use_task_pool, const char *file, int lineno,
const char *func)
{
int res;
@@ -223,7 +223,7 @@ static struct stasis_message_router *stasis_message_router_create_internal(
return NULL;
}
if (use_thread_pool) {
if (use_task_pool) {
router->subscription = __stasis_subscribe_pool(topic, router_dispatch, router, file, lineno, func);
} else {
router->subscription = __stasis_subscribe(topic, router_dispatch, router, file, lineno, func);

14
tests/test_stasis.c
View File

@@ -382,8 +382,8 @@ AST_TEST_DEFINE(subscription_pool_messages)
case TEST_INIT:
info->name = __func__;
info->category = test_category;
info->summary = "Test subscribe/unsubscribe messages using a threadpool subscription";
info->description = "Test subscribe/unsubscribe messages using a threadpool subscription";
info->summary = "Test subscribe/unsubscribe messages using a taskpool subscription";
info->description = "Test subscribe/unsubscribe messages using a taskpool subscription";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;
@@ -530,10 +530,10 @@ AST_TEST_DEFINE(publish_pool)
case TEST_INIT:
info->name = __func__;
info->category = test_category;
info->summary = "Test publishing with a threadpool";
info->summary = "Test publishing with a taskpool";
info->description = "Test publishing to a subscriber whose\n"
"subscription dictates messages are received through a\n"
"threadpool.";
"taskpool.";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;
@@ -793,7 +793,7 @@ AST_TEST_DEFINE(subscription_interleaving)
"and publishes messages alternately between the children.\n"
"It verifies that the messages are received in the expected\n"
"order, for different subscription types: one with a dedicated\n"
"thread, the other on the Stasis threadpool.";
"thread, the other on the Stasis taskpool.";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;
@@ -1619,10 +1619,10 @@ AST_TEST_DEFINE(router_pool)
case TEST_INIT:
info->name = __func__;
info->category = test_category;
info->summary = "Test message routing via threadpool";
info->summary = "Test message routing via taskpool";
info->description = "Test simple message routing when\n"
"the subscriptions dictate usage of the Stasis\n"
"threadpool.";
"taskpool.";
return AST_TEST_NOT_RUN;
case TEST_EXECUTE:
break;