steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: don't mask SIGTTIN from stdin_loop 

Fixes #360
db4
Joe Groff 2011-11-07 22:19:18 -08:00
parent ed24890dce
commit 5f811c0573
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vm/os-unix.cpp
View File

@ -407,18 +407,15 @@ void *stdin_loop(void *arg)
unsigned char buf[4096]; unsigned char buf[4096];
bool loop_running = true; bool loop_running = true;
// If we fep, the parent thread will grab a mutex and send us SIGUSR2 to make
// us relinquish our hold on stdin.
sigset_t mask; sigset_t mask;
sigfillset(&mask); sigfillset(&mask);
sigdelset(&mask, SIGUSR2); sigdelset(&mask, SIGUSR2);
sigdelset(&mask, SIGTTIN);
pthread_sigmask(SIG_SETMASK, &mask, NULL); pthread_sigmask(SIG_SETMASK, &mask, NULL);
while(loop_running) while(loop_running)
{ {
bool readp = safe_read(control_read,buf,1); if(!safe_read(control_read,buf,1))
if(!readp)
break; break;
if(buf[0] != 'X') if(buf[0] != 'X')
@ -426,6 +423,8 @@ void *stdin_loop(void *arg)
for(;;) for(;;)
{ {
// If we fep, the parent thread will grab stdin_mutex and send us
// SIGUSR2 to interrupt the read() call.
pthread_mutex_lock(&stdin_mutex); pthread_mutex_lock(&stdin_mutex);
pthread_mutex_unlock(&stdin_mutex); pthread_mutex_unlock(&stdin_mutex);
ssize_t bytes = read(0,buf,sizeof(buf)); ssize_t bytes = read(0,buf,sizeof(buf));