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

enh(Net): add PollSet::size(); mark PollSet::count() as deprecated

Browse Source
This commit is contained in:
Günter Obiltschnig 2024-11-17 22:16:52 +01:00
parent c386bba27c
commit 2815ea45a9
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Net/include/Poco/Net/PollSet.h
View File

@ -93,6 +93,14 @@ public:
bool empty() const;
/// Returns true if no socket is registered for polling.
std::size_t size() const;
/// Returns the number of sockets monitored.
//@ deprecated
int count() const;
/// Returns the number of sockets monitored.
/// This method is deprecated. Use size() instead.
void clear();
/// Removes all sockets from the PollSet.
@ -102,14 +110,12 @@ public:
/// Returns a PollMap containing the sockets that have had
/// their state changed.
int count() const;
/// Returns the number of sockets monitored.
void wakeUp();
/// Wakes up a waiting PollSet.
/// Any errors that occur during this call are ignored.
/// On platforms/implementations where this functionality
/// is not available, it does nothing.
private:
PollSetImpl* _pImpl;

24
Net/src/PollSet.cpp
View File

@ -167,7 +167,7 @@ public:
while (true)
{
Poco::Timestamp start;
rc = epoll_wait(_epollfd, &_events[0], static_cast<int>(_events.size()), static_cast<int>(remainingTime.totalMilliseconds()));
rc = epoll_wait(_epollfd, _events.data(), static_cast<int>(_events.size()), static_cast<int>(remainingTime.totalMilliseconds()));
if (rc == 0)
{
if (keepWaiting(start, remainingTime)) continue;
@ -242,10 +242,10 @@ public:
#endif
}
int count() const
std::size_t size() const
{
ScopedLock lock(_mutex);
return static_cast<int>(_socketMap.size());
return _socketMap.size();
}
private:
@ -454,7 +454,7 @@ public:
do
{
Poco::Timestamp start;
rc = ::poll(&_pollfds[0], _pollfds.size(), remainingTime.totalMilliseconds());
rc = ::poll(_pollfds.data(), _pollfds.size(), remainingTime.totalMilliseconds());
if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
{
Poco::Timestamp end;
@ -505,10 +505,10 @@ public:
_pipe.writeBytes(&c, 1);
}
int count() const
std::size_t size() const
{
Poco::FastMutex::ScopedLock lock(_mutex);
return static_cast<int>(_socketMap.size());
return _socketMap.size();
}
private:
@ -669,10 +669,10 @@ public:
// TODO
}
int count() const
std::size_t size() const
{
Poco::FastMutex::ScopedLock lock(_mutex);
return static_cast<int>(_map.size());
return _map.size();
}
private:
@ -740,7 +740,13 @@ PollSet::SocketModeMap PollSet::poll(const Poco::Timespan& timeout)
int PollSet::count() const
{
return _pImpl->count();
return static_cast<int>(_pImpl->size());
}
std::size_t PollSet::size() const
{
return _pImpl->size();
}