if stdin writer stops working, dwm consumed much IO load because it still tried to select on this fd, fixed
This commit is contained in:
		
							parent
							
								
									6475be926b
								
							
						
					
					
						commit
						5b44976a2d
					
				
							
								
								
									
										8
									
								
								main.c
								
								
								
								
							
							
						
						
									
										8
									
								
								main.c
								
								
								
								
							| 
						 | 
					@ -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,6 +284,7 @@ main(int argc, char *argv[])
 | 
				
			||||||
Mainloop:
 | 
					Mainloop:
 | 
				
			||||||
	while(running) {
 | 
						while(running) {
 | 
				
			||||||
		FD_ZERO(&rd);
 | 
							FD_ZERO(&rd);
 | 
				
			||||||
 | 
							if(readstdin)
 | 
				
			||||||
			FD_SET(STDIN_FILENO, &rd);
 | 
								FD_SET(STDIN_FILENO, &rd);
 | 
				
			||||||
		FD_SET(ConnectionNumber(dpy), &rd);
 | 
							FD_SET(ConnectionNumber(dpy), &rd);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue