@@ -263,6 +263,9 @@ void ShubInitialize(Shub* shub, ShubParams* params)
263263shub -> output = -1 ;
264264#ifdef USE_EPOLL
265265shub -> epollfd = epoll_create (MAX_EVENTS );
266+ if (shub -> epollfd < 0 ) {
267+ shub -> params -> error_handler ("Failed to create epoll" ,SHUB_FATAL_ERROR );
268+ }
266269#else
267270FD_ZERO (& shub -> inset );
268271shub -> max_fd = 0 ;
@@ -299,14 +302,15 @@ void ShubLoop(Shub* shub)
299302int i ,rc ;
300303#ifdef USE_EPOLL
301304struct epoll_event events [MAX_EVENTS ];
302- rc = epoll_wait (shub -> epollfd ,events ,MAX_EVENTS ,shub -> params -> delay );
305+ rc = epoll_wait (shub -> epollfd ,events ,MAX_EVENTS ,shub -> in_buffer_used == 0 ? -1 : shub -> params -> delay );
303306#else
304307fd_set events ;
305308struct timeval tm ;
306309int max_fd = shub -> max_fd ;
307310
308311tm .tv_sec = shub -> params -> delay /1000 ;
309312tm .tv_usec = shub -> params -> delay %1000 * 1000 ;
313+ events = shub -> inset ;
310314
311315rc = select (max_fd + 1 ,& events ,NULL ,NULL ,shub -> in_buffer_used == 0 ?NULL :& tm );
312316#endif
@@ -320,8 +324,14 @@ void ShubLoop(Shub* shub)
320324#ifdef USE_EPOLL
321325int j ;
322326for (j = 0 ;j < rc ;j ++ ) {
323- {
324- i = events [j ].data .fd ;
327+ i = events [j ].data .fd ;
328+ fprintf (stderr ,"events[j].events=%d, events[j].data.fd=%d\n" ,events [j ].events ,events [j ].data .fd );
329+ if (events [j ].events & EPOLLERR ) {
330+ if (i != shub -> input && i != shub -> output ) {
331+ notify_disconnect (shub ,i );
332+ }
333+ close_socket (shub ,i );
334+ }else if (events [j ].events & EPOLLIN ) {
325335#else
326336for (i = 0 ;i <=max_fd ;i ++ ) {
327337if (FD_ISSET (i ,& events )) {
@@ -331,7 +341,7 @@ void ShubLoop(Shub* shub)
331341if (s < 0 ) {
332342shub -> params -> error_handler ("Failed to accept socket" ,SHUB_RECOVERABLE_ERROR );
333343 }else {
334- ShubAddSocket (shub ,i );
344+ ShubAddSocket (shub ,s );
335345 }
336346 }else if (i == shub -> output ) {/* receive response from server */
337347/* try to read as much as possible */