From 74b004b3f130850557e26c1e1272673615b5596b Mon Sep 17 00:00:00 2001 From: starrybeam Date: Sun, 7 May 2017 11:03:42 +0800 Subject: [PATCH] Update ioloop.cpp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 如果当前没有超时的timer,下一个即将超时的timer是500ms,此前的短代码需要等待1000ms --- src/algorithm/ioloop.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/algorithm/ioloop.cpp b/src/algorithm/ioloop.cpp index 29a9d23d9..e6c8e30ae 100644 --- a/src/algorithm/ioloop.cpp +++ b/src/algorithm/ioloop.cpp @@ -263,9 +263,15 @@ void IOLoop :: DealwithTimeout(int & iNextTimeout) { DealwithTimeoutOne(iTimerID, iType); - iNextTimeout = m_oTimer.GetNextTimeout(); - if (iNextTimeout != 0) + } else { + int tmp = 0; + tmp = m_oTimer.GetNextTimeout(); + + if (tmp != 0) { + if (tmp != -1) { + iNextTimeout = tmp; + } break; } }