瀏覽代碼

optimize code

hewei.it 4 年之前
父節點
當前提交
0e1ddd5c38
共有 5 個文件被更改,包括 7 次插入6 次删除
  1. 1 0
      base/hsocket.c
  2. 2 2
      event/hevent.c
  3. 2 1
      event/hloop.h
  4. 1 2
      http/client/AsyncHttpClient.cpp
  5. 1 1
      http/server/HttpService.h

+ 1 - 0
base/hsocket.c

@@ -105,6 +105,7 @@ int sockaddr_set_ipport(sockaddr_u* addr, const char* host, int port) {
     int ret = sockaddr_set_ip(addr, host);
     if (ret != 0) return ret;
     sockaddr_set_port(addr, port);
+    // SOCKADDR_PRINT(addr);
     return 0;
 }
 

+ 2 - 2
event/hevent.c

@@ -181,8 +181,8 @@ void hio_set_heartbeat(hio_t* io, int interval_ms, hio_send_heartbeat_fn fn) {
             htimer_del(io->heartbeat_timer);
             io->heartbeat_timer = NULL;
         } else {
-            ((struct htimeout_s*)io->heartbeat_fn)->timeout = interval_ms;
-            htimer_reset(io->keepalive_timer);
+            ((struct htimeout_s*)io->heartbeat_timer)->timeout = interval_ms;
+            htimer_reset(io->heartbeat_timer);
         }
     } else {
         io->heartbeat_timer = htimer_add(io->loop, __heartbeat_timer_cb, interval_ms, INFINITE);

+ 2 - 1
event/hloop.h

@@ -265,9 +265,10 @@ HV_EXPORT int hio_read   (hio_t* io);
 // NOTE: hio_write is thread-safe, locked by recursive_mutex, allow to be called by other threads.
 // hio_try_write => hio_add(io, HV_WRITE) => write => hwrite_cb
 HV_EXPORT int hio_write  (hio_t* io, const void* buf, size_t len);
-// NOTE: hio_close is thread-safe, if called by other thread, hloop_post_event(hio_close_event).
+// NOTE: hio_close is thread-safe, hio_close_async will be called actually in other thread.
 // hio_del(io, HV_RDWR) => close => hclose_cb
 HV_EXPORT int hio_close  (hio_t* io);
+// NOTE: hloop_post_event(hio_close_event)
 HV_EXPORT int hio_close_async(hio_t* io);
 
 //------------------high-level apis-------------------------------------------

+ 1 - 2
http/client/AsyncHttpClient.cpp

@@ -147,8 +147,7 @@ int AsyncHttpClient::sendRequest(const SocketChannelPtr& channel) {
     char* data = NULL;
     size_t len = 0;
     while (ctx->parser->GetSendData(&data, &len)) {
-        Buffer buf(data, len);
-        channel->write(&buf);
+        channel->write(data, len);
     }
     channel->startRead();
 

+ 1 - 1
http/server/HttpService.h

@@ -38,7 +38,7 @@ struct http_method_handler {
         async_handler = std::move(a);
     }
 };
-// method => http_sync_handler
+// method => http_method_handler
 typedef std::list<http_method_handler>                                  http_method_handlers;
 // path => http_method_handlers
 typedef std::map<std::string, std::shared_ptr<http_method_handlers>>    http_api_handlers;