generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 19:51:58 +01:00
Code Issues Projects Releases Wiki Activity

Use PollSet in SocketReactor #2092 (linux)

Browse Source
This commit is contained in:
Alex Fabijanic
2018-04-26 19:17:49 -05:00
parent 6912384422
commit ea38cdb740
4 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Net/src/PollSet.cpp
View File

@@ -72,7 +72,8 @@ public:
{ {
Poco::FastMutex::ScopedLock lock(_mutex); Poco::FastMutex::ScopedLock lock(_mutex);
poco_socket_t fd = socket.impl()->sockfd(); SocketImpl* sockImpl = socket.impl();
poco_socket_t fd = sockImpl->sockfd();
struct epoll_event ev; struct epoll_event ev;
ev.events = 0; ev.events = 0;
if (mode & PollSet::POLL_READ) if (mode & PollSet::POLL_READ)
@@ -83,9 +84,15 @@ public:
ev.events |= EPOLLERR; ev.events |= EPOLLERR;
ev.data.ptr = socket.impl(); ev.data.ptr = socket.impl();
int err = epoll_ctl(_epollfd, EPOLL_CTL_ADD, fd, &ev); int err = epoll_ctl(_epollfd, EPOLL_CTL_ADD, fd, &ev);
if (err) SocketImpl::error();
_socketMap[socket.impl()] = socket; if (err)
{
if (errno == EEXIST) update(socket, mode);
else SocketImpl::error();
}
if (_socketMap.find(sockImpl) == _socketMap.end())
_socketMap[sockImpl] = socket;
} }
void remove(const Socket& socket) void remove(const Socket& socket)

32
Net/src/SocketReactor.cpp
View File

@@ -61,19 +61,6 @@ SocketReactor::~SocketReactor()
} }
bool SocketReactor::hasSocketHandlers()
{
ScopedLock lock(_mutex);
for (EventHandlerMap::iterator it = _handlers.begin(); it != _handlers.end(); ++it)
{
if (it->second->accepts(_pReadableNotification) ||
it->second->accepts(_pWritableNotification) ||
it->second->accepts(_pErrorNotification)) return true;
}
return false;
}
void SocketReactor::run() void SocketReactor::run()
{ {
_pThread = Thread::current(); _pThread = Thread::current();
@@ -97,13 +84,13 @@ void SocketReactor::run()
PollSet::SocketModeMap::iterator end = sm.end(); PollSet::SocketModeMap::iterator end = sm.end();
for (; it != end; ++it) for (; it != end; ++it)
{ {
if ((it->second & PollSet::POLL_READ) != 0) if (it->second & PollSet::POLL_READ)
{ {
dispatch(it->first, _pReadableNotification); dispatch(it->first, _pReadableNotification);
readable = true; readable = true;
} }
if ((it->second & PollSet::POLL_WRITE) != 0) dispatch(it->first, _pWritableNotification); if (it->second & PollSet::POLL_WRITE) dispatch(it->first, _pWritableNotification);
if ((it->second & PollSet::POLL_ERROR) != 0) dispatch(it->first, _pErrorNotification); if (it->second & PollSet::POLL_ERROR) dispatch(it->first, _pErrorNotification);
} }
} }
if (!readable) onTimeout(); if (!readable) onTimeout();
@@ -126,6 +113,19 @@ void SocketReactor::run()
} }
bool SocketReactor::hasSocketHandlers()
{
ScopedLock lock(_mutex);
for (EventHandlerMap::iterator it = _handlers.begin(); it != _handlers.end(); ++it)
{
if (it->second->accepts(_pReadableNotification) ||
it->second->accepts(_pWritableNotification) ||
it->second->accepts(_pErrorNotification)) return true;
}
return false;
}
void SocketReactor::stop() void SocketReactor::stop()
{ {
_stop = true; _stop = true;

13
Net/testsuite/src/SocketReactorTest.cpp
View File

@@ -50,11 +50,13 @@ namespace
_reactor(reactor) _reactor(reactor)
{ {
_reactor.addEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable)); _reactor.addEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable));
_reactor.addEventHandler(_socket, Observer<EchoServiceHandler, ShutdownNotification>(*this, &EchoServiceHandler::onShutdown));
} }
~EchoServiceHandler() ~EchoServiceHandler()
{ {
_reactor.removeEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable)); _reactor.removeEventHandler(_socket, Observer<EchoServiceHandler, ReadableNotification>(*this, &EchoServiceHandler::onReadable));
_reactor.removeEventHandler(_socket, Observer<EchoServiceHandler, ShutdownNotification>(*this, &EchoServiceHandler::onShutdown));
} }
void onReadable(ReadableNotification* pNf) void onReadable(ReadableNotification* pNf)
@@ -66,11 +68,12 @@ namespace
{ {
_socket.sendBytes(buffer, n); _socket.sendBytes(buffer, n);
} }
else }
{
_socket.shutdownSend(); void onShutdown(ShutdownNotification* pNf)
delete this; {
} pNf->release();
delete this;
} }
private: private: