Xinqi Bao's Git
projects
/
dwm.git
/ diff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (parent:
6475be9
)
if stdin writer stops working, dwm consumed much IO load because it still tried to...
author
Anselm R. Garbe <
[email protected]
>
Fri, 14 Jul 2006 15:30:37 +0000
(17:30 +0200)
committer
Anselm R. Garbe <
[email protected]
>
Fri, 14 Jul 2006 15:30:37 +0000
(17:30 +0200)
main.c
diff
|
blob
|
history
diff --git
a/main.c
b/main.c
index
42c9d8a
..
b59ff96
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-190,6
+190,7
@@
main(int argc, char *argv[])
fd_set rd;
XSetWindowAttributes wa;
unsigned int mask;
fd_set rd;
XSetWindowAttributes wa;
unsigned int mask;
+ Bool readstdin = True;
Window w;
XEvent ev;
Window w;
XEvent ev;
@@
-283,7
+284,8
@@
main(int argc, char *argv[])
Mainloop:
while(running) {
FD_ZERO(&rd);
Mainloop:
while(running) {
FD_ZERO(&rd);
- FD_SET(STDIN_FILENO, &rd);
+ if(readstdin)
+ FD_SET(STDIN_FILENO, &rd);
FD_SET(ConnectionNumber(dpy), &rd);
i = select(ConnectionNumber(dpy) + 1, &rd, 0, 0, 0);
FD_SET(ConnectionNumber(dpy), &rd);
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;
for(;;) {
if((i = getchar()) == EOF) {
i = n = 0;
for(;;) {
if((i = getchar()) == EOF) {
- stext[0] = 0;
+ /* broken pipe/end of producer */
+ readstdin = False;
+ strcpy(stext, "broken pipe");
goto Mainloop;
}
if(i == '\n' || n >= sizeof(stext) - 1)
goto Mainloop;
}
if(i == '\n' || n >= sizeof(stext) - 1)