kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 04:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joshua Colp
2018-11-14 07:06:38 -06:00
committed by Gerrit Code Review
parent dbfc5ae020 194e40122a
commit 9e151413db
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/asterisk.c
View File

@@ -392,6 +392,7 @@ static struct {
unsigned int need_reload:1; unsigned int need_reload:1;
unsigned int need_quit:1; unsigned int need_quit:1;
unsigned int need_quit_handler:1; unsigned int need_quit_handler:1;
unsigned int need_el_end:1;
} sig_flags; } sig_flags;
#if !defined(LOW_MEMORY) #if !defined(LOW_MEMORY)
@@ -2018,10 +2019,9 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
if (el_hist != NULL) { if (el_hist != NULL) {
history_end(el_hist); history_end(el_hist);
} }
} else if (mon_sig_flags == pthread_self()) { } else {
if (consolethread != AST_PTHREADT_NULL) { sig_flags.need_el_end = 1;
pthread_kill(consolethread, SIGURG); pthread_kill(consolethread, SIGURG);
}
} }
} }
active_channels = ast_active_channels(); active_channels = ast_active_channels();
@@ -2638,7 +2638,7 @@ static int ast_el_read_char(EditLine *editline, CHAR_T_LIBEDIT *cp)
} }
res = ast_poll(fds, max, -1); res = ast_poll(fds, max, -1);
if (res < 0) { 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; break;
} }
if (errno == EINTR) { if (errno == EINTR) {
@@ -3166,7 +3166,7 @@ static void ast_remotecontrol(char *data)
sprintf(tmp, "%s%s", prefix, data); sprintf(tmp, "%s%s", prefix, data);
if (write(ast_consock, tmp, strlen(tmp) + 1) < 0) { if (write(ast_consock, tmp, strlen(tmp) + 1) < 0) {
ast_log(LOG_ERROR, "write() failed: %s\n", strerror(errno)); 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; return;
} }
} }
@@ -3198,7 +3198,7 @@ static void ast_remotecontrol(char *data)
char buffer[512] = "", *curline = buffer, *nextline; char buffer[512] = "", *curline = buffer, *nextline;
int not_written = 1; 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; break;
} }
@@ -3258,7 +3258,7 @@ static void ast_remotecontrol(char *data)
for (;;) { for (;;) {
ebuf = (char *)el_gets(el, &num); 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; break;
} }
@@ -4201,6 +4201,12 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
el_set(el, EL_GETCFN, ast_el_read_char); el_set(el, EL_GETCFN, ast_el_read_char);
for (;;) { for (;;) {
if (sig_flags.need_el_end) {
el_end(el);
return;
}
if (sig_flags.need_quit || sig_flags.need_quit_handler) { if (sig_flags.need_quit || sig_flags.need_quit_handler) {
quit_handler(0, SHUTDOWN_FAST, 0); quit_handler(0, SHUTDOWN_FAST, 0);
break; 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); ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_QUIET);
/* Run as console (-c at startup, implies nofork) */ /* Run as console (-c at startup, implies nofork) */
} else if (!strcasecmp(v->name, "console")) { } 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) */ /* Run with high priority if the O/S permits (-p at startup) */
} else if (!strcasecmp(v->name, "highpriority")) { } else if (!strcasecmp(v->name, "highpriority")) {
ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY); ast_set2_flag(&ast_options, ast_true(v->value), AST_OPT_FLAG_HIGH_PRIORITY);