ithewei 2 роки тому
батько
коміт
d54b118a70
3 змінених файлів з 7 додано та 4 видалено
  1. 3 1
      event/hloop.c
  2. 3 2
      event/nio.c
  3. 1 1
      http/server/HttpHandler.cpp

+ 3 - 1
event/hloop.c

@@ -193,7 +193,9 @@ static void hloop_stat_timer_cb(htimer_t* timer) {
     hloop_t* loop = timer->loop;
     hloop_t* loop = timer->loop;
     // hlog_set_level(LOG_LEVEL_DEBUG);
     // hlog_set_level(LOG_LEVEL_DEBUG);
     hlogd("[loop] pid=%ld tid=%ld uptime=%lluus cnt=%llu nactives=%u nios=%u ntimers=%u nidles=%u",
     hlogd("[loop] pid=%ld tid=%ld uptime=%lluus cnt=%llu nactives=%u nios=%u ntimers=%u nidles=%u",
-        loop->pid, loop->tid, loop->cur_hrtime - loop->start_hrtime, loop->loop_cnt,
+        loop->pid, loop->tid,
+        (unsigned long long)loop->cur_hrtime - loop->start_hrtime,
+        (unsigned long long)loop->loop_cnt,
         loop->nactives, loop->nios, loop->ntimers, loop->nidles);
         loop->nactives, loop->nios, loop->ntimers, loop->nidles);
 }
 }
 
 

+ 3 - 2
event/nio.c

@@ -533,8 +533,9 @@ enqueue:
         write_queue_push_back(&io->write_queue, &remain);
         write_queue_push_back(&io->write_queue, &remain);
         io->write_bufsize += remain.len;
         io->write_bufsize += remain.len;
         if (io->write_bufsize > WRITE_BUFSIZE_HIGH_WATER) {
         if (io->write_bufsize > WRITE_BUFSIZE_HIGH_WATER) {
-            hlogw("write len=%d enqueue %u, bufsize=%u over high water %u",
-                len, (unsigned int)(remain.len - remain.offset),
+            hlogw("write len=%u enqueue %u, bufsize=%u over high water %u",
+                (unsigned int)len,
+                (unsigned int)(remain.len - remain.offset),
                 (unsigned int)io->write_bufsize,
                 (unsigned int)io->write_bufsize,
                 (unsigned int)WRITE_BUFSIZE_HIGH_WATER);
                 (unsigned int)WRITE_BUFSIZE_HIGH_WATER);
         }
         }

+ 1 - 1
http/server/HttpHandler.cpp

@@ -897,7 +897,7 @@ int HttpHandler::handleUpgrade(const char* upgrade_protocol) {
         return upgradeHTTP2();
         return upgradeHTTP2();
     }
     }
 
 
-    hloge("[%s:%d] unsupported Upgrade: %s", upgrade_protocol);
+    hloge("[%s:%d] unsupported Upgrade: %s", ip, port, upgrade_protocol);
     return SetError(ERR_INVALID_PROTOCOL);
     return SetError(ERR_INVALID_PROTOCOL);
 }
 }