Merge pull request markparticle#18 from markparticle/dev_mark

Dev mark
bushizhe · Jun 29, 2020 · 629fe4c · 629fe4c
2 parents 22dacaf + c2651b0
commit 629fe4c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/buffer/buffer.cpp b/code/buffer/buffer.cpp
@@ -93,7 +93,7 @@ ssize_t Buffer::ReadFd(int fd, int* saveErrno) {
     iov[1].iov_base = buff;
     iov[1].iov_len = sizeof(buff);
 
-    const int len = readv(fd, iov, 2);
+    const ssize_t len = readv(fd, iov, 2);
     if(len < 0) {
         *saveErrno = errno;
     }

diff --git a/code/server/webserver.cpp b/code/server/webserver.cpp
@@ -82,7 +82,7 @@ void WebServer::InitEventMode_(int trigMode) {
 }
 
 void WebServer::Start() {
-    int timeMS = -1;
+    int timeMS = -1;  /* epoll wait timeout == -1 无事件将阻塞 */
     if(!isClose_) { LOG_INFO("========== Server start =========="); }
     while(!isClose_) {
         if(timeoutMS_ > 0) {