🐛 fix exten time

Chunyu-Hugh · Jun 25, 2020 · f578366 · f578366
1 parent 5e2a074
commit f578366
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/code/server/webserver.cpp b/code/server/webserver.cpp
@@ -300,14 +300,14 @@ void WebServer::DealListen_() {
     }
 }
 
-bool WebServer::ExtentTime_(HttpConn* client) {
+void WebServer::ExtentTime_(HttpConn* client) {
     LOG_INFO("Extent client[%d] time", client->GetFd());
-    return timer_->adjust(client, time(nullptr) + 3 * TIME_SLOT);
+    timer_->adjust(client, time(nullptr) + 3 * TIME_SLOT);
 }
 
 void WebServer::DealRead_(int fd) {
+    ExtentTime_(&users_[fd]);
     if(isReactor_) {
-        threadpool_->addTask(ExtentTime_, &users_[fd]);
         threadpool_->addTask(ReadCallback, &users_[fd]);
     } else {
         ExtentTime_(&users_[fd]);
@@ -318,7 +318,6 @@ void WebServer::DealRead_(int fd) {
 void WebServer::DealWrite_(int fd) {
     ExtentTime_(&users_[fd]);
     if(isReactor_) {
-        threadpool_->addTask(ExtentTime_, &users_[fd]);
         threadpool_->addTask(WriteCallback, &users_[fd]);
     } else {
         users_[fd].write();

diff --git a/code/server/webserver.h b/code/server/webserver.h
@@ -69,9 +69,8 @@ class WebServer {
     void DealRead_(int fd);
 
     void SendError_(int fd, const char*info);
-    bool ExtentTime_(HttpConn* client);
-
 
+    void ExtentTime_(HttpConn* client);
     static void ReadCallback(HttpConn* client);
     static void WriteCallback(HttpConn* client);
     static void SetSignal(int sig, void(handler)(int), bool restart = true);

diff --git a/code/timer/heaptimer.cpp b/code/timer/heaptimer.cpp
@@ -72,11 +72,10 @@ void HeapTimer::del(HttpConn* node) {
     hash_.erase(node);
 }
 
-bool HeapTimer::adjust(HttpConn* node, time_t newExpires) {
+void HeapTimer::adjust(HttpConn* node, time_t newExpires) {
     assert(hash_.count(node) > 0);
     node->SetExpires(newExpires);
     siftdown_(hash_[node], heap_.size());
-    return true;
 }
 
 void HeapTimer::tick() {

diff --git a/code/timer/heaptimer.h b/code/timer/heaptimer.h
@@ -22,7 +22,7 @@ class HeapTimer {
 
     ~HeapTimer() { clear(); }
 
-    bool adjust(HttpConn* node, time_t newExpires);
+    void adjust(HttpConn* node, time_t newExpires);
 
     void add(HttpConn* node, time_t timeSlot);