sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/CallOnExit: Rework to use template instead of std::function

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-01-23 00:16:09 +01:00
parent 29786765c6
commit 2ebcddf9de
5 changed files with 85 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/Nazara/Network/TcpClient.cpp
View File

@@ -45,15 +45,11 @@ namespace Nz
Disconnect();
Open(remoteAddress.GetProtocol());
CallOnExit restoreBlocking;
CallOnExit restoreBlocking([this] { SocketImpl::SetBlocking(m_handle, true); });
if (m_isBlockingEnabled)
{
SocketImpl::SetBlocking(m_handle, false);
restoreBlocking.Reset([this] ()
{
SocketImpl::SetBlocking(m_handle, true);
});
}
else
restoreBlocking.Reset();
SocketState state = SocketImpl::Connect(m_handle, remoteAddress, &m_lastError);
m_peerAddress = (state != SocketState::NotConnected) ? remoteAddress : IpAddress::Invalid;
@@ -363,14 +359,13 @@ namespace Nz
std::size_t totalByteSent = 0;
CallOnExit updateSent;
if (sent)
CallOnExit updateSent([sent, &totalByteSent]
{
updateSent.Reset([sent, &totalByteSent] ()
{
*sent = totalByteSent;
});
}
*sent = totalByteSent;
});
if (!sent)
updateSent.Reset();
while (totalByteSent < size || !IsBlockingEnabled())
{
@@ -582,15 +577,11 @@ namespace Nz
{
NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Invalid handle");
CallOnExit restoreBlocking;
if (!m_isBlockingEnabled)
{
SocketImpl::SetBlocking(m_handle, true);
restoreBlocking.Reset([this] ()
{
SocketImpl::SetBlocking(m_handle, false);
});
}
CallOnExit restoreBlocking([this] { SocketImpl::SetBlocking(m_handle, true); });
if (m_isBlockingEnabled)
SocketImpl::SetBlocking(m_handle, false);
else
restoreBlocking.Reset();
std::size_t received;
if (!Receive(buffer, size, &received))
@@ -630,15 +621,11 @@ namespace Nz
NazaraAssert(buffer, "Invalid buffer");
NazaraAssert(m_handle != SocketImpl::InvalidHandle, "Invalid handle");
CallOnExit restoreBlocking;
if (!m_isBlockingEnabled)
{
SocketImpl::SetBlocking(m_handle, true);
restoreBlocking.Reset([this] ()
{
SocketImpl::SetBlocking(m_handle, false);
});
}
CallOnExit restoreBlocking([this] { SocketImpl::SetBlocking(m_handle, true); });
if (m_isBlockingEnabled)
SocketImpl::SetBlocking(m_handle, false);
else
restoreBlocking.Reset();
std::size_t sent;
if (!Send(buffer, size, &sent))