抽离一个公共的发送队列

Author: unknown

src/network/BasePacket.cpp

@@ -106,12 +106,12 @@ bool BasePacket::isHeadFull()
 // send msg call
 int32  BasePacket::sendSize()
 {
-	return 0;
+	return wpos();
 }
 
 char * BasePacket::sendStream()
 {
-	return NULL;
+	return (char *)contents();
 }
 
 int BasePacket::readPos()

src/network/HttpConnect.cpp

@@ -54,7 +54,6 @@ HttpConnect::~HttpConnect()
 	delete m_readPacket;
 	free(m_parser);
 	free(m_url);
-	release();
 }
 
 void HttpConnect::zero()
@@ -65,21 +64,11 @@ void HttpConnect::zero()
 	m_content = NULL;
 }
 
-void HttpConnect::release()
-{
-	while (!m_writePackets.empty())
-	{
-		recyclePacket(m_writePackets.front());
-		m_writePackets.pop();
-	}
-}
-
 void HttpConnect::sendMsg(const char* msg, int32 len)
 {
 	BasePacket* pack = createPacket();
 	pack->append(msg, len);
-	m_writePackets.push(pack);
-	send_top_msg();
+	TcpSocket::write(pack);
 }
 void HttpConnect::sendData(std::string_view sv)
 {
@@ -93,8 +82,7 @@ void HttpConnect::autoMsg(std::string_view sv, enum http_content_type type)
 	BasePacket * pack = createPacket();
 	pack->append(buff, strlen(buff));
 	pack->append((const uint8*)sv.data(), sv.size());
-	m_writePackets.push(pack);
-	send_top_msg();
+	TcpSocket::write(pack);
 }
 
 const char * HttpConnect::getContentTypeStr(enum http_content_type type)
@@ -116,15 +104,6 @@ const char * HttpConnect::getContentTypeStr(enum http_content_type type)
 	return ctype;
 }
 
-BasePacket * HttpConnect::createPacket()
-{
-	return new BasePacket;
-}
-void HttpConnect::recyclePacket(BasePacket * pack)
-{
-	delete pack;
-}
-
 int HttpConnect::on_url(http_parser* _, const char *at, size_t length)
 {
 	HttpConnect * conn = (HttpConnect *)(_->data);
@@ -242,22 +221,6 @@ void HttpConnect::on_writecomplete()
 	{
 		this->close();
 	}
-	else
-	{
-		if (m_writePackets.empty())
-			return;
-
-		recyclePacket(m_writePackets.front());
-		m_writePackets.pop();
-		send_top_msg();
-	}
-}
-
-void HttpConnect::send_top_msg()
-{
-	if (m_writePackets.empty())
-		return;
 
-	BasePacket *pack = m_writePackets.front();
-	write((char *)pack->contents(), pack->wpos());
+	TcpSocket::on_writecomplete();
 }

src/network/HttpConnect.h

@@ -10,7 +10,6 @@
 #include "TcpSocket.h"
 #include "HttpEvent.h"
 #include "PoolObject.h"
-#include <queue>
 
 enum http_content_type
 {
@@ -35,7 +34,6 @@ class HttpConnect : public TcpSocket
 	~HttpConnect();
 
 	void zero();
-	void release();
 	void setEvent(HttpEvent * e) { m_event = e; }
 	void sendMsg(const char* msg, int32 len);
 	// lua call
@@ -53,15 +51,11 @@ class HttpConnect : public TcpSocket
 	bool parser(const char *, int);
 	void complete();
 
-	void send_top_msg();
-	BasePacket * createPacket();
-	void recyclePacket(BasePacket * pack);
 private:
 	HttpEvent * m_event = NULL;
 	http_parser * m_parser;
 	http_parser_url * m_url;
 	BasePacket * m_readPacket;
-	std::queue<BasePacket *> m_writePackets;
 	const char * m_urlp;	//url指针
 	const char * m_content;	//post数据指针
 	int m_residue;

src/network/NetConnect.cpp

@@ -17,8 +17,6 @@ NetConnect::~NetConnect()
 		recyclePacket(mReadPacket);
 		mReadPacket = NULL;
 	}
-
-	release();
 }
 
 void NetConnect::on_msgbuffer(MessageBuffer * buffer)
@@ -77,9 +75,7 @@ void NetConnect::sendMsg(uint32 msgtype, NetPacket * pack)
 	packet->moveData(pack);
 	packet->writeHead(msgtype);
 
-	mSendPackets.push(packet);
-
-	send_top_msg();
+	TcpSocket::write(packet);
 }
 
 void NetConnect::sendMsg(uint32 msgtype, const char* msg, uint32 len)
@@ -90,48 +86,11 @@ void NetConnect::sendMsg(uint32 msgtype, const char* msg, uint32 len)
 	pack->append(msg, len);
 	pack->writeHead(msgtype);
 
-	mSendPackets.push(pack);
-
-	send_top_msg();
+	TcpSocket::write(pack);
 }
 
 
-NetPacket * NetConnect::createPacket()
+NetPacket* NetConnect::createPacket()
 {
 	return new NetPacket;
-}
-
-void NetConnect::recyclePacket(NetPacket * pack)
-{
-	delete pack;
-}
-
-void NetConnect::on_writecomplete()
-{
-	if (mSendPackets.empty())
-		return;
-
-	//write complete
-	recyclePacket(mSendPackets.front());
-	mSendPackets.pop();
-
-	send_top_msg();
-}
-
-void NetConnect::send_top_msg()
-{
-	if (mSendPackets.empty())
-		return;
-
-	NetPacket *tp = mSendPackets.front();
-	write(tp->sendStream(), tp->sendSize());
-}
-
-void NetConnect::release()
-{
-	while (!mSendPackets.empty())
-	{
-		recyclePacket(mSendPackets.front());
-		mSendPackets.pop();
-	}
 }

src/network/NetConnect.h

@@ -2,7 +2,6 @@
 #define NET_CONNECT_H
 
 #include "TcpSocket.h"
-#include <queue>
 
 class NetPacket;
 class NetEvent;
@@ -22,20 +21,14 @@ class NetConnect : public TcpSocket
 	void sendPacket(uint32 msgtype, NetPacket * pack) { sendMsg(msgtype, pack);}
 	void sendData(uint32 msgtype, std::string_view view) { sendMsg(msgtype, view.data(), view.size()); }
 
-	static NetPacket * createPacket();
-	static void recyclePacket(NetPacket * pack);
 protected:
+	NetPacket* createPacket();
+	//virtual void recyclePacket(BasePacket* pack);
 
 	virtual void on_msgbuffer(MessageBuffer * buffer);
 	virtual void on_clsesocket();
-	virtual void on_writecomplete();
-
-private:
-	void send_top_msg();
-	void release();
 private:
 	NetPacket *  mReadPacket;
-	std::queue<NetPacket *> mSendPackets;
 	NetEvent * _netevent;
 };