suckless/dwm
suckless/dwm
1
0
Fork 0
Code Wiki Activity

if stdin writer stops working, dwm consumed much IO load because it still tried to select on this fd, fixed

Browse source
This commit is contained in:
Anselm R. Garbe 2006-07-14 17:30:37 +02:00
parent 6475be926b
commit 5b44976a2d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main.c
View file

@ -190,6 +190,7 @@ main(int argc, char *argv[])
fd_set rd; fd_set rd;
XSetWindowAttributes wa; XSetWindowAttributes wa;
unsigned int mask; unsigned int mask;
Bool readstdin = True;
Window w; Window w;
XEvent ev; XEvent ev;
@ -283,7 +284,8 @@ main(int argc, char *argv[])
Mainloop: Mainloop:
while(running) { while(running) {
FD_ZERO(&rd); FD_ZERO(&rd);
FD_SET(STDIN_FILENO, &rd); if(readstdin)
FD_SET(STDIN_FILENO, &rd);
FD_SET(ConnectionNumber(dpy), &rd); FD_SET(ConnectionNumber(dpy), &rd);
i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0); i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
@ -299,11 +301,13 @@ Mainloop:
(handler[ev.type])(&ev); /* call handler */ (handler[ev.type])(&ev); /* call handler */
} }
} }
if(FD_ISSET(STDIN_FILENO, &rd)) { if(readstdin && FD_ISSET(STDIN_FILENO, &rd)) {
i = n = 0; i = n = 0;
for(;;) { for(;;) {
if((i = getchar()) == EOF) { if((i = getchar()) == EOF) {
stext[0] = 0; /* broken pipe/end of producer */
readstdin = False;
strcpy(stext, "broken pipe");
goto Mainloop; goto Mainloop;
} }
if(i == '\n' || n >= sizeof(stext) - 1) if(i == '\n' || n >= sizeof(stext) - 1)