summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-02-28 21:29:57 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-02-28 21:29:57 +0000
commite2832f18bc50a4430ae1536ff7a588008a5528cf (patch)
tree3bc558bd0b95a58996cb1e349f1a207e74c98749
parent6acc9ceb7621d47a78f7e0c69bfad6ed27e8bac2 (diff)
threadpool: Whitespace and comment corrections.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@382294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--include/asterisk/threadpool.h5
-rw-r--r--main/threadpool.c40
2 files changed, 25 insertions, 20 deletions
diff --git a/include/asterisk/threadpool.h b/include/asterisk/threadpool.h
index 15093175a..89076265e 100644
--- a/include/asterisk/threadpool.h
+++ b/include/asterisk/threadpool.h
@@ -103,6 +103,9 @@ struct ast_threadpool_options {
*
* When the threadpool's size increases, it can never increase
* beyond this number of threads.
+ *
+ * Zero is a valid value if the threadpool does not have a
+ * maximum size.
*/
int max_size;
};
@@ -132,7 +135,7 @@ void *ast_threadpool_listener_get_user_data(const struct ast_threadpool_listener
* \brief Create a new threadpool
*
* This function creates a threadpool. Tasks may be pushed onto this thread pool
- * in and will be automatically acted upon by threads within the pool.
+ * and will be automatically acted upon by threads within the pool.
*
* Only a single threadpool with a given name may exist. This function will fail
* if a threadpool with the given name already exists.
diff --git a/main/threadpool.c b/main/threadpool.c
index ab390e9d8..68d84aff8 100644
--- a/main/threadpool.c
+++ b/main/threadpool.c
@@ -94,7 +94,7 @@ struct ast_threadpool {
* that the threadpool had its state change.
*/
struct ast_taskprocessor *control_tps;
- /*! True if the threadpool is in the processof shutting down */
+ /*! True if the threadpool is in the process of shutting down */
int shutting_down;
/*! Threadpool-specific options */
struct ast_threadpool_options options;
@@ -1127,28 +1127,30 @@ static struct serializer *serializer_create(struct ast_threadpool *pool)
static int execute_tasks(void *data)
{
- struct ast_taskprocessor *tps = data;
+ struct ast_taskprocessor *tps = data;
- while (ast_taskprocessor_execute(tps)) {
- /* No-op */
- }
+ while (ast_taskprocessor_execute(tps)) {
+ /* No-op */
+ }
- ast_taskprocessor_unreference(tps);
- return 0;
+ ast_taskprocessor_unreference(tps);
+ return 0;
}
-static void serializer_task_pushed(struct ast_taskprocessor_listener *listener, int was_empty) {
- if (was_empty) {
- struct serializer *ser = ast_taskprocessor_listener_get_user_data(listener);
- struct ast_taskprocessor *tps = ast_taskprocessor_listener_get_tps(listener);
- ast_threadpool_push(ser->pool, execute_tasks, tps);
- }
-};
+static void serializer_task_pushed(struct ast_taskprocessor_listener *listener, int was_empty)
+{
+ if (was_empty) {
+ struct serializer *ser = ast_taskprocessor_listener_get_user_data(listener);
+ struct ast_taskprocessor *tps = ast_taskprocessor_listener_get_tps(listener);
+
+ ast_threadpool_push(ser->pool, execute_tasks, tps);
+ }
+}
static int serializer_start(struct ast_taskprocessor_listener *listener)
{
- /* No-op */
- return 0;
+ /* No-op */
+ return 0;
}
static void serializer_shutdown(struct ast_taskprocessor_listener *listener)
@@ -1158,9 +1160,9 @@ static void serializer_shutdown(struct ast_taskprocessor_listener *listener)
}
static struct ast_taskprocessor_listener_callbacks serializer_tps_listener_callbacks = {
- .task_pushed = serializer_task_pushed,
- .start = serializer_start,
- .shutdown = serializer_shutdown,
+ .task_pushed = serializer_task_pushed,
+ .start = serializer_start,
+ .shutdown = serializer_shutdown,
};
struct ast_taskprocessor *ast_threadpool_serializer(const char *name, struct ast_threadpool *pool)