Merge branch 'master' of github.com:an-tao/trantor

Author: Michael Bleis

CMakeLists.txt

@@ -14,7 +14,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/)
 
 set(TRANTOR_MAJOR_VERSION 1)
 set(TRANTOR_MINOR_VERSION 5)
-set(TRANTOR_PATCH_VERSION 22)
+set(TRANTOR_PATCH_VERSION 23)
 set(TRANTOR_VERSION ${TRANTOR_MAJOR_VERSION}.${TRANTOR_MINOR_VERSION}.${TRANTOR_PATCH_VERSION})
 
 include(GNUInstallDirs)

ChangeLog.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.5.23] - 2025-02-20
+
+### Changed
+
+- Replace ipv4 inet_ntop with a handrolled function.
+
+### Fixed
+
+- Fix some typos.
+
 ## [1.5.22] - 2024-10-27
 
 ### Fixed
@@ -686,7 +696,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.5.22...HEAD
+[Unreleased]: https://github.com/an-tao/trantor/compare/v1.5.23...HEAD
+
+[1.5.23]: https://github.com/an-tao/trantor/compare/v1.5.22...v1.5.23
 
 [1.5.22]: https://github.com/an-tao/trantor/compare/v1.5.21...v1.5.22
 

third_party/wepoll/Wepoll.c

@@ -902,7 +902,7 @@ int init(void)
         /* `InitOnceExecuteOnce()` itself is infallible, and it doesn't set any
          * error code when the once-callback returns FALSE. We return -1 here to
          * indicate that global initialization failed; the failing init function
-         * is resposible for setting `errno` and calling `SetLastError()`. */
+         * is responsible for setting `errno` and calling `SetLastError()`. */
         return -1;
 
     return 0;

trantor/net/EventLoop.cc

@@ -45,6 +45,7 @@ using ssize_t = long long;
 #include <algorithm>
 #include <signal.h>
 #include <fcntl.h>
+#include <exception>
 
 namespace trantor
 {

trantor/net/EventLoop.h

@@ -45,7 +45,7 @@ enum
 
 /**
  * @brief As the name implies, this class represents an event loop that runs in
- * a perticular thread. The event loop can handle network I/O events and timers
+ * a particular thread. The event loop can handle network I/O events and timers
  * in asynchronous mode.
  * @note An event loop object always belongs to a separate thread, and there is
  * one event loop object at most in a thread. We can call an event loop object

trantor/net/InetAddress.cc

@@ -196,16 +196,40 @@ bool InetAddress::isLoopbackIp() const
     return false;
 }
 
+static void byteToChars(std::string::iterator &dst, unsigned char byte)
+{
+    *dst = byte / 100 + '0';
+    dst += byte >= 100;
+    *dst = byte % 100 / 10 + '0';
+    dst += byte >= 10;
+    *dst = byte % 10 + '0';
+    ++dst;
+}
+
+static std::string iptos(unsigned inet_addr)
+{
+    // Initialize with a static buffer to force the constructor of string to get
+    // fully inlined
+    constexpr char stringInitBuffer[15]{};
+    std::string out(stringInitBuffer, 15);
+    std::string::iterator dst = out.begin();
+    byteToChars(dst, inet_addr >> 0 & 0xff);
+    *(dst++) = '.';
+    byteToChars(dst, inet_addr >> 8 & 0xff);
+    *(dst++) = '.';
+    byteToChars(dst, inet_addr >> 16 & 0xff);
+    *(dst++) = '.';
+    byteToChars(dst, inet_addr >> 24 & 0xff);
+    out.erase(dst, out.end());
+    return out;
+}
+
 std::string InetAddress::toIp() const
 {
-    char buf[64];
+    char buf[INET6_ADDRSTRLEN]{};
     if (addr_.sin_family == AF_INET)
     {
-#if defined _WIN32
-        ::inet_ntop(AF_INET, (PVOID)&addr_.sin_addr, buf, sizeof(buf));
-#else
-        ::inet_ntop(AF_INET, &addr_.sin_addr, buf, sizeof(buf));
-#endif
+        return iptos(addr_.sin_addr.s_addr);
     }
     else if (addr_.sin_family == AF_INET6)
     {

trantor/net/InetAddress.h

@@ -219,7 +219,7 @@ class TRANTOR_EXPORT InetAddress
     }
 
     /**
-     * @brief Return true if the address is not initalized.
+     * @brief Return true if the address is not initialized.
      */
     inline bool isUnspecified() const
     {

trantor/net/inner/Acceptor.cc

@@ -83,7 +83,7 @@ void Acceptor::readCallback()
     }
     else
     {
-        LOG_SYSERR << "Accpetor::readCallback";
+        LOG_SYSERR << "Acceptor::readCallback";
 // Read the section named "The special problem of
 // accept()ing when you can't" in libev's doc.
 // By Marc Lehmann, author of libev.

trantor/net/inner/poller/EpollPoller.cc

@@ -53,7 +53,7 @@ const int kDeleted = 2;
 EpollPoller::EpollPoller(EventLoop *loop)
     : Poller(loop),
 #ifdef _WIN32
-      // wepoll does not suppor flags
+      // wepoll does not support flags
       epollfd_(::epoll_create1(0)),
 #else
       epollfd_(::epoll_create1(EPOLL_CLOEXEC)),
@@ -85,7 +85,7 @@ void EpollPoller::poll(int timeoutMs, ChannelList *activeChannels)
     // Timestamp now(Timestamp::now());
     if (numEvents > 0)
     {
-        // LOG_TRACE << numEvents << " events happended";
+        // LOG_TRACE << numEvents << " events happened";
         fillActiveChannels(numEvents, activeChannels);
         if (static_cast<size_t>(numEvents) == events_.size())
         {
@@ -94,7 +94,7 @@ void EpollPoller::poll(int timeoutMs, ChannelList *activeChannels)
     }
     else if (numEvents == 0)
     {
-        // std::cout << "nothing happended" << std::endl;
+        // std::cout << "nothing happened" << std::endl;
     }
     else
     {

trantor/net/inner/poller/KQueue.cc

@@ -59,7 +59,7 @@ void KQueue::poll(int timeoutMs, ChannelList *activeChannels)
     // Timestamp now(Timestamp::now());
     if (numEvents > 0)
     {
-        // LOG_TRACE << numEvents << " events happended";
+        // LOG_TRACE << numEvents << " events happened";
         fillActiveChannels(numEvents, activeChannels);
         if (static_cast<size_t>(numEvents) == events_.size())
         {
@@ -68,7 +68,7 @@ void KQueue::poll(int timeoutMs, ChannelList *activeChannels)
     }
     else if (numEvents == 0)
     {
-        // std::cout << "nothing happended" << std::endl;
+        // std::cout << "nothing happened" << std::endl;
     }
     else
     {