sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improving possible multithreading in new send code.

Browse Source
This commit is contained in:
lotodore
2011-02-19 15:01:50 +00:00
parent 8279868417
commit f7315cd9e5
2 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/net/common/senddatamanager.cpp
+1 -1
View File
@@ -44,6 +44,7 @@ SendDataManager::HandleWrite(boost::shared_ptr<boost::asio::ip::tcp::socket> soc
{ {
if (!error) { if (!error) {
// Successfully sent the data. // Successfully sent the data.
boost::mutex::scoped_lock lock(dataMutex);
curWriteBufUsed = 0; curWriteBufUsed = 0;
// Send more data, if available. // Send more data, if available.
AsyncSendNextPacket(socket); AsyncSendNextPacket(socket);
@@ -53,7 +54,6 @@ SendDataManager::HandleWrite(boost::shared_ptr<boost::asio::ip::tcp::socket> soc
void void
SendDataManager::AsyncSendNextPacket(boost::shared_ptr<boost::asio::ip::tcp::socket> socket) SendDataManager::AsyncSendNextPacket(boost::shared_ptr<boost::asio::ip::tcp::socket> socket)
{ {
boost::mutex::scoped_lock lock(dataMutex);
if (!curWriteBufUsed) { if (!curWriteBufUsed) {
// Swap buffers and send data. // Swap buffers and send data.
boost::swap(curWriteBuf, sendBuf); boost::swap(curWriteBuf, sendBuf);
src/net/common/senderhelper.cpp
+4 -12
View File
@@ -42,27 +42,22 @@ SenderHelper::Send(boost::shared_ptr<SessionData> session, boost::shared_ptr<Net
{ {
if (packet && session) { if (packet && session) {
SendDataManager &tmpManager = session->GetSendDataManager(); SendDataManager &tmpManager = session->GetSendDataManager();
{ // Add packet to specific queue.
// First: Add packet to specific queue.
boost::mutex::scoped_lock lock(tmpManager.dataMutex); boost::mutex::scoped_lock lock(tmpManager.dataMutex);
if (tmpManager.GetAllocated() <= MAX_SEND_BUF_SIZE) { if (tmpManager.GetAllocated() <= MAX_SEND_BUF_SIZE) {
InternalStorePacket(tmpManager, packet); InternalStorePacket(tmpManager, packet);
} }
} // Activate async send, if needed.
{
// Second: Activate async send, if needed.
tmpManager.AsyncSendNextPacket(session->GetAsioSocket()); tmpManager.AsyncSendNextPacket(session->GetAsioSocket());
} }
} }
}
void void
SenderHelper::Send(boost::shared_ptr<SessionData> session, const NetPacketList &packetList) SenderHelper::Send(boost::shared_ptr<SessionData> session, const NetPacketList &packetList)
{ {
if (!packetList.empty() && session) { if (!packetList.empty() && session) {
SendDataManager &tmpManager = session->GetSendDataManager(); SendDataManager &tmpManager = session->GetSendDataManager();
{ // Add packets to specific queue.
// First: Add packets to specific queue.
boost::mutex::scoped_lock lock(tmpManager.dataMutex); boost::mutex::scoped_lock lock(tmpManager.dataMutex);
if (tmpManager.GetAllocated() <= MAX_SEND_BUF_SIZE) { if (tmpManager.GetAllocated() <= MAX_SEND_BUF_SIZE) {
NetPacketList::const_iterator i = packetList.begin(); NetPacketList::const_iterator i = packetList.begin();
@@ -73,13 +68,10 @@ SenderHelper::Send(boost::shared_ptr<SessionData> session, const NetPacketList &
++i; ++i;
} }
} }
} // Activate async send, if needed.
{
// Second: Activate async send, if needed.
tmpManager.AsyncSendNextPacket(session->GetAsioSocket()); tmpManager.AsyncSendNextPacket(session->GetAsioSocket());
} }
} }
}
void void
SenderHelper::InternalStorePacket(SendDataManager &tmpManager, boost::shared_ptr<NetPacket> packet) SenderHelper::InternalStorePacket(SendDataManager &tmpManager, boost::shared_ptr<NetPacket> packet)