More fixes from clang-tidy.

chenshuo · chenshuo · commit c36261a7756d · 2018-10-24T07:21:15.000Z
diff --git a/.clang-tidy b/.clang-tidy
@@ -1,6 +1,6 @@
 ---
 # Only run a few checks for now.
-Checks:          'modernize-loop-convert'
+Checks:          'performance-*'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,7 +37,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   list(APPEND CXX_FLAGS "-Wno-null-dereference")
   list(APPEND CXX_FLAGS "-Wno-sign-conversion")
   list(APPEND CXX_FLAGS "-Wno-unused-local-typedef")
-  list(APPEND CXX_FLAGS "-Wno-unused-private-field")
   list(APPEND CXX_FLAGS "-Wthread-safety")
   list(REMOVE_ITEM CXX_FLAGS "-rdynamic")
 endif()
diff --git a/contrib/thrift/ThriftServer.cc b/contrib/thrift/ThriftServer.cc
@@ -7,9 +7,7 @@
 using namespace muduo;
 using namespace muduo::net;
 
-ThriftServer::~ThriftServer()
-{
-}
+ThriftServer::~ThriftServer() = default;
 
 void ThriftServer::serve()
 {
diff --git a/examples/curl/download.cc b/examples/curl/download.cc
@@ -23,11 +23,11 @@ class Piece : noncopyable
   Piece(const curl::RequestPtr& req,
         const FilePtr& out,
         const muduo::string& range,
-        const std::function<void()> done)
+        std::function<void()> done)
     : req_(req),
       out_(out),
       range_(range),
-      doneCb_(done)
+      doneCb_(std::move(done))
   {
     LOG_INFO << "range: " << range;
     req->setRange(range);
@@ -158,7 +158,7 @@ class Downloader : noncopyable
         }
         pieces_[i].reset(new Piece(req,
                                    out,
-                                   range.str().c_str(), // std::string -> muduo::string
+                                   range.str(),
                                    std::bind(&Downloader::onDownloadDone, this)));
       }
       else
diff --git a/examples/fastcgi/fastcgi.cc b/examples/fastcgi/fastcgi.cc
@@ -81,7 +81,7 @@ bool FastCgiCodec::parseAllParams()
       return false;
     if (paramsStream_.readableBytes() >= nameLen+valueLen)
     {
-      string name = paramsStream_.retrieveAsString(nameLen);
+      std::string name = paramsStream_.retrieveAsString(nameLen);
       params_[name] = paramsStream_.retrieveAsString(valueLen);
     }
     else
diff --git a/examples/fastcgi/fastcgi.h b/examples/fastcgi/fastcgi.h
@@ -4,15 +4,13 @@
 #include <muduo/net/TcpConnection.h>
 #include <map>
 
-using muduo::string;
-
 // one FastCgiCodec per TcpConnection
 // both lighttpd and nginx do not implement multiplexing,
 // so there is no concurrent requests of one connection.
 class FastCgiCodec : muduo::noncopyable
 {
  public:
-  typedef std::map<string, string> ParamMap;
+  typedef std::map<std::string, std::string> ParamMap;
   typedef std::function<void (const muduo::net::TcpConnectionPtr& conn,
                                 ParamMap&,
                                 muduo::net::Buffer*)> Callback;
diff --git a/examples/idleconnection/echo.cc b/examples/idleconnection/echo.cc
@@ -87,12 +87,10 @@ void EchoServer::dumpConnectionBuckets() const
   {
     const Bucket& bucket = *bucketI;
     printf("[%d] len = %zd : ", idx, bucket.size());
-    for (Bucket::const_iterator it = bucket.begin();
-        it != bucket.end();
-        ++it)
+    for (const auto& it : bucket)
     {
-      bool connectionDead = (*it)->weakConn_.expired();
-      printf("%p(%ld)%s, ", get_pointer(*it), it->use_count(),
+      bool connectionDead = it->weakConn_.expired();
+      printf("%p(%ld)%s, ", get_pointer(it), it.use_count(),
           connectionDead ? " DEAD" : "");
     }
     puts("");
diff --git a/examples/memcached/server/Item.h b/examples/memcached/server/Item.h
@@ -7,9 +7,6 @@
 
 #include <memory>
 
-using muduo::string;
-using muduo::StringPiece;
-
 namespace muduo
 {
 namespace net
@@ -37,7 +34,7 @@ class Item : muduo::noncopyable
     kCas,
   };
 
-  static ItemPtr makeItem(StringPiece keyArg,
+  static ItemPtr makeItem(muduo::StringPiece keyArg,
                           uint32_t flagsArg,
                           int exptimeArg,
                           int valuelen,
@@ -47,7 +44,7 @@ class Item : muduo::noncopyable
     //return ItemPtr(new Item(keyArg, flagsArg, exptimeArg, valuelen, casArg));
   }
 
-  Item(StringPiece keyArg,
+  Item(muduo::StringPiece keyArg,
        uint32_t flagsArg,
        int exptimeArg,
        int valuelen,
@@ -114,7 +111,7 @@ class Item : muduo::noncopyable
 
   void output(muduo::net::Buffer* out, bool needCas = false) const;
 
-  void resetKey(StringPiece k);
+  void resetKey(muduo::StringPiece k);
 
  private:
   int totalLen() const { return keylen_ + valuelen_; }
diff --git a/examples/memcached/server/MemcacheServer.cc b/examples/memcached/server/MemcacheServer.cc
@@ -29,9 +29,7 @@ MemcacheServer::MemcacheServer(muduo::net::EventLoop* loop, const Options& optio
       std::bind(&MemcacheServer::onConnection, this, _1));
 }
 
-MemcacheServer::~MemcacheServer()
-{
-}
+MemcacheServer::~MemcacheServer() = default;
 
 void MemcacheServer::start()
 {
diff --git a/examples/procmon/plot.h b/examples/procmon/plot.h
@@ -28,8 +28,8 @@ class Plot : muduo::noncopyable
   const int height_;
   const int totalSeconds_;
   const int samplingPeriod_;
-  const gdImagePtr image_;
-  const MyGdFontPtr font_;
+  gdImagePtr const image_;
+  MyGdFontPtr const font_;
   const int fontWidth_;
   const int fontHeight_;
   const int background_;
diff --git a/examples/procmon/plot_test.cc b/examples/procmon/plot_test.cc
@@ -7,6 +7,7 @@
 int main()
 {
   std::vector<double> cpu_usage;
+  cpu_usage.reserve(300);
   for (int i = 0; i < 300; ++i)
     cpu_usage.push_back(1.0 + sin(pow(i / 30.0, 2)));
   Plot plot(640, 100, 600, 2);
diff --git a/examples/protobuf/codec/dispatcher.h b/examples/protobuf/codec/dispatcher.h
@@ -23,7 +23,7 @@ typedef std::shared_ptr<google::protobuf::Message> MessagePtr;
 class Callback : muduo::noncopyable
 {
  public:
-  virtual ~Callback() {};
+  virtual ~Callback() = default;
   virtual void onMessage(const muduo::net::TcpConnectionPtr&,
                          const MessagePtr& message,
                          muduo::Timestamp) const = 0;
@@ -44,9 +44,9 @@ class CallbackT : public Callback
   {
   }
 
-  virtual void onMessage(const muduo::net::TcpConnectionPtr& conn,
-                         const MessagePtr& message,
-                         muduo::Timestamp receiveTime) const
+  void onMessage(const muduo::net::TcpConnectionPtr& conn,
+                 const MessagePtr& message,
+                 muduo::Timestamp receiveTime) const override
   {
     std::shared_ptr<T> concrete = muduo::down_pointer_cast<T>(message);
     assert(concrete != NULL);
diff --git a/examples/protobuf/resolver/client.cc b/examples/protobuf/resolver/client.cc
@@ -67,7 +67,7 @@ class RpcClient : noncopyable
         NewCallback(this, &RpcClient::resolved, response, host));
   }
 
-  void resolved(resolver::ResolveResponse* resp, std::string host)
+  void resolved(resolver::ResolveResponse* resp, std::string host) // pass by value for NewCallback above
   {
     if (resp->resolved())
     {
@@ -76,7 +76,7 @@ class RpcClient : noncopyable
       inet_ntop(AF_INET, &ip, buf, sizeof buf);
 
       LOG_INFO << "resolved " << host << " : " << buf << "\n"
-               << resp->DebugString().c_str();
+               << resp->DebugString();
     }
     else
     {
diff --git a/examples/protobuf/rpc/client.cc b/examples/protobuf/rpc/client.cc
@@ -55,7 +55,7 @@ class RpcClient : noncopyable
 
   void solved(sudoku::SudokuResponse* resp)
   {
-    LOG_INFO << "solved:\n" << resp->DebugString().c_str();
+    LOG_INFO << "solved:\n" << resp->DebugString();
     client_.disconnect();
   }
 
diff --git a/examples/protobuf/rpcbalancer/balancer.cc b/examples/protobuf/rpcbalancer/balancer.cc
@@ -120,8 +120,7 @@ class Balancer : noncopyable
            const InetAddress& listenAddr,
            const string& name,
            const std::vector<InetAddress>& backends)
-    : loop_(loop),
-      server_(loop, listenAddr, name),
+    : server_(loop, listenAddr, name),
       codec_(std::bind(&Balancer::onRpcMessage, this, _1, _2, _3)),
       backends_(backends)
   {
@@ -200,7 +199,6 @@ class Balancer : noncopyable
     }
   }
 
-  EventLoop* loop_;
   TcpServer server_;
   RpcCodec codec_;
   std::vector<InetAddress> backends_;
diff --git a/examples/protobuf/rpcbalancer/balancer_raw.cc b/examples/protobuf/rpcbalancer/balancer_raw.cc
@@ -208,8 +208,7 @@ class Balancer : noncopyable
            const InetAddress& listenAddr,
            const string& name,
            const std::vector<InetAddress>& backends)
-    : loop_(loop),
-      server_(loop, listenAddr, name),
+    : server_(loop, listenAddr, name),
       codec_(std::bind(&Balancer::onRpcMessage, this, _1, _2, _3),
              std::bind(&Balancer::onRawMessage, this, _1, _2, _3)),
       backends_(backends)
@@ -310,7 +309,6 @@ class Balancer : noncopyable
     return succeed;
   }
 
-  EventLoop* loop_;
   TcpServer server_;
   RpcCodec codec_;
   std::vector<InetAddress> backends_;
diff --git a/examples/protobuf/rpcbench/client.cc b/examples/protobuf/rpcbench/client.cc
@@ -67,7 +67,7 @@ class RpcClient : noncopyable
 
   void replied(echo::EchoResponse* resp)
   {
-    // LOG_INFO << "replied:\n" << resp->DebugString().c_str();
+    // LOG_INFO << "replied:\n" << resp->DebugString();
     // loop_->quit();
     ++count_;
     if (count_ < kRequests)
diff --git a/examples/sudoku/percentile.h b/examples/sudoku/percentile.h
@@ -80,7 +80,7 @@ class Percentile
   static int getPercentile(const std::vector<int>& latencies, int percent)
   {
     // The Nearest Rank method
-    assert(latencies.size() > 0);
+    assert(!latencies.empty());
     size_t idx = 0;
     if (percent > 0)
     {
diff --git a/examples/zeromq/local_lat.cc b/examples/zeromq/local_lat.cc
@@ -34,7 +34,7 @@ int main(int argc, char* argv[])
   if (argc > 1)
   {
     uint16_t port = static_cast<uint16_t>(atoi(argv[1]));
-    g_tcpNoDelay = argc > 2 ? atoi(argv[2]) : 0;
+    g_tcpNoDelay = argc > 2 ? atoi(argv[2]) : false;
     int threadCount = argc > 3 ? atoi(argv[3]) : 0;
 
     LOG_INFO << "pid = " << getpid() << ", listen port = " << port;
diff --git a/examples/zeromq/remote_lat.cc b/examples/zeromq/remote_lat.cc
@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
     g_msgSize = atoi(argv[3]);
     g_message.assign(g_msgSize, 'H');
     g_totalMsgs = argc > 4 ? atoi(argv[4]) : 10000;
-    g_tcpNoDelay = argc > 5 ? atoi(argv[5]) : 0;
+    g_tcpNoDelay = argc > 5 ? atoi(argv[5]) : false;
 
     muduo::net::EventLoop loop;
     muduo::net::InetAddress serverAddr(ip, port);
diff --git a/muduo/base/FileUtil.h b/muduo/base/FileUtil.h
@@ -67,7 +67,7 @@ class AppendFile : noncopyable
 
   ~AppendFile();
 
-  void append(const char* logline, const size_t len);
+  void append(const char* logline, size_t len);
 
   void flush();
 
diff --git a/muduo/base/GzipFile.h b/muduo/base/GzipFile.h
@@ -15,7 +15,7 @@ namespace muduo
 class GzipFile : noncopyable
 {
  public:
-  GzipFile(GzipFile&& rhs)
+  GzipFile(GzipFile&& rhs) noexcept
     : file_(rhs.file_)
   {
     rhs.file_ = NULL;
@@ -29,7 +29,7 @@ class GzipFile : noncopyable
     }
   }
 
-  GzipFile& operator=(GzipFile&& rhs)
+  GzipFile& operator=(GzipFile&& rhs) noexcept
   {
     swap(rhs);
     return *this;
diff --git a/muduo/base/Logging.h b/muduo/base/Logging.h
@@ -33,7 +33,7 @@ class Logger
   {
    public:
     template<int N>
-    inline SourceFile(const char (&arr)[N])
+    SourceFile(const char (&arr)[N])
       : data_(arr),
         size_(N-1)
     {
diff --git a/muduo/base/Mutex.h b/muduo/base/Mutex.h
@@ -169,7 +169,7 @@ class CAPABILITY("mutex") MutexLock : noncopyable
   class UnassignGuard : noncopyable
   {
    public:
-    UnassignGuard(MutexLock& owner)
+    explicit UnassignGuard(MutexLock& owner)
       : owner_(owner)
     {
       owner_.unassignHolder();
diff --git a/muduo/base/tests/BlockingQueue_bench.cc b/muduo/base/tests/BlockingQueue_bench.cc
@@ -9,8 +9,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-using std::placeholders::_1;
-
 class Bench
 {
  public:
@@ -85,7 +83,7 @@ class Bench
     printf("tid=%d, %s stopped\n",
            muduo::CurrentThread::tid(),
            muduo::CurrentThread::name());
-    for (const std::pair<int, int>& delay : delays)
+    for (const auto& delay : delays)
     {
       printf("tid = %d, delay = %d, count = %d\n",
              muduo::CurrentThread::tid(),
diff --git a/muduo/base/tests/BlockingQueue_test.cc b/muduo/base/tests/BlockingQueue_test.cc
@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-using std::placeholders::_1;
-
 class Test
 {
  public:
diff --git a/muduo/base/tests/BoundedBlockingQueue_test.cc b/muduo/base/tests/BoundedBlockingQueue_test.cc
@@ -8,8 +8,6 @@
 #include <stdio.h>
 #include <unistd.h>
 
-using std::placeholders::_1;
-
 class Test
 {
  public:
diff --git a/muduo/base/tests/Thread_bench.cc b/muduo/base/tests/Thread_bench.cc
@@ -75,7 +75,7 @@ int main(int argc, char* argv[])
   }
   {
     muduo::MutexLockGuard lock(g_mutex);
-    for (const std::pair<int, int>& delay : g_delays)
+    for (const auto& delay : g_delays)
     {
       printf("delay = %d, count = %d\n",
              delay.first, delay.second);
diff --git a/muduo/net/Channel.cc b/muduo/net/Channel.cc
@@ -142,5 +142,5 @@ string Channel::eventsToString(int fd, int ev)
   if (ev & POLLNVAL)
     oss << "NVAL ";
 
-  return oss.str().c_str();
+  return oss.str();
 }
diff --git a/muduo/net/http/HttpResponse.cc b/muduo/net/http/HttpResponse.cc
@@ -34,7 +34,7 @@ void HttpResponse::appendToBuffer(Buffer* output) const
     output->append("Connection: Keep-Alive\r\n");
   }
 
-  for (const std::pair<string, string>& header : headers_)
+  for (const auto& header : headers_)
   {
     output->append(header.first);
     output->append(": ");
diff --git a/muduo/net/http/tests/HttpServer_test.cc b/muduo/net/http/tests/HttpServer_test.cc
@@ -19,7 +19,7 @@ void onRequest(const HttpRequest& req, HttpResponse* resp)
   if (!benchmark)
   {
     const std::map<string, string>& headers = req.headers();
-    for (const std::pair<string, string>& header : headers)
+    for (const auto& header : headers)
     {
       std::cout << header.first << ": " << header.second << std::endl;
     }
diff --git a/muduo/net/inspect/Inspector.cc b/muduo/net/inspect/Inspector.cc

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,7 @@`
`7`	`7`	`using namespace muduo;`
`8`	`8`	`using namespace muduo::net;`
`9`	`9`
`10`		`-ThriftServer::~ThriftServer()`
`11`		`-{`
`12`		`-}`
	`10`	`+ThriftServer::~ThriftServer() = default;`
`13`	`11`
`14`	`12`	`void ThriftServer::serve()`
`15`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ bool FastCgiCodec::parseAllParams()`
`81`	`81`	`return false;`
`82`	`82`	`if (paramsStream_.readableBytes() >= nameLen+valueLen)`
`83`	`83`	`{`
`84`		`- string name = paramsStream_.retrieveAsString(nameLen);`
	`84`	`+ std::string name = paramsStream_.retrieveAsString(nameLen);`
`85`	`85`	`params_[name] = paramsStream_.retrieveAsString(valueLen);`
`86`	`86`	`}`
`87`	`87`	`else`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,10 @@ void EchoServer::dumpConnectionBuckets() const`
`87`	`87`	`{`
`88`	`88`	`const Bucket& bucket = *bucketI;`
`89`	`89`	`printf("[%d] len = %zd : ", idx, bucket.size());`
`90`		`- for (Bucket::const_iterator it = bucket.begin();`
`91`		`- it != bucket.end();`
`92`		`- ++it)`
	`90`	`+ for (const auto& it : bucket)`
`93`	`91`	`{`
`94`		`- bool connectionDead = (*it)->weakConn_.expired();`
`95`		`- printf("%p(%ld)%s, ", get_pointer(*it), it->use_count(),`
	`92`	`+ bool connectionDead = it->weakConn_.expired();`
	`93`	`+ printf("%p(%ld)%s, ", get_pointer(it), it.use_count(),`
`96`	`94`	`connectionDead ? " DEAD" : "");`
`97`	`95`	`}`
`98`	`96`	`puts("");`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,7 @@ MemcacheServer::MemcacheServer(muduo::net::EventLoop* loop, const Options& optio`
`29`	`29`	`std::bind(&MemcacheServer::onConnection, this, _1));`
`30`	`30`	`}`
`31`	`31`
`32`		`-MemcacheServer::~MemcacheServer()`
`33`		`-{`
`34`		`-}`
	`32`	`+MemcacheServer::~MemcacheServer() = default;`
`35`	`33`
`36`	`34`	`void MemcacheServer::start()`
`37`	`35`	`{`