kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 08:29:45 +00:00
Code Issues Projects Releases Wiki Activity

the threaded one seems to not work using only fork

Browse Source
This commit is contained in:
Anthony Minessale 2011-12-20 13:49:15 -06:00
parent 6824871df0
commit 0f6a2bf863
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/switch_core.h
View File

@ -2304,7 +2304,7 @@ SWITCH_DECLARE(void) switch_say_file_handle_destroy(switch_say_file_handle_t **s
SWITCH_DECLARE(switch_status_t) switch_say_file_handle_create(switch_say_file_handle_t **sh, const char *ext, switch_event_t **var_event); SWITCH_DECLARE(switch_status_t) switch_say_file_handle_create(switch_say_file_handle_t **sh, const char *ext, switch_event_t **var_event);
SWITCH_DECLARE(void) switch_say_file(switch_say_file_handle_t *sh, const char *fmt, ...); SWITCH_DECLARE(void) switch_say_file(switch_say_file_handle_t *sh, const char *fmt, ...);
SWITCH_DECLARE(int) switch_max_file_desc(void); SWITCH_DECLARE(int) switch_max_file_desc(void);
SWITCH_DECLARE(void) switch_close_extra_files(void); SWITCH_DECLARE(void) switch_close_extra_files(int *keep, int keep_ttl);
SWITCH_END_EXTERN_C SWITCH_END_EXTERN_C
#endif #endif

30
src/switch_core.c
View File

@ -2421,13 +2421,26 @@ SWITCH_DECLARE(int) switch_max_file_desc(void)
} }
SWITCH_DECLARE(void) switch_close_extra_files(void) SWITCH_DECLARE(void) switch_close_extra_files(int *keep, int keep_ttl)
{ {
int open_max = switch_max_file_desc(); int open_max = switch_max_file_desc();
int i; int i, j;
for (i = 3; i < open_max; i++) { for (i = 3; i < open_max; i++) {
if (keep) {
for (j = 0; j < keep_ttl; j++) {
if (i == keep[j]) {
goto skip;
}
}
}
close(i); close(i);
skip:
continue;
} }
} }
@ -2456,7 +2469,7 @@ static int switch_system_fork(const char *cmd, switch_bool_t wait)
} }
free(dcmd); free(dcmd);
} else { } else {
switch_close_extra_files(); switch_close_extra_files(NULL, 0);
set_low_priority(); set_low_priority();
system(dcmd); system(dcmd);
@ -2508,7 +2521,7 @@ SWITCH_DECLARE(int) switch_stream_system_fork(const char *cmd, switch_stream_han
close(fds[0]); close(fds[0]);
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
} else { /* child */ } else { /* child */
switch_close_extra_files(); switch_close_extra_files(fds, 2);
close(fds[0]); close(fds[0]);
dup2(fds[1], STDOUT_FILENO); dup2(fds[1], STDOUT_FILENO);
switch_system(cmd, SWITCH_TRUE); switch_system(cmd, SWITCH_TRUE);
@ -2525,6 +2538,7 @@ SWITCH_DECLARE(int) switch_stream_system_fork(const char *cmd, switch_stream_han
} }
<<<<<<< HEAD
#ifndef WIN32 #ifndef WIN32
static int switch_stream_system_thread(const char *cmd, switch_stream_handle_t *stream) static int switch_stream_system_thread(const char *cmd, switch_stream_handle_t *stream)
{ {
@ -2584,17 +2598,15 @@ static int switch_stream_system_thread(const char *cmd, switch_stream_handle_t *
} }
#endif #endif
=======
>>>>>>> the threaded one seems to not work using only fork
SWITCH_DECLARE(int) switch_stream_system(const char *cmd, switch_stream_handle_t *stream) SWITCH_DECLARE(int) switch_stream_system(const char *cmd, switch_stream_handle_t *stream)
{ {
#ifdef WIN32 #ifdef WIN32
stream->write_function(stream, "Capturing output not supported.\n"); stream->write_function(stream, "Capturing output not supported.\n");
return switch_system(cmd, SWITCH_TRUE); return switch_system(cmd, SWITCH_TRUE);
#else #else
int (*sys_p)(const char *cmd, switch_stream_handle_t *stream); return switch_stream_system_fork(cmd, stream);
sys_p = switch_test_flag((&runtime), SCF_THREADED_SYSTEM_EXEC) ? switch_stream_system_thread : switch_stream_system_fork;
return sys_p(cmd, stream);
#endif #endif
} }

2
src/switch_xml.c
View File

@ -1256,7 +1256,7 @@ static int preprocess_exec(const char *cwd, const char *command, int write_fd, i
close(fds[0]); close(fds[0]);
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
} else { /* child */ } else { /* child */
switch_close_extra_files(); switch_close_extra_files(fds, 2);
close(fds[0]); close(fds[0]);
dup2(fds[1], STDOUT_FILENO); dup2(fds[1], STDOUT_FILENO);
switch_system(command, SWITCH_TRUE); switch_system(command, SWITCH_TRUE);