clang-format

Author: an-tao

.clang-format

@@ -17,7 +17,7 @@ AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: Yes
+AlwaysBreakTemplateDeclarations: true
 BinPackArguments: false
 BinPackParameters: false 
 BraceWrapping:   
@@ -86,13 +86,13 @@ ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 10000
+PenaltyBreakBeforeFirstCallParameter: 100
 PenaltyBreakComment: 300
 PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 10000
-PenaltyReturnTypeOnItsOwnLine: 200
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 2000
 PointerAlignment: Left
 RawStringFormats: 
   - Language:        Cpp

trantor/net/TcpClient.cc

@@ -152,12 +152,8 @@ void TcpClient::newConnection(int sockfd)
     std::shared_ptr<TcpConnectionImpl> conn;
     if (_sslCtxPtr)
     {
-        conn = std::make_shared<SSLConnection>(_loop,
-                                               sockfd,
-                                               localAddr,
-                                               peerAddr,
-                                               _sslCtxPtr,
-                                               false);
+        conn = std::make_shared<SSLConnection>(
+            _loop, sockfd, localAddr, peerAddr, _sslCtxPtr, false);
     }
     else
     {

trantor/net/TcpServer.cc

@@ -82,20 +82,12 @@ void TcpServer::newConnection(int sockfd, const InetAddress &peer)
     }
     else
     {
-        newPtr = std::make_shared<TcpConnectionImpl>(ioLoop,
-                                                     sockfd,
-                                                     InetAddress(
-                                                         Socket::getLocalAddr(
-                                                             sockfd)),
-                                                     peer);
+        newPtr = std::make_shared<TcpConnectionImpl>(
+            ioLoop, sockfd, InetAddress(Socket::getLocalAddr(sockfd)), peer);
     }
 #else
-    auto newPtr =
-        std::make_shared<TcpConnectionImpl>(ioLoop,
-                                            sockfd,
-                                            InetAddress(
-                                                Socket::getLocalAddr(sockfd)),
-                                            peer);
+    auto newPtr = std::make_shared<TcpConnectionImpl>(
+        ioLoop, sockfd, InetAddress(Socket::getLocalAddr(sockfd)), peer);
 #endif
 
     if (_idleTimeout > 0)

trantor/net/inner/TcpConnectionImpl.cc

@@ -167,10 +167,10 @@ void TcpConnectionImpl::writeCallback()
                     if (_writeBufferList.front()->_sendFd < 0)
                     {
                         // There is data to be sent in the buffer.
-                        auto n = writeInLoop(_writeBufferList.front()
-                                                 ->_msgBuffer->peek(),
-                                             _writeBufferList.front()
-                                                 ->_msgBuffer->readableBytes());
+                        auto n = writeInLoop(
+                            _writeBufferList.front()->_msgBuffer->peek(),
+                            _writeBufferList.front()
+                                ->_msgBuffer->readableBytes());
                         _writeBufferList.front()->_msgBuffer->retrieve(n);
                         if (n >= 0)
                         {
@@ -348,9 +348,9 @@ void TcpConnectionImpl::sendInLoop(const char *buffer, size_t length)
             _writeBufferList.back()->_msgBuffer->readableBytes() >
                 _highWaterMarkLen)
         {
-            _highWaterMarkCallback(shared_from_this(),
-                                   _writeBufferList.back()
-                                       ->_msgBuffer->readableBytes());
+            _highWaterMarkCallback(
+                shared_from_this(),
+                _writeBufferList.back()->_msgBuffer->readableBytes());
         }
     }
 }

trantor/tests/AsyncFileLoggerTest.cc

@@ -7,11 +7,11 @@ int main()
     trantor::AsyncFileLogger asyncFileLogger;
     asyncFileLogger.setFileName("async_test");
     asyncFileLogger.startLogging();
-    trantor::Logger::
-        setOutputFunction([&](const char *msg,
-                              const uint64_t
-                                  len) { asyncFileLogger.output(msg, len); },
-                          [&]() { asyncFileLogger.flush(); });
+    trantor::Logger::setOutputFunction(
+        [&](const char *msg, const uint64_t len) {
+            asyncFileLogger.output(msg, len);
+        },
+        [&]() { asyncFileLogger.flush(); });
     asyncFileLogger.setFileSizeLimit(100000000);
     //    LOG_DEBUG<<"debug log!"<<1;
     //    LOG_TRACE<<"trace log!"<<2;

trantor/tests/AsyncFileLoggerTest1.cc

@@ -7,11 +7,11 @@ int main()
     trantor::AsyncFileLogger asyncFileLogger;
     asyncFileLogger.setFileName("async_test");
     asyncFileLogger.startLogging();
-    trantor::Logger::
-        setOutputFunction([&](const char *msg,
-                              const uint64_t
-                                  len) { asyncFileLogger.output(msg, len); },
-                          [&]() { asyncFileLogger.flush(); });
+    trantor::Logger::setOutputFunction(
+        [&](const char *msg, const uint64_t len) {
+            asyncFileLogger.output(msg, len);
+        },
+        [&]() { asyncFileLogger.flush(); });
     asyncFileLogger.setFileSizeLimit(100000000);
     int i = 0;
     while (i < 1000000)