Fix some compilation warnings (#53)

Author: an-tao

CMakeLists.txt

@@ -1,6 +1,12 @@
 cmake_minimum_required(VERSION 3.5)
 project(trantor)
 add_library(${PROJECT_NAME} STATIC)
+# if(MSVC)
+#   target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX)
+# else()
+#   target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -pedantic)
+# endif()
+
 set(TRANTOR_MAJOR_VERSION 1)
 set(TRANTOR_MINOR_VERSION 0)
 set(TRANTOR_PATCH_VERSION 0)
@@ -167,4 +173,5 @@ install(
 # Install the export set for use with the install-tree
 install(EXPORT TrantorTargets
         DESTINATION "${INSTALL_TRANTOR_CMAKE_DIR}"
+        NAMESPACE Trantor::
         COMPONENT dev)

cmake/templates/TrantorConfig.cmake.in

@@ -9,18 +9,15 @@
 @PACKAGE_INIT@
 
 # Compute paths
-add_library(Trantor::Trantor INTERFACE IMPORTED GLOBAL)
 
 # Our library dependencies (contains definitions for IMPORTED targets)
 get_filename_component(TRANTOR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-if(NOT TARGET trantor)
+if(NOT TARGET Trantor::Trantor)
   include("${TRANTOR_CMAKE_DIR}/TrantorTargets.cmake")
+  set_target_properties(Trantor::trantor PROPERTIES IMPORTED_GLOBAL TRUE)
+  add_library(Trantor::Trantor ALIAS Trantor::trantor)
 endif()
 
-# These are IMPORTED targets created by TrantorTargets.cmake
-target_link_libraries(Trantor::Trantor INTERFACE trantor)
-
-
 set(TRANTOR_FOUND TRUE)
-get_target_property(TRANTOR_INCLUDE_DIRS trantor INTERFACE_INCLUDE_DIRECTORIES)
-set(TRANTOR_LIBRARIES trantor)
+get_target_property(TRANTOR_INCLUDE_DIRS Trantor::Trantor INTERFACE_INCLUDE_DIRECTORIES)
+set(TRANTOR_LIBRARIES Trantor::Trantor)

trantor/net/TcpClient.cc

@@ -37,7 +37,7 @@ using namespace std::placeholders;
 
 namespace trantor
 {
-void removeConnector(const ConnectorPtr &connector)
+void removeConnector(const ConnectorPtr &)
 {
     // connector->
 }

trantor/net/TcpServer.cc

@@ -30,12 +30,11 @@ TcpServer::TcpServer(EventLoop *loop,
     : _loop(loop),
       _acceptorPtr(new Acceptor(loop, address, reUseAddr, reUsePort)),
       _serverName(name),
-      _recvMessageCallback(
-          [](const TcpConnectionPtr &connectionPtr, MsgBuffer *buffer) {
-              LOG_ERROR << "unhandled recv message [" << buffer->readableBytes()
-                        << " bytes]";
-              buffer->retrieveAll();
-          })
+      _recvMessageCallback([](const TcpConnectionPtr &, MsgBuffer *buffer) {
+          LOG_ERROR << "unhandled recv message [" << buffer->readableBytes()
+                    << " bytes]";
+          buffer->retrieveAll();
+      })
 {
     _acceptorPtr->setNewConnectionCallback(
         std::bind(&TcpServer::newConnection, this, _1, _2));

trantor/net/TcpServer.h

@@ -41,7 +41,6 @@ class TcpServer : NonCopyable
     void start();
     void setIoLoopNum(size_t num)
     {
-        assert(num >= 0);
         assert(!_started);
         _loopPoolPtr = std::make_shared<EventLoopThreadPool>(num);
         _loopPoolPtr->start();

trantor/net/inner/AresResolver.cc

@@ -157,7 +157,7 @@ void AresResolver::onQueryResult(int status,
                                  const std::string& hostname,
                                  const Callback& callback)
 {
-    // LOG_DEBUG << "onQueryResult " << status;
+    LOG_TRACE << "onQueryResult " << status;
     struct sockaddr_in addr;
     memset(&addr, 0, sizeof addr);
     addr.sin_family = AF_INET;
@@ -177,6 +177,7 @@ void AresResolver::onQueryResult(int status,
 
 void AresResolver::onSockCreate(int sockfd, int type)
 {
+    (void)type;
     _loop->assertInLoopThread();
     assert(_channels.find(sockfd) == _channels.end());
     Channel* channel = new Channel(_loop, sockfd);
@@ -187,6 +188,7 @@ void AresResolver::onSockCreate(int sockfd, int type)
 
 void AresResolver::onSockStateChange(int sockfd, bool read, bool write)
 {
+    (void)write;
     _loop->assertInLoopThread();
     ChannelList::iterator it = _channels.find(sockfd);
     assert(it != _channels.end());
@@ -209,6 +211,7 @@ void AresResolver::ares_host_callback(void* data,
                                       int timeouts,
                                       struct hostent* hostent)
 {
+    (void)timeouts;
     QueryData* query = static_cast<QueryData*>(data);
 
     query->_owner->onQueryResult(status,

trantor/net/inner/Channel.h

@@ -167,4 +167,4 @@ class Channel : NonCopyable
     std::weak_ptr<void> _tie;
     bool _tied;
 };
-};  // namespace trantor
+}  // namespace trantor

trantor/net/inner/Timer.cc

@@ -57,4 +57,4 @@ bool Timer::operator>(const Timer &t) const
 {
     return _when > t._when;
 }
-};  // namespace trantor
+}  // namespace trantor

trantor/net/inner/Timer.h

@@ -60,4 +60,4 @@ class Timer : public NonCopyable
     static std::atomic<TimerId> _timersCreated;
 };
 
-};  // namespace trantor
+}  // namespace trantor

trantor/net/inner/TimerQueue.cc

@@ -66,12 +66,12 @@ void readTimerfd(int timerfd, const Date &now)
 {
     uint64_t howmany;
     ssize_t n = ::read(timerfd, &howmany, sizeof howmany);
-    // LOG_TRACE << "TimerQueue::handleRead() " << howmany << " at " <<
-    // now.toString();
+    LOG_TRACE << "TimerQueue::handleRead() " << howmany << " at "
+              << now.toFormattedString(true);
     if (n != sizeof howmany)
     {
-        // LOG_ERROR << "TimerQueue::handleRead() reads " << n << " bytes
-        // instead of 8";
+        LOG_ERROR << "TimerQueue::handleRead() reads " << n
+                  << " bytes instead of 8";
     }
 }
 

trantor/net/inner/TimerQueue.h

@@ -71,4 +71,4 @@ class TimerQueue : NonCopyable
   private:
     std::unordered_set<uint64_t> _timerIdSet;
 };
-};  // namespace trantor
+}  // namespace trantor

trantor/net/inner/poller/EpollPoller.cc

@@ -195,13 +195,13 @@ EpollPoller::EpollPoller(EventLoop *loop) : Poller(loop)
 EpollPoller::~EpollPoller()
 {
 }
-void EpollPoller::poll(int timeoutMs, ChannelList *activeChannels)
+void EpollPoller::poll(int, ChannelList *)
 {
 }
-void EpollPoller::updateChannel(Channel *channel)
+void EpollPoller::updateChannel(Channel *)
 {
 }
-void EpollPoller::removeChannel(Channel *channel)
+void EpollPoller::removeChannel(Channel *)
 {
 }
 #endif

trantor/net/inner/poller/KQueue.cc

@@ -233,13 +233,13 @@ KQueue::KQueue(EventLoop *loop) : Poller(loop)
 KQueue::~KQueue()
 {
 }
-void KQueue::poll(int timeoutMs, ChannelList *activeChannels)
+void KQueue::poll(int, ChannelList *)
 {
 }
-void KQueue::updateChannel(Channel *channel)
+void KQueue::updateChannel(Channel *)
 {
 }
-void KQueue::removeChannel(Channel *channel)
+void KQueue::removeChannel(Channel *)
 {
 }
 void KQueue::resetAfterFork()

trantor/utils/Date.cc

@@ -247,4 +247,4 @@ Date::Date(unsigned int year,
     microSecondsSinceEpoch_ = epoch * MICRO_SECONDS_PRE_SEC + microSecond;
 }
 
-};  // namespace trantor
+}  // namespace trantor

trantor/utils/Date.h

@@ -147,4 +147,4 @@ class Date
   private:
     int64_t microSecondsSinceEpoch_ = 0;
 };
-};  // namespace trantor
+}  // namespace trantor

trantor/utils/Logger.cc

@@ -122,7 +122,7 @@ Logger::Logger(SourceFile file, int line, LogLevel level, const char *func)
     formatTime();
     logStream_ << T(logLevelStr[level_], 7) << "[" << func << "] ";
 }
-Logger::Logger(SourceFile file, int line, bool isSysErr)
+Logger::Logger(SourceFile file, int line, bool)
     : sourceFile_(file), fileLine_(line), level_(FATAL)
 {
     formatTime();

trantor/utils/SerialTaskQueue.cc

@@ -53,4 +53,4 @@ void SerialTaskQueue::waitAllTasksFinished()
     });
 }
 
-};  // namespace trantor
+}  // namespace trantor

trantor/utils/SerialTaskQueue.h

@@ -50,4 +50,4 @@ class SerialTaskQueue : public TaskQueue
     EventLoopThread _loopThread;
     bool _stop = false;
 };
-};  // namespace trantor
+}  // namespace trantor

trantor/utils/TaskQueue.h

@@ -40,4 +40,4 @@ class TaskQueue : public NonCopyable
         fut.get();
     };
 };
-};  // namespace trantor
+}  // namespace trantor