1

server/wsproxy/app.cc

@@ -25,6 +25,7 @@
 #include "upstreammgr.h"
 #include "master.h"
 #include "mastermgr.h"
+#include "mmcache.h"
 
 #include "longsessionmgr.h"
 
@@ -115,10 +116,10 @@ bool App::Init(int argc, char* argv[])
                 });
 
     uuid_ = std::make_shared<a8::uuid::SnowFlake>();
-    loop_mutex_ = new std::mutex();
+    loop_mutex_ = std::make_shared<std::mutex>();
-    loop_cond_ = new std::condition_variable();
+    loop_cond_ = std::make_shared<std::condition_variable>();
-    msg_mutex_ = new std::mutex();
+    msg_mutex_ = std::make_shared<std::mutex>();
-    udp_msg_mutex_ = new std::mutex();
+    udp_msg_mutex_ = std::make_shared<std::mutex>();
 
     srand(time(nullptr));
     InitLog();
@@ -127,6 +128,7 @@ bool App::Init(int argc, char* argv[])
     f8::Timer::Instance()->Init();
     JsonDataMgr::Instance()->Init();
     uuid_->SetMachineId((node_id_ - 1) * MAX_NODE_ID + instance_id_);
+    MMCache::Instance()->Init();
     DownStreamMgr::Instance()->Init();
     MasterMgr::Instance()->Init();
     UpStreamMgr::Instance()->Init();
@@ -189,6 +191,7 @@ void App::UnInit()
     MasterMgr::Instance()->UnInit();
     UpStreamMgr::Instance()->UnInit();
     DownStreamMgr::Instance()->UnInit();
+    MMCache::Instance()->UnInit();
     JsonDataMgr::Instance()->UnInit();
     f8::Timer::Instance()->UnInit();
     f8::MsgQueue::Instance()->UnInit();
@@ -197,14 +200,6 @@ void App::UnInit()
 
     FreeSocketMsgQueue();
     FreeUdpMsgQueue();
-    delete msg_mutex_;
-    msg_mutex_ = nullptr;
-    delete udp_msg_mutex_;
-    udp_msg_mutex_ = nullptr;
-    delete loop_cond_;
-    loop_cond_ = nullptr;
-    delete loop_mutex_;
-    loop_mutex_ = nullptr;
     a8::XPrintf("wsproxy terminated instance_id:%d pid:%d\n", {instance_id_, getpid()});
 }
 
@@ -234,7 +229,8 @@ void App::AddSocketMsg(SocketFrom_e sockfrom,
                        int bodylen,
                        int tag)
 {
-    MsgNode *p = (MsgNode*)malloc(sizeof(MsgNode));
+    char* buf = MMCache::Instance()->AllocSocketMsg(sizeof(MsgNode) + bodylen);
+    MsgNode *p = (MsgNode*)buf;
     memset(p, 0, sizeof(MsgNode));
     p->sockfrom = sockfrom;
     p->ip_saddr = ip_saddr;
@@ -245,7 +241,7 @@ void App::AddSocketMsg(SocketFrom_e sockfrom,
     p->buflen = bodylen;
     p->tag = tag;
     if (bodylen > 0) {
-        p->buf = (char*)malloc(bodylen);
+        p->buf = buf + sizeof(MsgNode);
         memmove(p->buf, msgbody, bodylen);
     }
     msg_mutex_->lock();
@@ -370,10 +366,7 @@ void App::DispatchMsg()
             }
             break;
         }
-        if (pdelnode->buf) {
+        MMCache::Instance()->FreeSocketMsg((char*)pdelnode);
-            free(pdelnode->buf);
-        }
-        free(pdelnode);
         working_msgnode_size_--;
         if (a8::XGetTickCount() - starttick > 200) {
             break;
@@ -547,10 +540,7 @@ void App::FreeSocketMsgQueue()
     while (work_node_) {
         MsgNode* pdelnode = work_node_;
         work_node_ = work_node_->next;
-        if (pdelnode->buf) {
+        MMCache::Instance()->FreeSocketMsg((char*)pdelnode);
-            free(pdelnode->buf);
-        }
-        free(pdelnode);
         if (!work_node_) {
             work_node_ = top_node_;
             top_node_ = nullptr;
@@ -576,7 +566,7 @@ void App::FreeUdpMsgQueue()
                 free((void*)pdelnode->pkt->buf);
             }
             delete pdelnode->pkt;
-            free(pdelnode);
+            MMCache::Instance()->FreeUdpMsg((char*)pdelnode);
         }
         if (!udp_work_node_) {
             udp_work_node_ = udp_top_node_;
@@ -589,7 +579,8 @@ void App::FreeUdpMsgQueue()
 
 void App::AddUdpMsg(a8::UdpPacket* pkt)
 {
-    UdpMsgNode *p = (UdpMsgNode*) malloc(sizeof(UdpMsgNode));
+    char* buf = MMCache::Instance()->AllocUdpMsg(sizeof(UdpMsgNode));
+    UdpMsgNode *p = (UdpMsgNode*)buf;
     memset(p, 0, sizeof(UdpMsgNode));
     p->pkt = pkt;
     udp_msg_mutex_->lock();
@@ -626,7 +617,7 @@ void App::DispatchUdpMsg()
                 free((void*)pdelnode->pkt->buf);
             }
             delete pdelnode->pkt;
-            free(pdelnode);
+            MMCache::Instance()->FreeUdpMsg((char*)pdelnode);
         }
         udp_working_msgnode_size_--;
         if (a8::XGetTickCount() - starttick > 200) {

server/wsproxy/app.h

@@ -78,15 +78,15 @@ private:
     std::set<int> flags_;
 
     std::shared_ptr<a8::uuid::SnowFlake> uuid_;
-    std::mutex *loop_mutex_ = nullptr;
+    std::shared_ptr<std::mutex> loop_mutex_;
-    std::condition_variable *loop_cond_ = nullptr;
+    std::shared_ptr<std::condition_variable> loop_cond_;
 
-    std::mutex* msg_mutex_ = nullptr;
+    std::shared_ptr<std::mutex> msg_mutex_;
     MsgNode* top_node_ = nullptr;
     MsgNode* bot_node_ = nullptr;
     MsgNode* work_node_ = nullptr;
 
-    std::mutex* udp_msg_mutex_ = nullptr;
+    std::shared_ptr<std::mutex> udp_msg_mutex_;
     UdpMsgNode* udp_top_node_ = nullptr;
     UdpMsgNode* udp_bot_node_ = nullptr;
     UdpMsgNode* udp_work_node_ = nullptr;

server/wsproxy/constant.h

@@ -37,3 +37,5 @@ const int MAX_NODE_ID = 8;
 const int MAX_INSTANCE_ID = 500;
 
 const int ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT = a8::TIMER_USER_EVENT + 1;
+
+const int PACK_MAX = 1024 * 64;

server/wsproxy/downstream.cc

@@ -25,7 +25,7 @@ void DownStream::ReBindUpStream(std::weak_ptr<UpStream> up)
 
 void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
 {
-    char* buff = (char*)malloc(sizeof(f8::PackHead) + hdr.buflen);
+    char* buff = forward_buff_.data();
     f8::PackHead* head = (f8::PackHead*)buff;
     head->packlen = hdr.buflen;
     head->msgid = hdr.msgid;
@@ -41,10 +41,6 @@ void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
             ss::SS_SMPing msg;
             msg.set_source(1);
             {
-                free(buff);
-
-                buff = (char*)malloc(sizeof(f8::PackHead) + msg.ByteSize());
-                f8::PackHead* head = (f8::PackHead*)buff;
                 head->packlen = msg.ByteSize();
                 head->msgid = hdr.msgid;
                 head->seqid = hdr.seqid;
@@ -59,7 +55,6 @@ void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
     } else {
         GCListener::Instance()->SendBuf(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen);
     }
-    free(buff);
 }
 
 void DownStream::OnClose()

server/wsproxy/downstream.h

@@ -18,6 +18,7 @@ class DownStream
     void OnClose();
 
 private:
+    std::array<char, PACK_MAX> forward_buff_;
     int socket_handle_ = a8::INVALID_SOCKET_HANDLE;
     std::weak_ptr<UpStream> up_;
     bool is_long_session_ = false;

server/wsproxy/master.cc

@@ -13,8 +13,6 @@
 
 #include "app.h"
 
-const int PACK_MAX = 1024 * 64;
-
 void Master::Init(int instance_id, const std::string& remote_ip, int remote_port)
 {
     this->instance_id = instance_id;
@@ -23,10 +21,7 @@ void Master::Init(int instance_id, const std::string& remote_ip, int remote_port
 
     recv_bufflen_ = 0;
     last_pong_tick = a8::XGetTickCount();
-    recv_buff_ = (char*) malloc(PACK_MAX * 2);
+    tcp_client_ = std::make_shared<a8::TcpClient>(remote_ip, remote_port);
-    tcp_client_ = std::make_shared<a8::TcpClient>();
-    tcp_client_->remote_address = remote_ip;
-    tcp_client_->remote_port = remote_port;
     tcp_client_->on_error = std::bind(&Master::on_error, this, std::placeholders::_1, std::placeholders::_2);
     tcp_client_->on_connect = std::bind(&Master::on_connect, this, std::placeholders::_1);
     tcp_client_->on_disconnect = std::bind(&Master::on_disconnect, this, std::placeholders::_1);
@@ -53,8 +48,6 @@ void Master::UnInit()
     }
     tcp_client_ = nullptr;
     recv_bufflen_ = 0;
-    free(recv_buff_);
-    recv_buff_ = nullptr;
 }
 
 void Master::Open()
@@ -77,8 +70,8 @@ void Master::on_error(a8::TcpClient* sender, int errorId)
     f8::UdpLog::Instance()->Error("Master errorid=%d remote_ip:%s remote_port:%d",
                                   {
                                    errorId,
-                                   sender->remote_address,
+                                   sender->GetRemoteAddress(),
-                                   sender->remote_port
+                                   sender->GetRemotePort()
                                   });
 }
 
@@ -135,7 +128,7 @@ void Master::on_socketread(a8::TcpClient* sender, char* buf, unsigned int len)
         f8::UdpLog::Instance()->Debug("recvied bad package", {});
     }
     if (offset > 0 && offset < recv_bufflen_) {
-        memmove(recv_buff_, recv_buff_ + offset, recv_bufflen_ - offset);
+        memmove(recv_buff_.data(), recv_buff_.data() + offset, recv_bufflen_ - offset);
     }
     recv_bufflen_ -= offset;
     #if 1

server/wsproxy/master.h

@@ -39,7 +39,7 @@ class Master
     void CheckAlive();
 
  private:
-    char *recv_buff_ = nullptr;
+    std::array<char, PACK_MAX> recv_buff_;
     unsigned int recv_bufflen_ = 0;
     std::shared_ptr<a8::TcpClient> tcp_client_;
     f8::TimerWp timer_wp_;

server/wsproxy/mmcache.cc

@@ -0,0 +1,33 @@
+#include "precompile.h"
+
+#include "mmcache.h"
+
+void MMCache::Init()
+{
+    socket_msg_buffer_ = std::make_shared<a8::FifoBuffer>(1024 * 1024 * 10);
+    udp_msg_buffer_ = std::make_shared<a8::FifoBuffer>(1024 * 1024 * 10);
+}
+
+void MMCache::UnInit()
+{
+}
+
+char* MMCache::AllocSocketMsg(int len)
+{
+    return socket_msg_buffer_->Alloc(len);
+}
+
+void MMCache::FreeSocketMsg(char* p)
+{
+    socket_msg_buffer_->Free(p);
+}
+
+char* MMCache::AllocUdpMsg(int len)
+{
+    return udp_msg_buffer_->Alloc(len);
+}
+
+void MMCache::FreeUdpMsg(char* p)
+{
+    udp_msg_buffer_->Free(p);
+}

server/wsproxy/mmcache.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <a8/singleton.h>
+#include <a8/fifobuffer.h>
+
+class MMCache : public a8::Singleton<MMCache>
+{
+private:
+    MMCache() {};
+    friend class a8::Singleton<MMCache>;
+
+public:
+
+    void Init();
+    void UnInit();
+
+    char* AllocSocketMsg(int len);
+    void FreeSocketMsg(char* p);
+
+    char* AllocUdpMsg(int len);
+    void FreeUdpMsg(char* p);
+
+private:
+
+    std::shared_ptr<a8::FifoBuffer> socket_msg_buffer_;
+    std::shared_ptr<a8::FifoBuffer> udp_msg_buffer_;
+
+};

server/wsproxy/upstream.cc

@@ -14,8 +14,6 @@
 
 #include "app.h"
 
-const int PACK_MAX = 1024 * 64 * 2;
-
 void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_port)
 {
     if (remote_ip.empty()) {
@@ -27,10 +25,7 @@ void UpStream::Init(int instance_id, const std::string& remote_ip, int remote_po
 
     recv_bufflen_ = 0;
     last_pong_tick = a8::XGetTickCount();
-    recv_buff_ = (char*) malloc(PACK_MAX * 2);
+    tcp_client_ = std::make_shared<a8::TcpClient>(remote_ip, remote_port);
-    tcp_client_ = std::make_shared<a8::TcpClient>();
-    tcp_client_->remote_address = remote_ip;
-    tcp_client_->remote_port = remote_port;
     tcp_client_->on_error = std::bind(&UpStream::on_error, this, std::placeholders::_1, std::placeholders::_2);
     tcp_client_->on_connect = std::bind(&UpStream::on_connect, this, std::placeholders::_1);
     tcp_client_->on_disconnect = std::bind(&UpStream::on_disconnect, this, std::placeholders::_1);
@@ -67,8 +62,6 @@ void UpStream::UnInit()
         abort();
     }
     recv_bufflen_ = 0;
-    free(recv_buff_);
-    recv_buff_ = nullptr;
 }
 
 void UpStream::Open()
@@ -111,7 +104,7 @@ void UpStream::SendStockMsg()
 
 void UpStream::ForwardClientMsg(f8::MsgHdr& hdr)
 {
-    char* buff = (char*)malloc(sizeof(f8::WSProxyPackHead_C) + hdr.buflen);
+    char* buff = forward_buff_.data();
     memset(buff, 0, sizeof(f8::WSProxyPackHead_C));
     f8::WSProxyPackHead_C* head = (f8::WSProxyPackHead_C*)buff;
     head->packlen = hdr.buflen;
@@ -129,7 +122,6 @@ void UpStream::ForwardClientMsg(f8::MsgHdr& hdr)
     }
 
     tcp_client_->SendBuff(buff, sizeof(f8::WSProxyPackHead_C) + head->packlen);
-    free(buff);
 }
 
 void UpStream::ForwardClientMsgEx(f8::MsgHdr* hdr)
@@ -153,8 +145,8 @@ void UpStream::on_error(a8::TcpClient* sender, int errorId)
     f8::UdpLog::Instance()->Error("target server errorid=%d remote_ip:%s remote_port:%d",
                                   {
                                    errorId,
-                                   sender->remote_address,
+                                   sender->GetRemoteAddress(),
-                                   sender->remote_port
+                                   sender->GetRemotePort()
                                   });
 }
 
@@ -163,8 +155,8 @@ void UpStream::on_connect(a8::TcpClient* sender)
     recv_bufflen_ = 0;
     f8::UdpLog::Instance()->Info("target server connected remote_ip:%s remote_port:%d",
                                  {
-                                   sender->remote_address,
+                                  sender->GetRemoteAddress(),
-                                   sender->remote_port
+                                  sender->GetRemotePort()
                                  });
     f8::MsgQueue::Instance()->PostMsg
         (
@@ -185,8 +177,8 @@ void UpStream::on_disconnect(a8::TcpClient* sender)
                                  "remote_ip:%s remote_port:%d",
                                  {
                                   instance_id,
-                                  sender->remote_address,
+                                  sender->GetRemoteAddress(),
-                                  sender->remote_port
+                                  sender->GetRemotePort()
                                  });
     f8::MsgQueue::Instance()->PostMsg
         (
@@ -242,7 +234,7 @@ void UpStream::on_socketread(a8::TcpClient* sender, char* buf, unsigned int len)
         f8::UdpLog::Instance()->Debug("recvied bad package", {});
     }
     if (offset > 0 && offset < recv_bufflen_) {
-        memmove(recv_buff_, recv_buff_ + offset, recv_bufflen_ - offset);
+        memmove(recv_buff_.data(), recv_buff_.data() + offset, recv_bufflen_ - offset);
     }
     recv_bufflen_ -= offset;
     #if 1

server/wsproxy/upstream.h

@@ -64,7 +64,8 @@ class UpStream
                      f8::MsgHdr* hdr);
 
  private:
-    char *recv_buff_ = nullptr;
+    std::array<char, PACK_MAX> recv_buff_;
+    std::array<char, PACK_MAX> forward_buff_;
     unsigned int recv_bufflen_ = 0;
     std::shared_ptr<a8::TcpClient> tcp_client_;
     f8::TimerWp timer_wp_;

third_party/a8

@@ -1 +1 @@
-Subproject commit 1e577389c8a2870db9ddbf18577bfca24def049b
+Subproject commit 424f7083751ca1d2bf289ac9be46b658437b7d33

third_party/f8

@@ -1 +1 @@
-Subproject commit 243bbe515ef4a01089f9a6cf608c93d4097018de
+Subproject commit 874ff7853e30ff22c556a2c4cbf4046423c7be86