Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace 'TcpSocket::send' local buffer with data member

Browse Source
This commit is contained in:
Vittorio Romeo 2022-06-23 02:15:48 +02:00
parent 95201a3950
commit e4c5af63b7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/SFML/Network/TcpSocket.hpp
View File

@ -229,6 +229,7 @@ private:
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
PendingPacket m_pendingPacket; //!< Temporary data of the packet currently being received PendingPacket m_pendingPacket; //!< Temporary data of the packet currently being received
std::vector<char> m_blockToSendBuffer; //!< Buffer used to prepare data being sent from the socket
}; };
} // namespace sf } // namespace sf

8
src/SFML/Network/TcpSocket.cpp
View File

@ -324,15 +324,15 @@ Socket::Status TcpSocket::send(Packet& packet)
Uint32 packetSize = htonl(static_cast<Uint32>(size)); Uint32 packetSize = htonl(static_cast<Uint32>(size));
// Allocate memory for the data block to send // Allocate memory for the data block to send
std::vector<char> blockToSend(sizeof(packetSize) + size); m_blockToSendBuffer.resize(sizeof(packetSize) + size);
// Copy the packet size and data into the block to send // Copy the packet size and data into the block to send
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wnull-dereference" // False positive. #pragma GCC diagnostic ignored "-Wnull-dereference" // False positive.
std::memcpy(blockToSend.data(), &packetSize, sizeof(packetSize)); std::memcpy(m_blockToSendBuffer.data(), &packetSize, sizeof(packetSize));
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
if (size > 0) if (size > 0)
std::memcpy(blockToSend.data() + sizeof(packetSize), data, size); std::memcpy(m_blockToSendBuffer.data() + sizeof(packetSize), data, size);
// These warnings are ignored here for portability, as even on Windows the // These warnings are ignored here for portability, as even on Windows the
// signature of `send` might change depending on whether Win32 or MinGW is // signature of `send` might change depending on whether Win32 or MinGW is
@ -343,7 +343,7 @@ Socket::Status TcpSocket::send(Packet& packet)
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
// Send the data block // Send the data block
std::size_t sent; std::size_t sent;
Status status = send(blockToSend.data() + packet.m_sendPos, static_cast<priv::SocketImpl::Size>(blockToSend.size() - packet.m_sendPos), sent); Status status = send(m_blockToSendBuffer.data() + packet.m_sendPos, static_cast<priv::SocketImpl::Size>(m_blockToSendBuffer.size() - packet.m_sendPos), sent);
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#pragma GCC diagnostic pop #pragma GCC diagnostic pop