Author: kmoore
Date: Thu Aug 1 14:42:25 2013
New Revision: 396023
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=396023
Log:
Resolve merge conflict
Modified:
team/kmoore/res_sip_threadpool_options/res/res_pjsip.c
team/kmoore/res_sip_threadpool_options/res/res_pjsip/config_system.c
team/kmoore/res_sip_threadpool_options/res/res_pjsip/include/res_pjsip_private.h
Modified: team/kmoore/res_sip_threadpool_options/res/res_pjsip.c
URL:
http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_pjsip.c?view=diff&rev=396023&r1=396022&r2=396023
==============================================================================
--- team/kmoore/res_sip_threadpool_options/res/res_pjsip.c (original)
+++ team/kmoore/res_sip_threadpool_options/res/res_pjsip.c Thu Aug 1 14:42:25
2013
@@ -935,6 +935,15 @@
<configOption name="compactheaders"
default="no">
<synopsis>Use the short forms of common
SIP header names.</synopsis>
</configOption>
+ <configOption name="threadpool_initial_size"
default="0">
+ <synopsis>Initial number of threads in
the res_pjsip threadpool.</synopsis>
+ </configOption>
+ <configOption name="threadpool_idle_timeout"
default="60">
+ <synopsis>Number of seconds before an
idle thread should be disposed of.</synopsis>
+ </configOption>
+ <configOption name="threadpool_max_size"
default="0">
+ <synopsis>Maximum number of threads in
the res_pjsip threadpool.</synopsis>
+ </configOption>
</configObject>
<configObject name="global">
<synopsis>Options that apply globally to all
SIP communications</synopsis>
@@ -1746,26 +1755,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;
@@ -1795,6 +1790,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_pjsip/config_system.c
URL:
http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_pjsip/config_system.c?view=diff&rev=396023&r1=396022&r2=396023
==============================================================================
--- team/kmoore/res_sip_threadpool_options/res/res_pjsip/config_system.c
(original)
+++ team/kmoore/res_sip_threadpool_options/res/res_pjsip/config_system.c Thu
Aug 1 14:42:25 2013
@@ -24,6 +24,7 @@
#include "asterisk/res_pjsip.h"
#include "asterisk/sorcery.h"
#include "include/res_pjsip_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",
"threadpool_initial_size", "0",
+ OPT_UINT_T, 0, FLDSET(struct system_config,
threadpool.initial_size));
+ ast_sorcery_object_field_register(system_sorcery, "system",
"threadpool_idle_timeout", "60",
+ OPT_UINT_T, 0, FLDSET(struct system_config,
threadpool.idle_timeout));
+ ast_sorcery_object_field_register(system_sorcery, "system",
"threadpool_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_pjsip/include/res_pjsip_private.h
URL:
http://svnview.digium.com/svn/asterisk/team/kmoore/res_sip_threadpool_options/res/res_pjsip/include/res_pjsip_private.h?view=diff&rev=396023&r1=396022&r2=396023
==============================================================================
---
team/kmoore/res_sip_threadpool_options/res/res_pjsip/include/res_pjsip_private.h
(original)
+++
team/kmoore/res_sip_threadpool_options/res/res_pjsip/include/res_pjsip_private.h
Thu Aug 1 14:42:25 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_PJSIP_PRIVATE_H_ */
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
