generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 18:20:26 +01:00
Code Issues Projects Releases Wiki Activity

fix(Net): Non-blocking sockets support #4773

Browse Source
This commit is contained in:
Günter Obiltschnig 2024-11-16 16:48:48 +01:00
parent cb91880bfb
commit 5d69308bfd
4 changed files with 93 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Net/src/SocketImpl.cpp
View File

@ -361,8 +361,10 @@ void SocketImpl::checkBrokenTimeout(SelectMode mode)
int SocketImpl::sendBytes(const void* buffer, int length, int flags) int SocketImpl::sendBytes(const void* buffer, int length, int flags)
{ {
checkBrokenTimeout(SELECT_WRITE); if (_blocking)
{
checkBrokenTimeout(SELECT_WRITE);
}
int rc; int rc;
do do
{ {
@ -370,15 +372,26 @@ int SocketImpl::sendBytes(const void* buffer, int length, int flags)
rc = ::send(_sockfd, reinterpret_cast<const char*>(buffer), length, flags); rc = ::send(_sockfd, reinterpret_cast<const char*>(buffer), length, flags);
} }
while (_blocking && rc < 0 && lastError() == POCO_EINTR); while (_blocking && rc < 0 && lastError() == POCO_EINTR);
if (rc < 0) error(); if (rc < 0)
{
int err = lastError();
if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err);
else
error(err);
}
return rc; return rc;
} }
int SocketImpl::sendBytes(const SocketBufVec& buffers, int flags) int SocketImpl::sendBytes(const SocketBufVec& buffers, int flags)
{ {
checkBrokenTimeout(SELECT_WRITE); if (_blocking)
{
checkBrokenTimeout(SELECT_WRITE);
}
int rc = 0; int rc = 0;
do do
{ {
@ -395,15 +408,26 @@ int SocketImpl::sendBytes(const SocketBufVec& buffers, int flags)
#endif #endif
} }
while (_blocking && rc < 0 && lastError() == POCO_EINTR); while (_blocking && rc < 0 && lastError() == POCO_EINTR);
if (rc < 0) error(); if (rc < 0)
{
int err = lastError();
if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err);
else
error(err);
}
return rc; return rc;
} }
int SocketImpl::receiveBytes(void* buffer, int length, int flags) int SocketImpl::receiveBytes(void* buffer, int length, int flags)
{ {
checkBrokenTimeout(SELECT_READ); if (_blocking)
{
checkBrokenTimeout(SELECT_READ);
}
int rc; int rc;
do do
{ {
@ -414,7 +438,7 @@ int SocketImpl::receiveBytes(void* buffer, int length, int flags)
if (rc < 0) if (rc < 0)
{ {
int err = lastError(); int err = lastError();
if (err == POCO_EAGAIN && !_blocking) if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
; ;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT) else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err); throw TimeoutException(err);
@ -427,8 +451,10 @@ int SocketImpl::receiveBytes(void* buffer, int length, int flags)
int SocketImpl::receiveBytes(SocketBufVec& buffers, int flags) int SocketImpl::receiveBytes(SocketBufVec& buffers, int flags)
{ {
checkBrokenTimeout(SELECT_READ); if (_blocking)
{
checkBrokenTimeout(SELECT_READ);
}
int rc = 0; int rc = 0;
do do
{ {
@ -448,7 +474,7 @@ int SocketImpl::receiveBytes(SocketBufVec& buffers, int flags)
if (rc < 0) if (rc < 0)
{ {
int err = lastError(); int err = lastError();
if (err == POCO_EAGAIN && !_blocking) if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
; ;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT) else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err); throw TimeoutException(err);
@ -476,7 +502,7 @@ int SocketImpl::receiveBytes(Poco::Buffer<char>& buffer, int flags, const Poco::
if (rc < 0) if (rc < 0)
{ {
int err = lastError(); int err = lastError();
if (err == POCO_EAGAIN && !_blocking) if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
; ;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT) else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err); throw TimeoutException(err);
@ -502,7 +528,16 @@ int SocketImpl::sendTo(const void* buffer, int length, const SocketAddress& addr
#endif #endif
} }
while (_blocking && rc < 0 && lastError() == POCO_EINTR); while (_blocking && rc < 0 && lastError() == POCO_EINTR);
if (rc < 0) error(); if (rc < 0)
{
int err = lastError();
if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err);
else
error(err);
}
return rc; return rc;
} }
@ -534,7 +569,16 @@ int SocketImpl::sendTo(const SocketBufVec& buffers, const SocketAddress& address
#endif #endif
} }
while (_blocking && rc < 0 && lastError() == POCO_EINTR); while (_blocking && rc < 0 && lastError() == POCO_EINTR);
if (rc < 0) error(); if (rc < 0)
{
int err = lastError();
if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err);
else
error(err);
}
return rc; return rc;
} }
@ -556,7 +600,10 @@ int SocketImpl::receiveFrom(void* buffer, int length, SocketAddress& address, in
int SocketImpl::receiveFrom(void* buffer, int length, struct sockaddr** ppSA, poco_socklen_t** ppSALen, int flags) int SocketImpl::receiveFrom(void* buffer, int length, struct sockaddr** ppSA, poco_socklen_t** ppSALen, int flags)
{ {
checkBrokenTimeout(SELECT_READ); if (_blocking)
{
checkBrokenTimeout(SELECT_READ);
}
int rc; int rc;
do do
{ {
@ -567,7 +614,7 @@ int SocketImpl::receiveFrom(void* buffer, int length, struct sockaddr** ppSA, po
if (rc < 0) if (rc < 0)
{ {
int err = lastError(); int err = lastError();
if (err == POCO_EAGAIN && !_blocking) if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
; ;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT) else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err); throw TimeoutException(err);
@ -595,7 +642,10 @@ int SocketImpl::receiveFrom(SocketBufVec& buffers, SocketAddress& address, int f
int SocketImpl::receiveFrom(SocketBufVec& buffers, struct sockaddr** pSA, poco_socklen_t** ppSALen, int flags) int SocketImpl::receiveFrom(SocketBufVec& buffers, struct sockaddr** pSA, poco_socklen_t** ppSALen, int flags)
{ {
checkBrokenTimeout(SELECT_READ); if (_blocking)
{
checkBrokenTimeout(SELECT_READ);
}
int rc = 0; int rc = 0;
do do
{ {
@ -624,7 +674,7 @@ int SocketImpl::receiveFrom(SocketBufVec& buffers, struct sockaddr** pSA, poco_s
if (rc < 0) if (rc < 0)
{ {
int err = lastError(); int err = lastError();
if (err == POCO_EAGAIN && !_blocking) if (!_blocking && (err == POCO_EAGAIN || err == POCO_EWOULDBLOCK))
; ;
else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT) else if (err == POCO_EAGAIN || err == POCO_ETIMEDOUT)
throw TimeoutException(err); throw TimeoutException(err);

2
Net/src/StreamSocketImpl.cpp
View File

@ -61,7 +61,7 @@ int StreamSocketImpl::sendBytes(const void* buffer, int length, int flags)
while (remaining > 0) while (remaining > 0)
{ {
int n = SocketImpl::sendBytes(p, remaining, flags); int n = SocketImpl::sendBytes(p, remaining, flags);
poco_assert_dbg (n >= 0); poco_assert_dbg (!blocking || n >= 0);
p += n; p += n;
sent += n; sent += n;
remaining -= n; remaining -= n;

22
Net/testsuite/src/SocketTest.cpp
View File

@ -67,6 +67,27 @@ void SocketTest::testEcho()
} }
void SocketTest::testPeek()
{
EchoServer echoServer;
StreamSocket ss;
ss.connect(SocketAddress("127.0.0.1", echoServer.port()));
int n = ss.sendBytes("hello, world!", 13);
assertTrue (n == 13);
char buffer[256];
n = ss.receiveBytes(buffer, 5, MSG_PEEK);
assertTrue (n == 5);
assertTrue (std::string(buffer, n) == "hello");
n = ss.receiveBytes(buffer, sizeof(buffer), MSG_PEEK);
assertTrue (n == 13);
assertTrue (std::string(buffer, n) == "hello, world!");
n = ss.receiveBytes(buffer, sizeof(buffer));
assertTrue (n == 13);
assertTrue (std::string(buffer, n) == "hello, world!");
ss.close();
}
void SocketTest::testMoveStreamSocket() void SocketTest::testMoveStreamSocket()
{ {
EchoServer echoServer; EchoServer echoServer;
@ -679,6 +700,7 @@ CppUnit::Test* SocketTest::suite()
CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SocketTest"); CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("SocketTest");
CppUnit_addTest(pSuite, SocketTest, testEcho); CppUnit_addTest(pSuite, SocketTest, testEcho);
CppUnit_addTest(pSuite, SocketTest, testPeek);
CppUnit_addTest(pSuite, SocketTest, testMoveStreamSocket); CppUnit_addTest(pSuite, SocketTest, testMoveStreamSocket);
CppUnit_addTest(pSuite, SocketTest, testPoll); CppUnit_addTest(pSuite, SocketTest, testPoll);
CppUnit_addTest(pSuite, SocketTest, testAvailable); CppUnit_addTest(pSuite, SocketTest, testAvailable);

1
Net/testsuite/src/SocketTest.h
View File

@ -25,6 +25,7 @@ public:
~SocketTest() override; ~SocketTest() override;
void testEcho(); void testEcho();
void testPeek();
void testMoveStreamSocket(); void testMoveStreamSocket();
void testPoll(); void testPoll();
void testAvailable(); void testAvailable();