suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

subprocess: allocate for environment variables before fork

Browse Source 
I'm running into stuck processes via `subprocess`, where the stuck
process is in malloc() for environment variables. I'm not really sure
of the problem, but moving that work before the fork() could
avoid problems related to pages or signal handlers.
This commit is contained in:
Matthew Flatt 2014-03-09 20:56:11 -06:00
parent 4476e36705
commit 5deac9ef2b
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
racket/src/racket/src/port.c
View File

@ -9575,6 +9575,7 @@ static Scheme_Object *subprocess(int c, Scheme_Object *args[])
int fork_errno = 0;
char *env;
int need_free;
Scheme_Object *current_dir;
#else
void *sc = 0;
#endif
@ -9842,6 +9843,17 @@ static Scheme_Object *subprocess(int c, Scheme_Object *args[])
/*--------------------------------------*/
{
/* Prepare CWD and environment variables */
Scheme_Object *envvar;
Scheme_Config *config;
config = scheme_current_config();
envvar = scheme_get_param(config, MZCONFIG_CURRENT_ENV_VARS);
env = scheme_environment_variables_to_block(envvar, &need_free);
current_dir = scheme_get_param(config, MZCONFIG_CURRENT_DIRECTORY);
#if !defined(MZ_PLACES_WAITPID)
init_sigchld();
@ -9997,21 +10009,10 @@ static Scheme_Object *subprocess(int c, Scheme_Object *args[])
#endif
}
/* Set real CWD and get envrionment variables */
{
Scheme_Object *dir, *envvar;
Scheme_Config *config;
config = scheme_current_config();
envvar = scheme_get_param(config, MZCONFIG_CURRENT_ENV_VARS);
env = scheme_environment_variables_to_block(envvar, &need_free);
dir = scheme_get_param(config, MZCONFIG_CURRENT_DIRECTORY);
if (!scheme_os_setcwd(SCHEME_PATH_VAL(dir), 1)) {
scheme_console_printf("racket: chdir failed to: %s\n", SCHEME_BYTE_STR_VAL(dir));
_exit(1);
}
/* Set real CWD: */
if (!scheme_os_setcwd(SCHEME_PATH_VAL(current_dir), 1)) {
scheme_console_printf("racket: chdir failed to: %s\n", SCHEME_BYTE_STR_VAL(current_dir));
_exit(1);
}
/* Exec new process */