Bump version to v1.0.0-rc3 (#41)

Author: an-tao

CMakeLists.txt

@@ -67,7 +67,9 @@ SET(trantor_sources
     trantor/net/inner/Socket.cc
     trantor/net/inner/TcpConnectionImpl.cc
     trantor/net/inner/Timer.cc
-    trantor/net/inner/TimerQueue.cc)
+    trantor/net/inner/TimerQueue.cc
+    trantor/net/inner/poller/EpollPoller.cc
+    trantor/net/inner/poller/KQueue.cc)
 
 FIND_PACKAGE(OpenSSL)
 IF(OpenSSL_FOUND)
@@ -78,21 +80,6 @@ ELSE()
     SET(trantor_sources ${trantor_sources} trantor/net/ssl/SSLConnectionSkipped.cc)
 ENDIF()
 
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    SET(trantor_sources ${trantor_sources} ${PROJECT_SOURCE_DIR}/trantor/net/inner/poller/EpollPoller.cc)
-    MESSAGE(STATUS "current platform: Linux ")
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
-    MESSAGE(FATAL_ERROR "Error: Currently does not support Windows")
-ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    SET(trantor_sources ${trantor_sources} ${PROJECT_SOURCE_DIR}/trantor/net/inner/poller/KQueue.cc)
-    MESSAGE(STATUS "current platform: FreeBSD")
-ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    SET(trantor_sources ${trantor_sources} ${PROJECT_SOURCE_DIR}/trantor/net/inner/poller/KQueue.cc)
-    MESSAGE(STATUS "current platform: MacOS")
-ELSE ()
-    MESSAGE(STATUS "other platform: ${CMAKE_SYSTEM_NAME}")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-
 ADD_LIBRARY(trantor ${trantor_sources})
 SET_PROPERTY(TARGET trantor PROPERTY CXX_STANDARD 14)
 SET_PROPERTY(TARGET trantor PROPERTY CXX_STANDARD_REQUIRED ON)

ChangeLog.md

@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.0.0-rc3] - 2019-07-30
+
+### API change list
+
+- TcpConnection::setContext, TcpConnection::getContext, etc.
+- Remove the config.h from public API.
+
+### Changed
+
+- Modify the CMakeLists.txt.
+- Modify some log output.
+- Remove some unnecessary `std::dynamic_pointer_cast` calls.
+
 ## [1.0.0-rc2] - 2019-07-11
 
 ### Added
@@ -17,7 +30,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-rc2...HEAD
+[Unreleased]: https://github.com/an-tao/trantor/compare/v1.0.0-rc3...HEAD
+
+[1.0.0-rc3]: https://github.com/an-tao/trantor/compare/v1.0.0-rc2...v1.0.0-rc3
 
 [1.0.0-rc2]: https://github.com/an-tao/trantor/compare/v1.0.0-rc1...v1.0.0-rc2
 

trantor/net/TcpConnection.h

@@ -79,13 +79,13 @@ class TcpConnection
     {
         return (bool)_contextPtr;
     }
-    
+
     /// Clear the context.
     void clearContext()
     {
         _contextPtr.reset();
     }
-    
+
     // Call this method to avoid being kicked off by TcpServer, refer to
     // the kickoffIdleConnections method in the TcpServer class.
     virtual void keepAlive() = 0;

trantor/net/inner/poller/EpollPoller.cc

@@ -15,15 +15,17 @@
 #include <trantor/utils/Logger.h>
 #include "Channel.h"
 #include "EpollPoller.h"
+#ifdef __linux__
 #include <poll.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 #include <assert.h>
 #include <strings.h>
 #include <iostream>
-
+#endif
 namespace trantor
 {
+#ifdef __linux__
 static_assert(EPOLLIN == POLLIN, "EPOLLIN != POLLIN");
 static_assert(EPOLLPRI == POLLPRI, "EPOLLPRI != POLLPRI");
 static_assert(EPOLLOUT == POLLOUT, "EPOLLOUT != POLLOUT");
@@ -185,5 +187,22 @@ void EpollPoller::update(int operation, Channel *channel)
         }
     }
 }
-
+#else
+EpollPoller::EpollPoller(EventLoop *loop) : Poller(loop)
+{
+    assert(false);
+}
+EpollPoller::~EpollPoller()
+{
+}
+void EpollPoller::poll(int timeoutMs, ChannelList *activeChannels)
+{
+}
+void EpollPoller::updateChannel(Channel *channel)
+{
+}
+void EpollPoller::removeChannel(Channel *channel)
+{
+}
+#endif
 }  // namespace trantor

trantor/net/inner/poller/EpollPoller.h

@@ -18,10 +18,11 @@
 #include <trantor/utils/NonCopyable.h>
 #include <trantor/net/EventLoop.h>
 
+#ifdef __linux__
 #include <memory>
 #include <map>
 typedef std::vector<struct epoll_event> EventList;
-
+#endif
 namespace trantor
 {
 class Channel;
@@ -36,6 +37,7 @@ class EpollPoller : public Poller
     virtual void removeChannel(Channel *channel) override;
 
   private:
+#ifdef __linux__
     static const int kInitEventListSize = 16;
     int _epollfd;
     EventList _events;
@@ -45,5 +47,6 @@ class EpollPoller : public Poller
     ChannelMap _channels;
 #endif
     void fillActiveChannels(int numEvents, ChannelList *activeChannels) const;
+#endif
 };
 }  // namespace trantor

trantor/net/inner/poller/KQueue.cc

@@ -1,14 +1,16 @@
 #include "KQueue.h"
 #include "Channel.h"
+#ifdef USE_KQUEUE
 #include <trantor/utils/Logger.h>
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <poll.h>
-
+#endif
 namespace trantor
 {
+#ifdef USE_KQUEUE
 namespace
 {
 const int kNew = -1;
@@ -223,5 +225,25 @@ void KQueue::update(Channel *channel)
     }
     kevent(_kqfd, ev, n, NULL, 0, NULL);
 }
-
+#else
+KQueue::KQueue(EventLoop *loop) : Poller(loop)
+{
+    assert(false);
+}
+KQueue::~KQueue()
+{
+}
+void KQueue::poll(int timeoutMs, ChannelList *activeChannels)
+{
+}
+void KQueue::updateChannel(Channel *channel)
+{
+}
+void KQueue::removeChannel(Channel *channel)
+{
+}
+void KQueue::resetAfterFork()
+{
+}
+#endif
 }  // namespace trantor

trantor/net/inner/poller/KQueue.h

@@ -17,12 +17,14 @@
 #include <trantor/utils/NonCopyable.h>
 #include <trantor/net/EventLoop.h>
 
+#if (defined(__unix__) && !defined(__linux__)) || \
+    (defined(__APPLE__) && defined(__MACH__))
+#define USE_KQUEUE
 #include <memory>
 #include <unordered_map>
 #include <vector>
-
 typedef std::vector<struct kevent> EventList;
-
+#endif
 namespace trantor
 {
 class Channel;
@@ -38,6 +40,7 @@ class KQueue : public Poller
     virtual void resetAfterFork() override;
 
   private:
+#ifdef USE_KQUEUE
     static const int kInitEventListSize = 16;
     int _kqfd;
     EventList _events;
@@ -46,6 +49,7 @@ class KQueue : public Poller
 
     void fillActiveChannels(int numEvents, ChannelList *activeChannels) const;
     void update(Channel *channel);
+#endif
 };
 
 }  // namespace trantor

trantor/net/ssl/SSLConnectionSkipped.cc

@@ -31,7 +31,7 @@ class SSLConn
 
 void initOpenSSL()
 {
-    LOG_FATAL << "SSL is not supported!";
+    LOG_FATAL << "SSL is not supported due to not being compiled with OpenSSL!";
     exit(1);
 }
 std::shared_ptr<SSLContext> newSSLContext()
@@ -42,7 +42,7 @@ void initServerSSLContext(const std::shared_ptr<SSLContext> &ctx,
                           const std::string &certPath,
                           const std::string &keyPath)
 {
-    LOG_FATAL << "SSL is not supported!";
+    LOG_FATAL << "SSL is not supported due to not being compiled with OpenSSL!";
     exit(1);
 }
 }  // namespace trantor
@@ -55,7 +55,7 @@ SSLConnection::SSLConnection(EventLoop *loop,
                              bool isServer)
     : TcpConnectionImpl(loop, socketfd, localAddr, peerAddr)
 {
-    LOG_FATAL << "SSL is not supported!";
+    LOG_FATAL << "SSL is not supported due to not being compiled with OpenSSL!";
     exit(1);
 }