Merge pull request #29 from an-tao/dev

Modify the code style

Author: an-tao

trantor/net/inner/Socket.cc

@@ -20,6 +20,33 @@
 #include <netinet/tcp.h>
 
 using namespace trantor;
+
+bool Socket::isSelfConnect(int sockfd)
+{
+    struct sockaddr_in6 localaddr = getLocalAddr(sockfd);
+    struct sockaddr_in6 peeraddr = getPeerAddr(sockfd);
+    if (localaddr.sin6_family == AF_INET)
+    {
+        const struct sockaddr_in *laddr4 =
+            reinterpret_cast<struct sockaddr_in *>(&localaddr);
+        const struct sockaddr_in *raddr4 =
+            reinterpret_cast<struct sockaddr_in *>(&peeraddr);
+        return laddr4->sin_port == raddr4->sin_port &&
+               laddr4->sin_addr.s_addr == raddr4->sin_addr.s_addr;
+    }
+    else if (localaddr.sin6_family == AF_INET6)
+    {
+        return localaddr.sin6_port == peeraddr.sin6_port &&
+               memcmp(&localaddr.sin6_addr,
+                      &peeraddr.sin6_addr,
+                      sizeof localaddr.sin6_addr) == 0;
+    }
+    else
+    {
+        return false;
+    }
+}
+
 void Socket::bindAddress(const InetAddress &localaddr)
 {
     assert(sockFd_ > 0);
@@ -175,3 +202,10 @@ int Socket::getSocketError()
         return optval;
     }
 }
+
+Socket::~Socket()
+{
+    LOG_TRACE << "Socket deconstructed:" << sockFd_;
+    if (sockFd_ >= 0)
+        close(sockFd_);
+}

trantor/net/inner/Socket.h

@@ -73,41 +73,12 @@ class Socket : NonCopyable
                                  sizeof(struct sockaddr_in)));
     }
 
-    static bool isSelfConnect(int sockfd)
-    {
-        struct sockaddr_in6 localaddr = getLocalAddr(sockfd);
-        struct sockaddr_in6 peeraddr = getPeerAddr(sockfd);
-        if (localaddr.sin6_family == AF_INET)
-        {
-            const struct sockaddr_in *laddr4 =
-                reinterpret_cast<struct sockaddr_in *>(&localaddr);
-            const struct sockaddr_in *raddr4 =
-                reinterpret_cast<struct sockaddr_in *>(&peeraddr);
-            return laddr4->sin_port == raddr4->sin_port &&
-                   laddr4->sin_addr.s_addr == raddr4->sin_addr.s_addr;
-        }
-        else if (localaddr.sin6_family == AF_INET6)
-        {
-            return localaddr.sin6_port == peeraddr.sin6_port &&
-                   memcmp(&localaddr.sin6_addr,
-                          &peeraddr.sin6_addr,
-                          sizeof localaddr.sin6_addr) == 0;
-        }
-        else
-        {
-            return false;
-        }
-    }
+    static bool isSelfConnect(int sockfd);
 
     explicit Socket(int sockfd) : sockFd_(sockfd)
     {
     }
-    ~Socket()
-    {
-        LOG_TRACE << "Socket deconstructed:" << sockFd_;
-        if (sockFd_ >= 0)
-            close(sockFd_);
-    }
+    ~Socket();
     /// abort if address in use
     void bindAddress(const InetAddress &localaddr);
     /// abort if address in use

trantor/net/inner/TcpConnectionImpl.h

@@ -39,7 +39,8 @@ class TcpConnectionImpl : public TcpConnection,
     class KickoffEntry
     {
       public:
-        KickoffEntry(const std::weak_ptr<TcpConnection> &conn) : _conn(conn)
+        explicit KickoffEntry(const std::weak_ptr<TcpConnection> &conn)
+            : _conn(conn)
         {
         }
         void reset()

trantor/net/inner/TimerQueue.h

@@ -30,7 +30,7 @@ class Channel;
 typedef std::shared_ptr<Timer> TimerPtr;
 struct comp
 {
-    bool operator()(const TimerPtr &x, const TimerPtr &y)
+    bool operator()(const TimerPtr &x, const TimerPtr &y) const
     {
         return *x > *y;
     }

trantor/tests/LoggerTest.cc

@@ -39,7 +39,6 @@ int main()
            "usr\n"
            "var\n"
            "vm\n"
-           "用户信息\n"
            "\n"
            "/Applications:\n"
            "Adobe\n"
@@ -91,8 +90,6 @@ int main()
            "Notes.app\n"
            "Numbers.app\n"
            "OmniGraffle.app\n"
-           "PPTV网络电视.app\n"
-           "PP助手.app\n"
            "Pages.app\n"
            "Photo Booth.app\n"
            "Photos.app\n"
@@ -140,8 +137,6 @@ int main()
            "pgAdmin 4.app\n"
            "vSSH Lite.app\n"
            "wechatwebdevtools.app\n"
-           "搜狐影音.appdownload\n"
-           "网易有道词典.app\n"
            "\n"
            "/Applications/Adobe:\n"
            "Flash Player\n"
@@ -170,7 +165,6 @@ int main()
            "Locales\n"
            "Plug-ins\n"
            "Presets\n"
-           "卸载 Adobe Photoshop CC\n"
            "\n"
            "/Applications/Adobe Photoshop CC/Adobe Photoshop CC.app:\n"
            "Contents\n"

trantor/utils/TimingWheel.cc

@@ -0,0 +1,124 @@
+/**
+ *
+ *  TimingWheel.cc
+ *  An Tao
+ *
+ *  Public header file in trantor lib.
+ *
+ *  Copyright 2018, An Tao.  All rights reserved.
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the License file.
+ *
+ *
+ */
+
+#include <trantor/utils/TimingWheel.h>
+
+using namespace trantor;
+
+TimingWheel::TimingWheel(trantor::EventLoop *loop,
+                         size_t maxTimeout,
+                         float tickInterval,
+                         size_t bucketsNumPerWheel)
+    : _loop(loop),
+      _tickInterval(tickInterval),
+      _bucketsNumPerWheel(bucketsNumPerWheel)
+{
+    assert(maxTimeout > 1);
+    assert(tickInterval > 0);
+    size_t maxTickNum = maxTimeout / tickInterval;
+    _wheelsNum = 1;
+    while (maxTickNum > _bucketsNumPerWheel)
+    {
+        _wheelsNum++;
+        maxTickNum = maxTickNum / _bucketsNumPerWheel;
+    }
+    _wheels.resize(_wheelsNum);
+    for (size_t i = 0; i < _wheelsNum; i++)
+    {
+        _wheels[i].resize(_bucketsNumPerWheel);
+    }
+    _timerId = _loop->runEvery(_tickInterval, [=]() {
+        _ticksCounter++;
+        size_t t = _ticksCounter;
+        size_t pow = 1;
+        for (size_t i = 0; i < _wheelsNum; i++)
+        {
+            if ((t % pow) == 0)
+            {
+                EntryBucket tmp;
+                {
+                    // use tmp val to make this critical area as short as
+                    // possible.
+                    _wheels[i].front().swap(tmp);
+                    _wheels[i].pop_front();
+                    _wheels[i].push_back(EntryBucket());
+                }
+            }
+            pow = pow * _bucketsNumPerWheel;
+        }
+    });
+}
+
+TimingWheel::~TimingWheel()
+{
+    _loop->invalidateTimer(_timerId);
+
+    for (int i = _wheels.size() - 1; i >= 0; i--)
+    {
+        _wheels[i].clear();
+    }
+
+    LOG_TRACE << "TimingWheel destruct!";
+}
+
+void TimingWheel::insertEntry(size_t delay, EntryPtr entryPtr)
+{
+    if (delay <= 0)
+        return;
+    if (!entryPtr)
+        return;
+    if (_loop->isInLoopThread())
+    {
+        insertEntryInloop(delay, entryPtr);
+    }
+    else
+    {
+        _loop->runInLoop([=]() { insertEntryInloop(delay, entryPtr); });
+    }
+}
+
+void TimingWheel::insertEntryInloop(size_t delay, EntryPtr entryPtr)
+{
+    // protected by bucketMutex;
+    _loop->assertInLoopThread();
+
+    delay = delay / _tickInterval + 1;
+    size_t t = _ticksCounter;
+    for (size_t i = 0; i < _wheelsNum; i++)
+    {
+        if (delay <= _bucketsNumPerWheel)
+        {
+            _wheels[i][delay - 1].insert(entryPtr);
+            break;
+        }
+        if (i < (_wheelsNum - 1))
+        {
+            entryPtr = std::make_shared<CallbackEntry>([=]() {
+                if (delay > 0)
+                {
+                    _wheels[i][(delay + (t % _bucketsNumPerWheel) - 1) %
+                               _bucketsNumPerWheel]
+                        .insert(entryPtr);
+                }
+            });
+        }
+        else
+        {
+            // delay is too long to put entry at valid position in wheels;
+            _wheels[i][_bucketsNumPerWheel - 1].insert(entryPtr);
+        }
+        delay = (delay + (t % _bucketsNumPerWheel) - 1) / _bucketsNumPerWheel;
+        t = t / _bucketsNumPerWheel;
+    }
+}

trantor/utils/TimingWheel.h

@@ -68,121 +68,24 @@ class TimingWheel
     /// buckets number per wheel
     /// The max delay of the CacheMap is about
     /// tickInterval*(bucketsNumPerWheel^wheelsNum) seconds.
-
     TimingWheel(trantor::EventLoop *loop,
                 size_t maxTimeout,
                 float tickInterval = TIMING_TICK_INTERVAL,
-                size_t bucketsNumPerWheel = TIMING_BUCKET_NUM_PER_WHEEL)
-        : _loop(loop),
-          _tickInterval(tickInterval),
-          _bucketsNumPerWheel(bucketsNumPerWheel)
-    {
-        assert(maxTimeout > 1);
-        assert(tickInterval > 0);
-        size_t maxTickNum = maxTimeout / tickInterval;
-        _wheelsNum = 1;
-        while (maxTickNum > _bucketsNumPerWheel)
-        {
-            _wheelsNum++;
-            maxTickNum = maxTickNum / _bucketsNumPerWheel;
-        }
-        _wheels.resize(_wheelsNum);
-        for (size_t i = 0; i < _wheelsNum; i++)
-        {
-            _wheels[i].resize(_bucketsNumPerWheel);
-        }
-        _timerId = _loop->runEvery(_tickInterval, [=]() {
-            _ticksCounter++;
-            size_t t = _ticksCounter;
-            size_t pow = 1;
-            for (size_t i = 0; i < _wheelsNum; i++)
-            {
-                if ((t % pow) == 0)
-                {
-                    EntryBucket tmp;
-                    {
-                        // use tmp val to make this critical area as short as
-                        // possible.
-                        _wheels[i].front().swap(tmp);
-                        _wheels[i].pop_front();
-                        _wheels[i].push_back(EntryBucket());
-                    }
-                }
-                pow = pow * _bucketsNumPerWheel;
-            }
-        });
-    };
-    ~TimingWheel()
-    {
-        _loop->invalidateTimer(_timerId);
+                size_t bucketsNumPerWheel = TIMING_BUCKET_NUM_PER_WHEEL);
 
-        for (int i = _wheels.size() - 1; i >= 0; i--)
-        {
-            _wheels[i].clear();
-        }
+    // If timeout>0, the value will be erased within the 'timeout' seconds after
+    // the last access
+    void insertEntry(size_t delay, EntryPtr entryPtr);
 
-        LOG_TRACE << "TimingWheel destruct!";
-    }
-
-    // If timeout>0,the value will be erased
-    // within the 'timeout' seconds after the last access
-    void insertEntry(size_t delay, EntryPtr entryPtr)
-    {
-        if (delay <= 0)
-            return;
-        if (!entryPtr)
-            return;
-        if (_loop->isInLoopThread())
-        {
-            insertEntryInloop(delay, entryPtr);
-        }
-        else
-        {
-            _loop->runInLoop([=]() { insertEntryInloop(delay, entryPtr); });
-        }
-    }
-
-    void insertEntryInloop(size_t delay, EntryPtr entryPtr)
-    {
-        // protected by bucketMutex;
-        _loop->assertInLoopThread();
-
-        delay = delay / _tickInterval + 1;
-        size_t t = _ticksCounter;
-        for (size_t i = 0; i < _wheelsNum; i++)
-        {
-            if (delay <= _bucketsNumPerWheel)
-            {
-                _wheels[i][delay - 1].insert(entryPtr);
-                break;
-            }
-            if (i < (_wheelsNum - 1))
-            {
-                entryPtr = std::make_shared<CallbackEntry>([=]() {
-                    if (delay > 0)
-                    {
-                        _wheels[i][(delay + (t % _bucketsNumPerWheel) - 1) %
-                                   _bucketsNumPerWheel]
-                            .insert(entryPtr);
-                    }
-                });
-            }
-            else
-            {
-                // delay is too long to put entry at valid position in wheels;
-                _wheels[i][_bucketsNumPerWheel - 1].insert(entryPtr);
-            }
-            delay =
-                (delay + (t % _bucketsNumPerWheel) - 1) / _bucketsNumPerWheel;
-            t = t / _bucketsNumPerWheel;
-        }
-    }
+    void insertEntryInloop(size_t delay, EntryPtr entryPtr);
 
     EventLoop *getLoop()
     {
         return _loop;
     }
 
+    ~TimingWheel();
+
   private:
     std::vector<BucketQueue> _wheels;