kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-17 10:11:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 44378 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r44378 | kpfleming | 2006-10-04 14:47:22 -0500 (Wed, 04 Oct 2006) | 4 lines

update thread creation code a bit
reduce standard thread stack size slightly to allow the pthreads library to allocate the stack+data and not overflow a power-of-2 allocation in the kernel and waste memory/address space
add a new stack size for 'background' threads (those that don't handle PBX calls) when LOW_MEMORY is defined

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@44379 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-10-04 19:51:38 +00:00
parent de7a85105a
commit 3c876af5cf
27 changed files with 83 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/asterisk.c
View File

@@ -300,7 +300,7 @@ void ast_register_thread(char *name)
if (!new)
return;
new->id = pthread_self();
new->name = name; /* this was a copy already */
new->name = name; /* steal the allocated memory for the thread name */
AST_LIST_LOCK(&thread_list);
AST_LIST_INSERT_HEAD(&thread_list, new, list);
AST_LIST_UNLOCK(&thread_list);
@@ -312,7 +312,7 @@ void ast_unregister_thread(void *id)
AST_LIST_LOCK(&thread_list);
AST_LIST_TRAVERSE_SAFE_BEGIN(&thread_list, x, list) {
if ((void *)x->id == id) {
if ((void *) x->id == id) {
AST_LIST_REMOVE_CURRENT(&thread_list, list);
break;
}
@@ -859,7 +859,7 @@ static void *listener(void *unused)
fcntl(consoles[x].p[1], F_SETFL, flags | O_NONBLOCK);
consoles[x].fd = s;
consoles[x].mute = ast_opt_mute;
if (ast_pthread_create(&consoles[x].t, &attr, netconsole, &consoles[x])) {
if (ast_pthread_create_background(&consoles[x].t, &attr, netconsole, &consoles[x])) {
ast_log(LOG_ERROR, "Unable to spawn thread to handle connection: %s\n", strerror(errno));
close(consoles[x].p[0]);
close(consoles[x].p[1]);
@@ -917,7 +917,7 @@ static int ast_makesocket(void)
return -1;
}
ast_register_verbose(network_verboser);
ast_pthread_create(&lthread, NULL, listener, NULL);
ast_pthread_create_background(&lthread, NULL, listener, NULL);
if (!ast_strlen_zero(ast_config_AST_CTL_OWNER)) {
struct passwd *pw;

2
main/autoservice.c
View File

@@ -111,7 +111,7 @@ int ast_autoservice_start(struct ast_channel *chan)
AST_LIST_INSERT_HEAD(&aslist, as, list);
res = 0;
if (asthread == AST_PTHREADT_NULL) { /* need start the thread */
if (ast_pthread_create(&asthread, NULL, autoservice_run, NULL)) {
if (ast_pthread_create_background(&asthread, NULL, autoservice_run, NULL)) {
ast_log(LOG_WARNING, "Unable to create autoservice thread :(\n");
/* There will only be a single member in the list at this point,
the one we just added. */

4
main/cdr.c
View File

@@ -853,7 +853,7 @@ void ast_cdr_submit_batch(int shutdown)
} else {
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&batch_post_thread, &attr, do_batch_backend_process, oldbatchitems)) {
if (ast_pthread_create_background(&batch_post_thread, &attr, do_batch_backend_process, oldbatchitems)) {
ast_log(LOG_WARNING, "CDR processing thread could not detach, now trying in this thread\n");
do_batch_backend_process(oldbatchitems);
} else {
@@ -1101,7 +1101,7 @@ static int do_reload(void)
if it does not exist */
if (enabled && batchmode && (!was_enabled || !was_batchmode) && (cdr_thread == AST_PTHREADT_NULL)) {
ast_cond_init(&cdr_pending_cond, NULL);
if (ast_pthread_create(&cdr_thread, NULL, do_cdr, NULL) < 0) {
if (ast_pthread_create_background(&cdr_thread, NULL, do_cdr, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start CDR thread.\n");
ast_sched_del(sched, cdr_sched);
} else {

2
main/devicestate.c
View File

@@ -374,7 +374,7 @@ static void *do_devstate_changes(void *data)
int ast_device_state_engine_init(void)
{
ast_cond_init(&change_pending, NULL);
if (ast_pthread_create(&change_thread, NULL, do_devstate_changes, NULL) < 0) {
if (ast_pthread_create_background(&change_thread, NULL, do_devstate_changes, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start device state change thread.\n");
return -1;
}

2
main/dnsmgr.c
View File

@@ -390,7 +390,7 @@ static int do_reload(int loading)
/* if this reload enabled the manager, create the background thread
if it does not exist */
if (enabled && !was_enabled && (refresh_thread == AST_PTHREADT_NULL)) {
if (ast_pthread_create(&refresh_thread, NULL, do_refresh, NULL) < 0) {
if (ast_pthread_create_background(&refresh_thread, NULL, do_refresh, NULL) < 0) {
ast_log(LOG_ERROR, "Unable to start refresh thread.\n");
}
else {

4
main/http.c
View File

@@ -510,7 +510,7 @@ static void *http_root(void *data)
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
if (ast_pthread_create(&launched, &attr, ast_httpd_helper_thread, ser)) {
if (ast_pthread_create_background(&launched, &attr, ast_httpd_helper_thread, ser)) {
ast_log(LOG_WARNING, "Unable to launch helper thread: %s\n", strerror(errno));
fclose(ser->f);
free(ser);
@@ -589,7 +589,7 @@ static void http_server_start(struct sockaddr_in *sin)
}
flags = fcntl(httpfd, F_GETFL);
fcntl(httpfd, F_SETFL, flags | O_NONBLOCK);
if (ast_pthread_create(&master, NULL, http_root, NULL)) {
if (ast_pthread_create_background(&master, NULL, http_root, NULL)) {
ast_log(LOG_NOTICE, "Unable to launch http server on %s:%d: %s\n",
ast_inet_ntoa(sin->sin_addr), ntohs(sin->sin_port),
strerror(errno));

4
main/manager.c
View File

@@ -2170,7 +2170,7 @@ static void *accept_thread(void *ignore)
s->eventq = s->eventq->next;
AST_LIST_UNLOCK(&sessions);
ast_atomic_fetchadd_int(&s->eventq->usecount, 1);
if (ast_pthread_create(&s->t, &attr, session_do, s))
if (ast_pthread_create_background(&s->t, &attr, session_do, s))
destroy_session(s);
}
pthread_attr_destroy(&attr);
@@ -2785,7 +2785,7 @@ int init_manager(void)
fcntl(asock, F_SETFL, flags | O_NONBLOCK);
if (option_verbose)
ast_verbose("Asterisk Management interface listening on port %d\n", portno);
ast_pthread_create(&t, NULL, accept_thread, NULL);
ast_pthread_create_background(&t, NULL, accept_thread, NULL);
}
return 0;
}

43
main/utils.c
View File

@@ -525,31 +525,38 @@ struct thr_arg {
* are odd macros which start and end a block, so they _must_ be
* used in pairs (the latter with a '1' argument to call the
* handler on exit.
* On BSD we don't need this, but we keep it for compatibility with the MAC.
* On BSD we don't need this, but we keep it for compatibility.
*/
static void *dummy_start(void *data)
{
void *ret;
struct thr_arg a = *((struct thr_arg *)data); /* make a local copy */
struct thr_arg a = *((struct thr_arg *) data); /* make a local copy */
/* note that even though data->name is a pointer to allocated memory,
we are not freeing it here because ast_register_thread is going to
keep a copy of the pointer and then ast_unregister_thread will
free the memory
*/
free(data);
ast_register_thread(a.name);
pthread_cleanup_push(ast_unregister_thread, (void *)pthread_self()); /* on unregister */
pthread_cleanup_push(ast_unregister_thread, (void *) pthread_self());
ret = a.start_routine(a.data);
pthread_cleanup_pop(1);
return ret;
}
int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *), void *data, size_t stacksize,
const char *file, const char *caller, int line, const char *start_fn)
int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*start_routine)(void *),
void *data, size_t stacksize, const char *file, const char *caller,
int line, const char *start_fn)
{
struct thr_arg *a;
pthread_attr_t lattr;
if (!attr) {
pthread_attr_init(&lattr);
attr = &lattr;
attr = alloca(sizeof(*attr));
pthread_attr_init(attr);
}
#ifdef __linux__
/* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED,
which is kind of useless. Change this here to
@@ -558,27 +565,25 @@ int ast_pthread_create_stack(pthread_t *thread, pthread_attr_t *attr, void *(*st
This does mean that callers cannot set a different priority using
PTHREAD_EXPLICIT_SCHED in the attr argument; instead they must set
the priority afterwards with pthread_setschedparam(). */
errno = pthread_attr_setinheritsched(attr, PTHREAD_INHERIT_SCHED);
if (errno)
ast_log(LOG_WARNING, "pthread_attr_setinheritsched returned non-zero: %s\n", strerror(errno));
if ((errno = pthread_attr_setinheritsched(attr, PTHREAD_INHERIT_SCHED)))
ast_log(LOG_WARNING, "pthread_attr_setinheritsched: %s\n", strerror(errno));
#endif
if (!stacksize)
stacksize = AST_STACKSIZE;
errno = pthread_attr_setstacksize(attr, stacksize);
if (errno)
ast_log(LOG_WARNING, "pthread_attr_setstacksize returned non-zero: %s\n", strerror(errno));
a = ast_malloc(sizeof(*a));
if (!a)
ast_log(LOG_WARNING, "no memory, thread %s will not be listed\n", start_fn);
else { /* remap parameters */
if ((errno = pthread_attr_setstacksize(attr, stacksize ? stacksize : AST_STACKSIZE)))
ast_log(LOG_WARNING, "pthread_attr_setstacksize: %s\n", strerror(errno));
if ((a = ast_malloc(sizeof(*a)))) {
a->start_routine = start_routine;
a->data = data;
start_routine = dummy_start;
asprintf(&a->name, "%-20s started at [%5d] %s %s()",
start_fn, line, file, caller);
start_fn, line, file, caller);
data = a;
}
return pthread_create(thread, attr, start_routine, data); /* We're in ast_pthread_create, so it's okay */
}