Merge pull request #34 from an-tao/dev

Add the byte statistics method to the TcpConnection class

Author: an-tao

trantor/net/TcpConnection.h

@@ -69,6 +69,9 @@ class TcpConnection
     // the kickoffIdleConnections method in the TcpServer class.
     virtual void keepAlive() = 0;
     virtual bool isKeepAlive() = 0;
+
+    virtual size_t bytesSent() const = 0;
+    virtual size_t bytesReceived() const = 0;
 };
 
 }  // namespace trantor

trantor/net/inner/TcpConnectionImpl.cc

@@ -70,9 +70,13 @@ void TcpConnectionImpl::readCallback()
         LOG_SYSERR << "read socket error";
     }
     extendLife();
-    if (n > 0 && _recvMsgCallback)
+    if (n > 0)
     {
-        _recvMsgCallback(shared_from_this(), &_readBuffer);
+        _bytesReceived += n;
+        if (_recvMsgCallback)
+        {
+            _recvMsgCallback(shared_from_this(), &_readBuffer);
+        }
     }
 }
 void TcpConnectionImpl::extendLife()
@@ -740,5 +744,6 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
 
 ssize_t TcpConnectionImpl::writeInLoop(const char *buffer, size_t length)
 {
+    _bytesSent += length;
     return write(_socketPtr->fd(), buffer, length);
 }

trantor/net/inner/TcpConnectionImpl.h

@@ -129,24 +129,32 @@ class TcpConnectionImpl : public TcpConnection,
 
     virtual void setContext(const any &context) override
     {
-        context_ = context;
+        _context = context;
     }
     virtual void setContext(any &&context) override
     {
-        context_ = std::move(context);
+        _context = std::move(context);
     }
     virtual const any &getContext() const override
     {
-        return context_;
+        return _context;
     }
 
     virtual any *getMutableContext() override
     {
-        return &context_;
+        return &_context;
+    }
+    virtual size_t bytesSent() const override
+    {
+        return _bytesSent;
+    }
+    virtual size_t bytesReceived() const override
+    {
+        return _bytesReceived;
     }
 
   protected:
-    any context_;
+    any _context;
     /// Internal use only.
 
     std::weak_ptr<KickoffEntry> _kickoffEntry;
@@ -238,6 +246,10 @@ class TcpConnectionImpl : public TcpConnection,
 
     uint64_t _sendNum = 0;
     std::mutex _sendNumMutex;
+
+    size_t _bytesSent = 0;
+    size_t _bytesReceived = 0;
+
 };
 
 typedef std::shared_ptr<TcpConnectionImpl> TcpConnectionImplPtr;