Merge branch 'dev' of github.com:WastonYuan/predixy

This commit is contained in:
pengdaqian 2022-11-20 12:58:10 +08:00
commit 0fa85ac136
3 changed files with 14 additions and 5 deletions

View File

@ -13,15 +13,23 @@
#include "Request.h" #include "Request.h"
#include "ResponseParser.h" #include "ResponseParser.h"
enum ConnectConnectionListIndex
{
PostConn = 0,
PrivateConn,
ConnListSize
};
class ConnectConnection : class ConnectConnection :
public ConnectSocket, public ConnectSocket,
public Connection, public Connection,
public ListNode<ConnectConnection>, public ListNode<ConnectConnection, ConnectConnection*, ConnectConnectionListIndex::ConnListSize>,
public DequeNode<ConnectConnection> public DequeNode<ConnectConnection>
{ {
public: public:
typedef ConnectConnection Value; typedef ConnectConnection Value;
typedef ListNode<ConnectConnection> ListNodeType; typedef ListNode<ConnectConnection, ConnectConnection*, ConnectConnectionListIndex::ConnListSize> ListNodeType;
typedef DequeNode<ConnectConnection> DequeNodeType; typedef DequeNode<ConnectConnection> DequeNodeType;
typedef Alloc<ConnectConnection, Const::ConnectConnectionAllocCacheSize> Allocator; typedef Alloc<ConnectConnection, Const::ConnectConnectionAllocCacheSize> Allocator;
public: public:
@ -96,7 +104,8 @@ private:
bool mReadonly; bool mReadonly;
}; };
typedef List<ConnectConnection> ConnectConnectionList; typedef List<ConnectConnection, ConnectConnectionListIndex::PostConn> PostConnectConnectionList;
typedef List<ConnectConnection, ConnectConnectionListIndex::PrivateConn> PrivateConnectConnectionList;
typedef Deque<ConnectConnection> ConnectConnectionDeque; typedef Deque<ConnectConnection> ConnectConnectionDeque;
typedef ConnectConnection::Allocator ConnectConnectionAlloc; typedef ConnectConnection::Allocator ConnectConnectionAlloc;

View File

@ -71,7 +71,7 @@ private:
Server* mServ; Server* mServ;
int mPendRequests; int mPendRequests;
std::vector<ConnectConnection*> mShareConns; std::vector<ConnectConnection*> mShareConns;
std::vector<ConnectConnectionList> mPrivateConns; std::vector<PrivateConnectConnectionList> mPrivateConns;
ServerStats mStats; ServerStats mStats;
std::vector<LatencyMonitor> mLatencyMonitors; std::vector<LatencyMonitor> mLatencyMonitors;
}; };

View File

@ -120,7 +120,7 @@ private:
std::vector<ConnectConnectionPool*> mConnPool; std::vector<ConnectConnectionPool*> mConnPool;
AcceptConnectionDeque mAcceptConns; AcceptConnectionDeque mAcceptConns;
AcceptConnectionList mPostAcceptConns; AcceptConnectionList mPostAcceptConns;
ConnectConnectionList mPostConnectConns; PostConnectConnectionList mPostConnectConns;
ConnectConnectionDeque mWaitConnectConns; ConnectConnectionDeque mWaitConnectConns;
long mStatsVer; long mStatsVer;
HandlerStats mStats; HandlerStats mStats;