null+****@clear*****
null+****@clear*****
2010年 6月 13日 (日) 18:10:38 JST
Daijiro MORI 2010-06-13 09:10:38 +0000 (Sun, 13 Jun 2010)
New Revision: 49a6049d1970ae6a4ccd4cf5b1d67f5da9d5edc1
Log:
Don't report error when GRN_INTERRUPTED_FUNCTION_CALL occured in grn_com_event_poll().
Modified files:
lib/com.c
Modified: lib/com.c (+5 -2)
===================================================================
--- lib/com.c 2010-06-13 08:46:24 +0000 (b662c0d)
+++ lib/com.c 2010-06-13 09:10:38 +0000 (f95e3e8)
@@ -537,8 +537,11 @@ grn_com_event_poll(grn_ctx *ctx, grn_com_event *ev, int timeout)
#endif /* USE_KQUEUE */
#endif /* USE_EPOLL */
if (nevents < 0) {
- SERR("poll");
- if (ctx->rc == GRN_INTERRUPTED_FUNCTION_CALL) { ERRCLR(ctx); }
+ if (ctx->rc == GRN_INTERRUPTED_FUNCTION_CALL) {
+ ERRCLR(ctx);
+ } else {
+ SERR("poll");
+ }
return ctx->rc;
}
if (timeout < 0 && !nevents) { GRN_LOG(ctx, GRN_LOG_NOTICE, "poll returns 0 events"); }