sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "core: Ensure that el_end is always run when needed." into 16

This commit is contained in:
George Joseph 2018-11-13 10:50:49 -06:00 committed by Gerrit Code Review
parent 38e609656a 3cde7e30ba
commit ff7a772395
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main/asterisk.c
View File

@ -389,6 +389,7 @@ static struct {
unsigned int need_reload:1;
unsigned int need_quit:1;
unsigned int need_quit_handler:1;
unsigned int need_el_end:1;
} sig_flags;
#if !defined(LOW_MEMORY)
@ -2015,10 +2016,9 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
if (el_hist != NULL) {
history_end(el_hist);
}
} else if (mon_sig_flags == pthread_self()) {
if (consolethread != AST_PTHREADT_NULL) {
pthread_kill(consolethread, SIGURG);
}
} else {
sig_flags.need_el_end = 1;
pthread_kill(consolethread, SIGURG);
}
}
active_channels = ast_active_channels();
@ -2635,7 +2635,7 @@ static int ast_el_read_char(EditLine *editline, CHAR_T_LIBEDIT *cp)
}
res = ast_poll(fds, max, -1);
if (res < 0) {
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
if (sig_flags.need_quit || sig_flags.need_quit_handler || sig_flags.need_el_end) {
break;
}
if (errno == EINTR) {
@ -3163,7 +3163,7 @@ static void ast_remotecontrol(char *data)
sprintf(tmp, "%s%s", prefix, data);
if (write(ast_consock, tmp, strlen(tmp) + 1) < 0) {
ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno));
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
if (sig_flags.need_quit || sig_flags.need_quit_handler || sig_flags.need_el_end) {
return;
}
}
@ -3195,7 +3195,7 @@ static void ast_remotecontrol(char *data)
char buffer[512] = "", *curline = buffer, *nextline;
int not_written = 1;
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
if (sig_flags.need_quit || sig_flags.need_quit_handler || sig_flags.need_el_end) {
break;
}
@ -3255,7 +3255,7 @@ static void ast_remotecontrol(char *data)
for (;;) {
ebuf = (char *)el_gets(el, &num);
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
if (sig_flags.need_quit || sig_flags.need_quit_handler || sig_flags.need_el_end) {
break;
}
@ -4198,6 +4198,12 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
el_set(el, EL_GETCFN, ast_el_read_char);
for (;;) {
if (sig_flags.need_el_end) {
el_end(el);
return;
}
if (sig_flags.need_quit || sig_flags.need_quit_handler) {
quit_handler(0, SHUTDOWN_FAST, 0);
break;

4
main/options.c
View File

@ -322,7 +322,9 @@ void load_asterisk_conf(void)
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET);
/* Run as console (-c at startup, implies nofork) */
} else if (!strcasecmp(v->name, "console")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE);
if (!ast_opt_remote) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_NO_FORK | AST_OPT_FLAG_CONSOLE);
}
/* Run with high priority if the O/S permits (-p at startup) */
} else if (!strcasecmp(v->name, "highpriority")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY);