2 Commits

Author SHA1 Message Date
wangyu-
b006b651c8 fix get_current_time 2017-11-24 11:16:08 -06:00
wangyu-
08f2b5d405 ignore EINTR 2017-11-24 00:28:47 -06:00
2 changed files with 12 additions and 3 deletions

View File

@@ -23,7 +23,7 @@ u64_t get_current_time()
{
timespec tmp_time;
clock_gettime(CLOCK_MONOTONIC, &tmp_time);
return tmp_time.tv_sec*1000+tmp_time.tv_nsec/(1000*1000l);
return ((u64_t)tmp_time.tv_sec)*1000llu+((u64_t)tmp_time.tv_nsec)/(1000*1000llu);
}
u64_t get_current_time_us()

View File

@@ -705,8 +705,17 @@ int event_loop()
int nfds = epoll_wait(epollfd, events, max_events, 180 * 1000); //3mins
if (nfds < 0)
{
mylog(log_fatal,"epoll_wait return %d\n", nfds);
myexit(-1);
if(errno==EINTR )
{
mylog(log_info,"epoll interrupted by signal,continue\n");
//myexit(0);
}
else
{
mylog(log_fatal,"epoll_wait return %d,%s\n", nfds,strerror(errno));
myexit(-1);
}
}
int n;
int clear_triggered=0;