Update trantor version to v1.0.0-rc7

an-tao · an-tao · commit 5c06e068185f · 2019-11-21T10:56:04.000+08:00
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-rc7] - 2019-11-21
+
+### Changed
+
+- Modify some code styles
+
 ## [1.0.0-rc6] - 2019-10-4
 
 ### API change list
@@ -67,7 +73,9 @@ All notable changes to this project will be documented in this file.
 
 ## [1.0.0-rc1] - 2019-06-11
 
-[Unreleased]: https://github.com/an-tao/trantor/compare/v1.0.0-rc6...HEAD
+[Unreleased]: https://github.com/an-tao/trantor/compare/v1.0.0-rc7...HEAD
+
+[1.0.0-rc6]: https://github.com/an-tao/trantor/compare/v1.0.0-rc6...v1.0.0-rc7
 
 [1.0.0-rc6]: https://github.com/an-tao/trantor/compare/v1.0.0-rc5...v1.0.0-rc6
 
diff --git a/trantor/net/TcpServer.cc b/trantor/net/TcpServer.cc
@@ -131,7 +131,7 @@ void TcpServer::start()
                                                       idleTimeout_ < 500
                                                           ? idleTimeout_ + 1
                                                           : 100);
-                    loopNum--;
+                    --loopNum;
                 }
             }
         }
diff --git a/trantor/net/inner/TcpConnectionImpl.cc b/trantor/net/inner/TcpConnectionImpl.cc
@@ -385,7 +385,7 @@ void TcpConnectionImpl::send(const std::shared_ptr<std::string> &msgPtr)
             loop_->queueInLoop([thisPtr, msgPtr]() {
                 thisPtr->sendInLoop(msgPtr->data(), msgPtr->length());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -397,7 +397,7 @@ void TcpConnectionImpl::send(const std::shared_ptr<std::string> &msgPtr)
         loop_->queueInLoop([thisPtr, msgPtr]() {
             thisPtr->sendInLoop(msgPtr->data(), msgPtr->length());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -418,7 +418,7 @@ void TcpConnectionImpl::send(const char *msg, uint64_t len)
             loop_->queueInLoop([thisPtr, buffer]() {
                 thisPtr->sendInLoop(buffer->data(), buffer->length());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -431,7 +431,7 @@ void TcpConnectionImpl::send(const char *msg, uint64_t len)
         loop_->queueInLoop([thisPtr, buffer]() {
             thisPtr->sendInLoop(buffer->data(), buffer->length());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -451,7 +451,7 @@ void TcpConnectionImpl::send(const std::string &msg)
             loop_->queueInLoop([thisPtr, msg]() {
                 thisPtr->sendInLoop(msg.data(), msg.length());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -463,7 +463,7 @@ void TcpConnectionImpl::send(const std::string &msg)
         loop_->queueInLoop([thisPtr, msg]() {
             thisPtr->sendInLoop(msg.data(), msg.length());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -483,7 +483,7 @@ void TcpConnectionImpl::send(std::string &&msg)
             loop_->queueInLoop([thisPtr, msg = std::move(msg)]() {
                 thisPtr->sendInLoop(msg.data(), msg.length());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -495,7 +495,7 @@ void TcpConnectionImpl::send(std::string &&msg)
         loop_->queueInLoop([thisPtr, msg = std::move(msg)]() {
             thisPtr->sendInLoop(msg.data(), msg.length());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -516,7 +516,7 @@ void TcpConnectionImpl::send(const MsgBuffer &buffer)
             loop_->queueInLoop([thisPtr, buffer]() {
                 thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -528,7 +528,7 @@ void TcpConnectionImpl::send(const MsgBuffer &buffer)
         loop_->queueInLoop([thisPtr, buffer]() {
             thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -549,7 +549,7 @@ void TcpConnectionImpl::send(MsgBuffer &&buffer)
             loop_->queueInLoop([thisPtr, buffer = std::move(buffer)]() {
                 thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             });
         }
     }
@@ -561,7 +561,7 @@ void TcpConnectionImpl::send(MsgBuffer &&buffer)
         loop_->queueInLoop([thisPtr, buffer = std::move(buffer)]() {
             thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());
             std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-            thisPtr->sendNum_--;
+            --thisPtr->sendNum_;
         });
     }
 }
@@ -622,7 +622,7 @@ void TcpConnectionImpl::sendFile(int sfd, size_t offset, size_t length)
                 thisPtr->writeBufferList_.push_back(node);
                 {
                     std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                    thisPtr->sendNum_--;
+                    --thisPtr->sendNum_;
                 }
 
                 if (thisPtr->writeBufferList_.size() == 1)
@@ -643,7 +643,7 @@ void TcpConnectionImpl::sendFile(int sfd, size_t offset, size_t length)
 
             {
                 std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);
-                thisPtr->sendNum_--;
+                --thisPtr->sendNum_;
             }
 
             if (thisPtr->writeBufferList_.size() == 1)
diff --git a/trantor/tests/SSLClientTest.cc b/trantor/tests/SSLClientTest.cc
@@ -37,7 +37,7 @@ int main()
                 else
                 {
                     LOG_DEBUG << i << " disconnected";
-                    connCount--;
+                    --connCount;
                     if (connCount == 0)
                         loop.quit();
                 }
diff --git a/trantor/tests/TcpClientTest.cc b/trantor/tests/TcpClientTest.cc
@@ -36,7 +36,7 @@ int main()
                 else
                 {
                     LOG_DEBUG << i << " disconnected";
-                    connCount--;
+                    --connCount;
                     if (connCount == 0)
                         loop.quit();
                 }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ void TcpServer::start()`
`131`	`131`	`idleTimeout_ < 500`
`132`	`132`	`? idleTimeout_ + 1`
`133`	`133`	`: 100);`
`134`		`- loopNum--;`
	`134`	`+ --loopNum;`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ void TcpConnectionImpl::send(const std::shared_ptr<std::string> &msgPtr)`
`385`	`385`	`loop_->queueInLoop([thisPtr, msgPtr]() {`
`386`	`386`	`thisPtr->sendInLoop(msgPtr->data(), msgPtr->length());`
`387`	`387`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`388`		`- thisPtr->sendNum_--;`
	`388`	`+ --thisPtr->sendNum_;`
`389`	`389`	`});`
`390`	`390`	`}`
`391`	`391`	`}`
`@@ -397,7 +397,7 @@ void TcpConnectionImpl::send(const std::shared_ptr<std::string> &msgPtr)`
`397`	`397`	`loop_->queueInLoop([thisPtr, msgPtr]() {`
`398`	`398`	`thisPtr->sendInLoop(msgPtr->data(), msgPtr->length());`
`399`	`399`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`400`		`- thisPtr->sendNum_--;`
	`400`	`+ --thisPtr->sendNum_;`
`401`	`401`	`});`
`402`	`402`	`}`
`403`	`403`	`}`
`@@ -418,7 +418,7 @@ void TcpConnectionImpl::send(const char *msg, uint64_t len)`
`418`	`418`	`loop_->queueInLoop([thisPtr, buffer]() {`
`419`	`419`	`thisPtr->sendInLoop(buffer->data(), buffer->length());`
`420`	`420`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`421`		`- thisPtr->sendNum_--;`
	`421`	`+ --thisPtr->sendNum_;`
`422`	`422`	`});`
`423`	`423`	`}`
`424`	`424`	`}`
`@@ -431,7 +431,7 @@ void TcpConnectionImpl::send(const char *msg, uint64_t len)`
`431`	`431`	`loop_->queueInLoop([thisPtr, buffer]() {`
`432`	`432`	`thisPtr->sendInLoop(buffer->data(), buffer->length());`
`433`	`433`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`434`		`- thisPtr->sendNum_--;`
	`434`	`+ --thisPtr->sendNum_;`
`435`	`435`	`});`
`436`	`436`	`}`
`437`	`437`	`}`
`@@ -451,7 +451,7 @@ void TcpConnectionImpl::send(const std::string &msg)`
`451`	`451`	`loop_->queueInLoop([thisPtr, msg]() {`
`452`	`452`	`thisPtr->sendInLoop(msg.data(), msg.length());`
`453`	`453`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`454`		`- thisPtr->sendNum_--;`
	`454`	`+ --thisPtr->sendNum_;`
`455`	`455`	`});`
`456`	`456`	`}`
`457`	`457`	`}`
`@@ -463,7 +463,7 @@ void TcpConnectionImpl::send(const std::string &msg)`
`463`	`463`	`loop_->queueInLoop([thisPtr, msg]() {`
`464`	`464`	`thisPtr->sendInLoop(msg.data(), msg.length());`
`465`	`465`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`466`		`- thisPtr->sendNum_--;`
	`466`	`+ --thisPtr->sendNum_;`
`467`	`467`	`});`
`468`	`468`	`}`
`469`	`469`	`}`
`@@ -483,7 +483,7 @@ void TcpConnectionImpl::send(std::string &&msg)`
`483`	`483`	`loop_->queueInLoop([thisPtr, msg = std::move(msg)]() {`
`484`	`484`	`thisPtr->sendInLoop(msg.data(), msg.length());`
`485`	`485`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`486`		`- thisPtr->sendNum_--;`
	`486`	`+ --thisPtr->sendNum_;`
`487`	`487`	`});`
`488`	`488`	`}`
`489`	`489`	`}`
`@@ -495,7 +495,7 @@ void TcpConnectionImpl::send(std::string &&msg)`
`495`	`495`	`loop_->queueInLoop([thisPtr, msg = std::move(msg)]() {`
`496`	`496`	`thisPtr->sendInLoop(msg.data(), msg.length());`
`497`	`497`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`498`		`- thisPtr->sendNum_--;`
	`498`	`+ --thisPtr->sendNum_;`
`499`	`499`	`});`
`500`	`500`	`}`
`501`	`501`	`}`
`@@ -516,7 +516,7 @@ void TcpConnectionImpl::send(const MsgBuffer &buffer)`
`516`	`516`	`loop_->queueInLoop([thisPtr, buffer]() {`
`517`	`517`	`thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());`
`518`	`518`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`519`		`- thisPtr->sendNum_--;`
	`519`	`+ --thisPtr->sendNum_;`
`520`	`520`	`});`
`521`	`521`	`}`
`522`	`522`	`}`
`@@ -528,7 +528,7 @@ void TcpConnectionImpl::send(const MsgBuffer &buffer)`
`528`	`528`	`loop_->queueInLoop([thisPtr, buffer]() {`
`529`	`529`	`thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());`
`530`	`530`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`531`		`- thisPtr->sendNum_--;`
	`531`	`+ --thisPtr->sendNum_;`
`532`	`532`	`});`
`533`	`533`	`}`
`534`	`534`	`}`
`@@ -549,7 +549,7 @@ void TcpConnectionImpl::send(MsgBuffer &&buffer)`
`549`	`549`	`loop_->queueInLoop([thisPtr, buffer = std::move(buffer)]() {`
`550`	`550`	`thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());`
`551`	`551`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`552`		`- thisPtr->sendNum_--;`
	`552`	`+ --thisPtr->sendNum_;`
`553`	`553`	`});`
`554`	`554`	`}`
`555`	`555`	`}`
`@@ -561,7 +561,7 @@ void TcpConnectionImpl::send(MsgBuffer &&buffer)`
`561`	`561`	`loop_->queueInLoop([thisPtr, buffer = std::move(buffer)]() {`
`562`	`562`	`thisPtr->sendInLoop(buffer.peek(), buffer.readableBytes());`
`563`	`563`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`564`		`- thisPtr->sendNum_--;`
	`564`	`+ --thisPtr->sendNum_;`
`565`	`565`	`});`
`566`	`566`	`}`
`567`	`567`	`}`
`@@ -622,7 +622,7 @@ void TcpConnectionImpl::sendFile(int sfd, size_t offset, size_t length)`
`622`	`622`	`thisPtr->writeBufferList_.push_back(node);`
`623`	`623`	`{`
`624`	`624`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`625`		`- thisPtr->sendNum_--;`
	`625`	`+ --thisPtr->sendNum_;`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`if (thisPtr->writeBufferList_.size() == 1)`
`@@ -643,7 +643,7 @@ void TcpConnectionImpl::sendFile(int sfd, size_t offset, size_t length)`
`643`	`643`
`644`	`644`	`{`
`645`	`645`	`std::lock_guard<std::mutex> guard1(thisPtr->sendNumMutex_);`
`646`		`- thisPtr->sendNum_--;`
	`646`	`+ --thisPtr->sendNum_;`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`if (thisPtr->writeBufferList_.size() == 1)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ int main()`
`37`	`37`	`else`
`38`	`38`	`{`
`39`	`39`	`LOG_DEBUG << i << " disconnected";`
`40`		`- connCount--;`
	`40`	`+ --connCount;`
`41`	`41`	`if (connCount == 0)`
`42`	`42`	`loop.quit();`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ int main()`
`36`	`36`	`else`
`37`	`37`	`{`
`38`	`38`	`LOG_DEBUG << i << " disconnected";`
`39`		`- connCount--;`
	`39`	`+ --connCount;`
`40`	`40`	`if (connCount == 0)`
`41`	`41`	`loop.quit();`
`42`	`42`	`}`