[asterisk-commits] kmoore: branch kmoore/res_sip_threadpool_options r395521 - in /team/kmoore/re...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Fri Jul 26 12:21:09 CDT 2013


Author: kmoore
Date: Fri Jul 26 12:21:08 2013
New Revision: 395521

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395521
Log:
Expose threadpool options for res_sip

Modified:
    team/kmoore/res_sip_threadpool_options/res/res_sip.c
    team/kmoore/res_sip_threadpool_options/res/res_sip/config_system.c
    team/kmoore/res_sip_threadpool_options/res/res_sip/include/res_sip_private.h

Modified: team/kmoore/res_sip_threadpool_options/res/res_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_sip.c?view=diff&rev=395521&r1=395520&r2=395521
==============================================================================
--- team/kmoore/res_sip_threadpool_options/res/res_sip.c (original)
+++ team/kmoore/res_sip_threadpool_options/res/res_sip.c Fri Jul 26 12:21:08 2013
@@ -876,6 +876,15 @@
 				<configOption name="compactheaders" default="no">
 					<synopsis>Use the short forms of common SIP header names.</synopsis>
 				</configOption>
+				<configOption name="tp_initial_size" default="0">
+					<synopsis>Initial number of threads in the res_sip threadpool.</synopsis>
+				</configOption>
+				<configOption name="tp_idle_timeout" default="20">
+					<synopsis>Number of seconds before an idle thread should be disposed of.</synopsis>
+				</configOption>
+				<configOption name="tp_max_size" default="200">
+					<synopsis>Maximum number of threads in the res_sip threadpool.</synopsis>
+				</configOption>
 			</configObject>
 			<configObject name="global">
 				<synopsis>Options that apply globally to all SIP communications</synopsis>
@@ -1687,26 +1696,12 @@
 
 static int load_module(void)
 {
-    /* The third parameter is just copied from
-     * example code from PJLIB. This can be adjusted
-     * if necessary.
+	/* The third parameter is just copied from
+	 * example code from PJLIB. This can be adjusted
+	 * if necessary.
 	 */
 	pj_status_t status;
-
-	/* XXX For the time being, create hard-coded threadpool
-	 * options. Just bump up by five threads every time we
-	 * don't have any available threads. Idle threads time
-	 * out after a minute. No maximum size
-	 */
-	struct ast_threadpool_options options = {
-		.version = AST_THREADPOOL_OPTIONS_VERSION,
-		.auto_increment = 5,
-		.max_size = 0,
-		.idle_timeout = 60,
-		.initial_size = 0,
-		.thread_start = sip_thread_start,
-	};
-	sip_threadpool = ast_threadpool_create("SIP", NULL, &options);
+	struct ast_threadpool_options options;
 
 	if (pj_init() != PJ_SUCCESS) {
 		return AST_MODULE_LOAD_DECLINE;
@@ -1736,6 +1731,14 @@
 
 	if (ast_sip_initialize_system()) {
 		ast_log(LOG_ERROR, "Failed to initialize SIP system configuration. Aborting load\n");
+		goto error;
+	}
+
+	sip_get_threadpool_options(&options);
+	options.thread_start = sip_thread_start;
+	sip_threadpool = ast_threadpool_create("SIP", NULL, &options);
+	if (!sip_threadpool) {
+		ast_log(LOG_ERROR, "Failed to create SIP threadpool. Aborting load\n");
 		goto error;
 	}
 

Modified: team/kmoore/res_sip_threadpool_options/res/res_sip/config_system.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_sip/config_system.c?view=diff&rev=395521&r1=395520&r2=395521
==============================================================================
--- team/kmoore/res_sip_threadpool_options/res/res_sip/config_system.c (original)
+++ team/kmoore/res_sip_threadpool_options/res/res_sip/config_system.c Fri Jul 26 12:21:08 2013
@@ -24,6 +24,7 @@
 #include "asterisk/res_sip.h"
 #include "asterisk/sorcery.h"
 #include "include/res_sip_private.h"
+#include "asterisk/threadpool.h"
 
 #define TIMER_T1_MIN 100
 #define DEFAULT_TIMER_T1 500
@@ -37,7 +38,28 @@
 	unsigned int timerb;
 	/*! Should we use short forms for headers? */
 	unsigned int compactheaders;
+	struct {
+		/*! Initial number of threads in the threadpool */
+		int initial_size;
+		/*! Thread idle timeout in seconds */
+		int idle_timeout;
+		/*! Maxumum number of threads in the threadpool */
+		int max_size;
+	} threadpool;
 };
+
+static struct ast_threadpool_options sip_threadpool_options = {
+	.version = AST_THREADPOOL_OPTIONS_VERSION,
+	.initial_size = 0,
+	.auto_increment = 5,
+	.idle_timeout = 60,
+	.max_size = 0,
+};
+
+void sip_get_threadpool_options(struct ast_threadpool_options *threadpool_options)
+{
+	*threadpool_options = sip_threadpool_options;
+}
 
 static struct ast_sorcery *system_sorcery;
 
@@ -77,6 +99,10 @@
 		pjsip_use_compact_form = PJ_TRUE;
 	}
 
+	sip_threadpool_options.initial_size = system->threadpool.initial_size;
+	sip_threadpool_options.idle_timeout = system->threadpool.idle_timeout;
+	sip_threadpool_options.max_size = system->threadpool.max_size;
+
 	return 0;
 }
 
@@ -105,6 +131,12 @@
 			OPT_UINT_T, 0, FLDSET(struct system_config, timerb));
 	ast_sorcery_object_field_register(system_sorcery, "system", "compactheaders", "no",
 			OPT_BOOL_T, 1, FLDSET(struct system_config, compactheaders));
+	ast_sorcery_object_field_register(system_sorcery, "system", "tp_initial_size", "0",
+			OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.initial_size));
+	ast_sorcery_object_field_register(system_sorcery, "system", "tp_idle_timeout", "60",
+			OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.idle_timeout));
+	ast_sorcery_object_field_register(system_sorcery, "system", "tp_max_size", "0",
+			OPT_UINT_T, 0, FLDSET(struct system_config, threadpool.max_size));
 
 	ast_sorcery_load(system_sorcery);
 

Modified: team/kmoore/res_sip_threadpool_options/res/res_sip/include/res_sip_private.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_sip/include/res_sip_private.h?view=diff&rev=395521&r1=395520&r2=395521
==============================================================================
--- team/kmoore/res_sip_threadpool_options/res/res_sip/include/res_sip_private.h (original)
+++ team/kmoore/res_sip_threadpool_options/res/res_sip/include/res_sip_private.h Fri Jul 26 12:21:08 2013
@@ -71,4 +71,8 @@
  */
 int ast_sip_initialize_global(void);
 
+/*!
+ * \brief Get threadpool options
+ */
+void sip_get_threadpool_options(struct ast_threadpool_options *threadpool_options);
 #endif /* RES_SIP_PRIVATE_H_ */




More information about the asterisk-commits mailing list