diff options
| author | Sverker Eriksson <[email protected]> | 2016-08-10 15:38:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-08-10 15:38:57 +0200 |
| commit | 92f8a2f36505ac507ebc153a7d45b2e1c866c13a (patch) | |
| tree | b0f38b4fa5dd3b9736f18d1a70ccfc793c145973 /erts/etc | |
| parent | 1db9e32445dc368c6073e3b412567d81a2b5eeb2 (diff) | |
| parent | 7f86a0fedf5a18d82817ceb530aae0f8167c9354 (diff) | |
| download | otp-92f8a2f36505ac507ebc153a7d45b2e1c866c13a.tar.gz otp-92f8a2f36505ac507ebc153a7d45b2e1c866c13a.tar.bz2 otp-92f8a2f36505ac507ebc153a7d45b2e1c866c13a.zip | |
Merge branch 'sverker/run_erl-pty-race/OTP-13795' into maint
Diffstat (limited to 'erts/etc')
| -rw-r--r-- | erts/etc/unix/run_erl.c | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index 30210ac172..6a92e18648 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -240,6 +240,7 @@ int main(int argc, char **argv) int off_argv; int calculated_pipename = 0; int highest_pipe_num = 0; + int sleepy_child = 0; program_name = argv[0]; @@ -250,6 +251,11 @@ int main(int argc, char **argv) init_outbuf(); + if (!strcmp(argv[1],"-sleepy-child")) { /* For test purpose only */ + sleepy_child = 1; + ++i; + } + if (!strcmp(argv[1],"-daemon")) { daemon_init(); ++i; @@ -392,6 +398,9 @@ int main(int argc, char **argv) exit(1); } if (childpid == 0) { + if (sleepy_child) + sleep(1); + /* Child */ sf_close(mfd); /* disassociate from control terminal */ @@ -904,20 +913,32 @@ static int create_fifo(char *name, int perm) * Find a master device, open and return fd and slave device name. */ +#ifdef HAVE_WORKING_POSIX_OPENPT + /* + * Use openpty() on OpenBSD even if we have posix_openpt() + * as there is a race when read from master pty returns 0 + * if child has not yet opened slave pty. + * (maybe other BSD's have the same problem?) + */ +# if !(defined(__OpenBSD__) && defined(HAVE_OPENPTY)) +# define TRY_POSIX_OPENPT +# endif +#endif + static int open_pty_master(char **ptyslave, int *sfdp) { int mfd; /* Use the posix_openpt if working, as this guarantees creation of the slave device properly. */ -#if defined(HAVE_WORKING_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4)) -# ifdef HAVE_WORKING_POSIX_OPENPT - if ((mfd = posix_openpt(O_RDWR)) >= 0) { +#if defined(TRY_POSIX_OPENPT) || (defined(__sun) && defined(__SVR4)) +# ifdef TRY_POSIX_OPENPT + mfd = posix_openpt(O_RDWR); # elif defined(__sun) && defined(__SVR4) mfd = sf_open("/dev/ptmx", O_RDWR, 0); +# endif if (mfd >= 0) { -# endif if ((*ptyslave = ptsname(mfd)) != NULL && grantpt(mfd) == 0 && unlockpt(mfd) == 0) { |