mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-01 09:24:55 +02:00

* Enable unit test in cmake build * add BLOB SQLite test * accept notifications by name (if they have one) * catch std::exception on parsing * fix a leak, add some table features * few PostgreSQL fixes * GH #2351: WebSocket docs * Rename pcre internal symbols used by Poco to avoid symbol collision https://github.com/pocoproject/poco/issues/2916 This patch was backported from https://github.com/pld-linux/poco/blob/master/pcre.patch * Fix warning in clang * Fix MSVC clang build fail * Zip and SevenZip do not depend on Util, XML, JSON * Added Test and new Pattern 'O' to only log the Filename not the full Path. * Updated Comment * Configuration to receive OCSP stapling response for client connections and callback implementation to verify the response if the server returns any response * removed SDK version from project files * run Application::initialize() in try-catch block * fix Invalid condition [ICMPv4PacketImpl.cpp:234] #2783 * style fixes for #2935; check OpenSSL version * Fixed issue 2945 (#2946) * Fixed #2945 * Added unit tests for #2945 * Dissalow iterator on empty Var (#2945) * Updated unit tests for #2945 * More concise unit tests for #2945 * Removed some more clutter (#2945) * NetSSL_Win: fix potential endless loop due to wrong error handling * fixed GH #2970: Poco::Data::TypeHandler<Poco::Nullable<T>>::prepare() must prepare with underlying type, not Poco::Data::Keywords::null * Fixed linking with Data ODBC error on some platforms * Fix set padding call for new versions of OpenSSL * PatternFormatter priorityNames fix * PKCS12Container: fix memory leaks on exceptions * Fix constness of URI::getPathSegments * Fix typo in the ThreadPool's docs * cmake: use GNUInstallDirs * Changed EventHandlerMap key (#3116) * Changed EventHandlerMap key Changed EventHandlerMap key from Socket to poco_socket_t to avoid errors in removing/access EventHandlerMap when for example we make an SSL handshake * Changed EventHandlerMap key Changed EventHandlerMap key from Socket to poco_socket_t to avoid errors in removing/access EventHandlerMap when for example we make an SSL handshake * avoid too much call to sockfd() and impl() * Fix configuration error while cross compiling (#3127) During the configuration phase in a cross compilation scenario, `include(InstallRequiredSystemLibraries)` fails even if `MSVC_REDIST_DIR` is provided. This should not be an hard error, in case someone wants to compile/use the library, and not package it. As explained on https://reviews.llvm.org/D41220, the most sensible fix is to include `InstallRequiredSystemLibraries` only on a Windows host. * crash when remove key from JSON::Object(JSON_PRESERVE_KEY_ORDER). (#3151) * #3153: Poco::Data::ODBC [N]VARCHAR(MAX) wrong maxDataSize() result * [SharedPtr] Poco::makeSharedArray #3200 * #3202: JWT: ESxxx signature must include padding for ECDSA R and S values * feat(HashRange): port HashRange from boost * chore(cmake): spelling typo fix * fix(hashRange): change function names casing * merge changes from 1.10.2 * formatting * merge JSON formatting changes from 1.10.2 * added Application::windowSize() * RemoteSyslogChannel/RemoteSyslogListener: make UDP buffer size configurable * merge fix from 1.10.2 * merge Postgres fixes from 1.10.2 * #2993: The Sec-WebSocket-Key of WebSocket is always the same one * formatting * #2927 * remove HowToGetHelp page due to outdated information * formatting * #3044: Upgrade PCRE to 8.44 * #3086: Use POCO_IOS_INIT_HACK for Linux in combination with libc++ * #3095: Digest proxy authentication does not work in 1.10.1 * #3136: Fixed null character issue when parsing a JSON * #3114: Added JSON Array::empty() method * #3230: ECDSADigestEngine: include missing header * fix include order * include order * fix(PollSet): #3248 #3249 * chore(UDPServer): fix spelling * feat(SocketReactor): extract and expose poll() as a member function * feat(Endpoint): add Endpoint (socket address directly wrapping native structures) * fix(Endpoint): osx build, align family enum with patform, some other adjustments * fix(EndpointTest): add missing include * feat(Endpoint): add some low-level accessors * feat(IPAddress): add functions returning addres as raw bytes * feat(DatagramSocket): DatagramSocket does not allow IPV6_V6ONLY #3283 * feat(SocketReactor): Add completion handling to SocketReactor #3290 * feat(SocketReactor): Add completion handling to SocketReactor #3290 (add scheduled handlers and runOne()) * chore(Net-testsuite): fix some tests warnings * feat: move semantics for sockets and addresses * fix(NetworkInterface): Unterminated string possible in NetworkInterfaceImpl::setPhyParams() #3301 * feat(Net): Add move semantics to Net (sockets and addresses) #3296 * fix(HostEntry): DNS HostEntry returns multiple entries #3303 * fix(SocketReactor): completion handling fixes and tests, separation of i/o and completion mutexes * feat(SocketReactor): execute permanent completion handlers on when there are I/O handlers and the expired ones whenever they expire * feat(Socket): expose lastError() * fix(SocketReactor): windows compile * windows fixes, remove Endnpoint * feat(Socket): expose error() * feat(PollSet): Use select() on windows for PollSet #3339 * add ci.yml * fix compile errors * revert(SocketReactor): back to devel branch * feat(SocketProactor): initial version w/ completion handler and executor * chore(SocketProactor): Sockets package * chore(ci): add dir and run script * feat(SocketProactor): add socket error handling #3357 * modify(SocketProactor): wait for completion handlers availability #3357 * feat(PollSet): Make PollSet::poll() interruptible #3359 * modify(SocketProactor): make addSend() public #3357 * modify(SocketProactor): platform non-interrupt sleep without Poco thread #3357 * modify(SocketProactor): allow restart #3357 * fix(SocketProactor): windows fixes and VS build * fix(SocketProactor): race when stop() is called before run() * fix(Socket): Windows SO_REUSEADDR is neither reliable nor safe #3380 * fix(SocketProactor): rvalue refs should not be const * fix(DNS): DNS::hostByAddress not thread-safe #3381 * chore(SocketProactor): remove unnecessary this capture * fix(IPAddress): IPAddress::tryParse does not work for :: #3385 * fix(SoccketProactor): add some try/catch safety nets; broaden the work list mutex coverage to protect all function access * fix(SocketProactor): use Poco::Mutex only * fix(SocketProactor): scheduled work skipped in the absence of socket events * fix(SocketProactor): test * chore (SocketProactor): add some state members * Fix clang linker problem by defining POCO_NO_AUTOMATIC_LIBS (#3177) * Dev/devel 1.12.0 (#3585) * fix(PollSet): #3248 #3249 * bump version to 1.11.0 * updated changelog| * #3299: NetSSL: Allow per-Context InvalidCertificateHandler * #3022: Process::isRunning(PID pid) causes handle leak on Windows * #3022: fix for WinCE * upgrade bundled pdjson to latest master * update build configs - add support for Apple Silicon * #2906, #2904: Support environments without hardware floating point * #3130: fix error handling: report original error before close() * #3107: remove unused variable * #3219: SMTPClientSession: invalid SMTP command if empty recipients list in MailMessage * Poco::trim*() code cleanup - use ptrdiff_t instead of int; additional test cases * #3182 Poco::Process:launch on MacOS BigSur: limit maximum number of file descriptors to close before exec() to 100000 * #3278: Fixing no hardware floating point support - Part II * #3090: Do not initialize value with undefined behavior * #3163: Correct Var::parse null value * #3196: std::forward for Poco::Optional ctor with rvalue * #3068: Documented ENABLE_JWT option * #3041: PostgreSQL and TEXT column type * #3099: Fixed Postgres extraction into Dynamic::Var * #3138: Add support of arch riscv32 * #2825: riscv: Enable double operations when using double float abi * #3166: Fix PostgresSQL BLOB extractor * #3237: An error in the documentation for Poco/JSON/Parser.h * #3193: ServerApplication::registerService() unquoted path security vulnerability * #3266: Order of Util::Application::uninitialize() is not in reverse as documented * #3215: XML parser returns item from different element in a array * #3282: Update constant in setContentType documentation * #3089: HTTPSessionFactory does not support HTTPClientSession::ProxyConfig * #2418: SecureServerSocket doesn't work with IpV6 * fix warnings * #3019: ObjectPool wait on borrow condition fix * #3224: Remove SSL23 support from Poco/Crypto * #3191: Fixing a bug in the NetSSL_Win module (Host name verification failed error) * disallow SSLv3 * #3269: Poco::Net::Context initialization with empty certificateFile * #3307: Poco::Crypto::X509Certificate: obtain certificate fingerprint * #3260: Memory leak in EVPPKey::loadKey used with files & wrong password * #3157: fix(openssl): add missing dependency to OpenSSL components * #3066: CMake warning about MYSQL casing * #3135: Poco::Data::SQLite::Utility::fileToMemory unsuccessful if journal exists * #3217: CMake: warning message with -DPOCO_STATIC confusing * #3274: Fix localtime_r for VxWorks 6.9 and later * #2746, #3169: Fix race condition on TCPServerDispatcher stop * #3092: add more detailed error description when LoadLibrary fails| * #3074: Fix sessions may not return back to the pool * #3309: optimize parsing from stream (no copying of entire JSON to memory); limit maximum depth to avoid stack overflow with malicious documents (fuzzing - #3285); code cleanup * JSON Parser performance improvements * #3310: Upgrade bundled SQLite to 3.35.5 * fix UB/bad cast in TCPServerTest.cpp * add comment regarding potential UB in AnyTest::testCastToReference() * support sanitizers in build configs * bump version * fix 'catching polymorphic type by value' warnings * fix 'catching polymorphic type by value' warnings * fix 'catching polymorphic type by value' warnings * remove failing Android build; add sanitizer builds * update postgres version * fix warning * fix warning * add GitHub workflow * fix ci.yml * fix ci.yml * additional ci builds * fix ci.yml for macos and windows * fix(double-conversion): Upgrade bundled double-conversion #3313 * ci fixes * #3314: NetSSL_OpenSSL: any.pem certificate error: ca md too weak * testReuseSession: remove bad checks for session reuse * investigate failing test * investigate failing test * investigate failing test * investigate failing test * ci * remove travis and appveyor * ci, readme * ci fixes * fix ci * fix ci * fix ci * fix memory leak when ignoring test error/failure * fix ci * don't define UNREACHABLE as poco_bugcheck as it triggers 'control reaches end of non-void function' warning * add Linux cross build, build Data libs on macos * fix ci * add MySQL include/lib search paths for Homebrew * ci fixes * ci fixes * ci fixes * ci fixes * fix indluce paths for brew mysql * #3317: Data::MySQL MySQL headers and library search paths * fix ARM-Linux build config * fix MySQL.make * update FindMySQL.cmake * fix(SocketReactor): fix dataCollection test * chore: remove troubleshooting help leftovers * #3302: MSVC: Poco hides warnings (C4996) for the C++14 attribute [[deprecated]] * fix potential crash in testAsyncNotify: don't delete event object while async notification is still in progress * fix(PollSetTest): change connect to blocking * added ActiveRecord library and compiler * added dependencies file * update copyright dates * ActiveRecord: project files and fixes for MSVC * ci: enable ActiveRecord on Windows * fix(PollSetTest): remove poll timing check (fails on msvc ci) * fix ActiveRecord CMake build and configuration * feat(build): add gen directory (for generated sources) and macchina lib link dirs (if needed) * #3318: Data: Support Poco::UUID for data binding * ODBC tests for UUID, updated ActiveRecord projects * ActiveRecord user guide * update ActiveRecord documentation * documentation fixes * #3321: manually merge ODBC text encoding support * CppParser: merge changes from internal repository * updated Makefile * AbstractObserver::accepts() - add optional name parameter * fix SharedPtr::makeSharedArray() [merge from devel] * remove blank line * #2895, #2935: support OCSP stapling * style * clang support (merge from devel) * #3322: remove useless struct * link libmariadb instead of libmysql if headers indicate MariaDB * fix nullptr passed to memcmp/memcpy reported by ubsan * fix nullptr passed to memcmp/memcpy reported by ubsan * fix PageCompiler cross-compile; fix Content-Security-Policy header * remove Data release notes page * style, remove unused var * update docs * improve BLOB handling, clean-up code * fix(ICMPv4Packet): [asan] Undefined behavior in ICMPv4PacketImpl.cpp #3326 * fix(NumericString): Bug in NumericString with decSep != '.' #3159 * fix(HostEntry): DNS HostEntry returns multiple entries #3303 * fix(PollSet): #3248 #3249 * fix(NetworkInterface): Unterminated string possible in NetworkInterfaceImpl::setPhyParams() #3301 * style/whitespace * fix warnings * add version resources to executables * style * whitespace * update changelog * cpproj: also copy testsuite/include if it's there * branch off 1.11.1 * #3335: XML error when build 1.11.0 * #3353: add POCO_NO_FORK_EXEC CMake option * #3381: DNS::hostByAddress not thread-safe * #3400: fix std::localtime not thread safe * #3221: Crash reported on Windows in X509Certificate verification * #3344: [bug] MacOS bundle destination path is not set * #3360: Add POCO_PGSQL_{INCLUDE,LIB} variables * #3363: Fixed compilation error with MongoDB::Connection and Util::Application * #3377: Correct Poco::Path::configHome() and dataHome() documentation for Windows * #2823: error: implicit conversion from 'int' to 'float' changes value from 2147483647 to 2147483648 * #3425: Fixed suspend/resumeEvents pair in DirectoryWatcher * #2966: SocketReactor loads one core of CPU up to 100% * #3330: Poco::Data::ODBC::ODBCStatementImpl causes crash * use OpenSSL 1.1.1 on macOS * add missing include search path * upgrade bundled PCRE to 8.45 * upgrade bundled SQLite to 3.36.0 * updated changelog * fix brew OpenSSL version * branch off poco-1.11.2 * #3506: Upgrade bundled expat to 2.4.4 * manually merge #3448, part 1 (Crypto) * manually merge #3448, part 1 (NetSSL) * #3515: NetSSL_OpenSSL Testsuite: testInterop() and testProxy() fail due to changed certificate * #3448: fix version check * #3465: NetSSL_Win: bad error handling when decodeMessage() fails * #3458: encryptString() crash on redhat/centos 8 with FIPS enabled using md5 default digest * #3505: JSON::PrintHandler.value(bool) prints incorrect value * #3527: Upgrade bundled expat to 2.4.5 * #3470: bug in JSON ParseHandler.cpp (RFC 7159 should be valid) * #3507: Reference counting for bound configuration in Util::Option is broken * #3518: Expat version check in #defines incorrect * #3338: NamedMutex does not work on Linux distributions where fs.protected_regular=1 * CI: don't build PageCompiler in ARM cross build * detect ARM64 on Windows * updated README.md * ProGen: support generation of VS 2022 project files * ci: add windows 2022 * fix library name * remove unused CppUnit headers * added VS2022 project files * #3530: Upgrade bundled expat to 2.4.6 * #3538: Upgrade bundled expat to 2.4.7 * Add back NIOS2 double conversion detection to fix compile errors The commit558324f672
removed the nios2 support, which was originally added ine7b91e8125
This commit add it back. Signed-off-by: Julien Olivain <ju.o@free.fr> * #3466: DefinePlatformSpecific.cmake: handle RelWithDebInfo and MinSizeRel configurations * #3524: remove XML and Util dependencies in Zip/SevenZip * #3483: Adds Windows 11 and Server 2022 to Environment::osDisplayName() * #3495: Array::operator[] should not throw * #3268: Poco redis command set have a bug when you want to set nx ex or expireTime * #3509: fix dst and utcOffset handling for Dublin time zone * #2882: another attempt at fixing it that should also work on other platforms * remove unused method in Timezone_WIN32.cpp * use tm_gmtoff on Linux * Basic support for OpenSSL 3.0.0 (#3448) * updated README.md * Create close-inactive-issues.yml * check return codes of EVP_CIPHER_CTX_new and EVP_CipherInit Especially with OpenSSL 3, it is possible that EVP_CipherInit may fail even when passed a non-null cipher[1]. Without the checking, it will finally get to a segfault. [1] https://github.com/openssl/openssl/issues/16864 * Automatically load default and legacy providers with OpenSSL 3 Without the legacy provider [1], some ciphers are not available. For example, the 'des-ecb' one used by test sutie is missed and the test will fail. [1] OSSL_PROVIDER-LEGACY(7ossl) * Make p12 ca order the same as pem OpenSSL < 3 returns p12 ca order in reversed order. This is fixed in OpenSSL 3. We work around it with old OpenSSL. See: https://github.com/openssl/openssl/issues/16421 https://github.com/openssl/openssl/pull/12641f5eb85eb0f
* Implement SSL abort handling on OpenSSL 3 On an unexpected EOF, versions before OpenSSL 3.0 returned SSL_ERROR_SYSCALL, nothing was added to the error stack, and errno was 0. Since OpenSSL 3.0 the returned error is SSL_ERROR_SSL with a meaningful error on the error stack.[1] [1] SSL_GET_ERROR(3ossl) Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com> Co-authored-by: Robin Lee <cheeselee@fedoraproject.org> Co-authored-by: Aleksandar Fabijanic <aleks-f@users.noreply.github.com> * fix(Socket): shutdown fixes from pull #3448 * #3500: Sandbox all iFrames in PocoDoc * #3549; replace assert with assertTrue * #3553: Upgrade bundled zlib to 1.2.12 * #3525: Bad management of file in case of OpenSSLException in X509Certificate::readPEM and X509Certificate::writePEM * disable OpenSSL deprecation warnings * chore: cleanup * fix(X509Certificate): add missing string format * #3559: Poco::Data::PostgreSQL - DateTime extraction truncates fractional seconds * feat(EVP): 3.0 support - add EVPCipher - additional EVPPKey constructors - tests - fix and improve openssl-related exceptions Transition towards 3.0 support; deprecating direct EC and RSA interface portions. * fix(openssl): pre 3.0 compile * feat(Envelope): Add envelope to crypto #3561 * fix(Envelope): mac/clang compile * fix(Any): #3297 #3514 * #3562: fixed OpenSSL setup/shutdown * fix exception text * #3563: Remove support for OpenSSL < 1.0 * ci jobs for OpenSSL 1.1 and 3 * updated CHANGELOG * updated .vscode * Refactor/any soo (#3564) * refactor(Any): SOO - encapsulate data holders - add missing gets and ops - eliminate g++ warnings with enable_if's - default enable SOO * refactor(Placeholder): encapsulate SOO memory management and fix leaks; cf. #3297 #3514 * fix(Placeholder): asan errors and add tests cf. #3297 #3514 * fix(SSLManager): Race condition in SSLManager #3558 * remove unused include * updated copyright date * PocoDoc: fix iframe sandboxing * fix(SHA2Engine): cannot use HMACEngine with SHA2Engine #3421 * refactor(Placeholder): ifdef POCO_NO_SOO only in Placeholder and remove it anywhere else (#3566) * refactor(Placeholder): more SOO consolidation and optimization * fix(FPEnvironment): Visual Studio Warning C4244 #3543 * fix(Extractor): move extraction decoding to AbstractExtractor #3396 * Netssl/openssl3 (#3575) * feat(Context): DH init openssl3 port (1/2 hardcoded params) * create poco-1.11.3 branch, bump version * update copyright date * #3567: check legacy provider existence for legacy exception #3567 * fix(Placeholder): comparison for zero value * feat(Context): DH init openssl3 port (2/2 params from file) * test(HTTPSClientSession): try/catch to understand CI failure * chore(cmake): copy the DH parameters file * fix(OpenSSLInitializer): unload provider on uninitialize * chore(HTTPSClientSessionTest): remove try/catch * fix(OpenSSLInitializer): fix provider unloading * feat(CppUnit): make tests exceptions more descriptive * chore(CppUnit): a more descriptive name for callback Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com> * fix(Foundation): update VS 2019 platform version * chore(Data): update VS project files (add Transcoder #3396) * fix(Data): Poco::Data::ODBC-dbEncoding property not used for insert/update #3396 * fix(Data): add transcoder to Makefile #3396 * fix(JWT): remove duplicate test functions after merge Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com> Co-authored-by: Julien Olivain <ju.o@free.fr> Co-authored-by: Robin Lee <robinlee.sysu@gmail.com> Co-authored-by: Robin Lee <cheeselee@fedoraproject.org> * #2755: Fix MySQL's LONGBLOB/LONGTEXT not allocating enough space (#3474) * Unit test for bug #2755. * Removed condition to set buffer length to 0. * Fixes to unit tests for LONGBLOB/TEXT data type. * Adjusted buffer sizes to accommodate LONGBLOBs. Co-authored-by: Hector Toledo Soto <hsoto@transperfect.com> * fix(Data): MySQL UUID binding temporary string #3587 * feat(CI): add MySQL tests to CI #3588 * fix(CI): remove mysql client dev (using mariadb) #3588 * fix(CI): another shot at mysql * fix(Net/testsuite): add missing include * fix(DatagramSocket): Socket::available does not always return correct value for UDP #3589 * fix(SocketProactor): few improvements (#3357) * fix(ICMPsocketTest): change appinf (doesn't respond to ping) to github * fix(PollSet): windows fixes * fix(PollSet): windows implementation fixes (multi-fd_set select); minor reactor fixes * Extract JSON type as string (#3491) * Declared JSON as string data # Conflicts: # Data/include/Poco/Data/MetaColumn.h # Data/src/RecordSet.cpp # Data/src/StatementImpl.cpp * Added JSON extractor as string * Added unit test * Update comment Co-authored-by: Joerg-Christian Boehme <joerg@chaosdorf.de> Co-authored-by: Günter Obiltschnig <guenter.obiltschnig@appinf.com> Co-authored-by: tbarbier <thomas.barbier@amadeus.com> Co-authored-by: Linquize <linquize@yahoo.com.hk> Co-authored-by: Jan Kevin Dick <fixed-term.jan.dick@de.bosch.com> Co-authored-by: Neelima Patil <neelima.patil@honeywell.com> Co-authored-by: akete <akete@users.noreply.github.com> Co-authored-by: YuriAzathoth <iamkiller@mail.com> Co-authored-by: Jonathan Horvath <byteme@bytedreamer.com> Co-authored-by: Maksim Kita <kitaetoya@gmail.com> Co-authored-by: Alexander Galanin <al@galanin.nnov.ru> Co-authored-by: Thomas Sablik <thomas.sablik@wombytes.de> Co-authored-by: Nikita Migunov <nmigunov@iponweb.net> Co-authored-by: Ben Wolsieffer <benwolsieffer@gmail.com> Co-authored-by: micheleselea <michele.pradella@selea.com> Co-authored-by: Federico Kircheis <federico.kircheis@gmail.com> Co-authored-by: fenghao119 <fenghao119@gmail.com> Co-authored-by: Alex Fabijanic <alex@pocoprojecct.org> Co-authored-by: linquize <linquize2@yahoo.com> Co-authored-by: Julien Olivain <ju.o@free.fr> Co-authored-by: Robin Lee <robinlee.sysu@gmail.com> Co-authored-by: Robin Lee <cheeselee@fedoraproject.org> Co-authored-by: hectots <monkey.instinct@gmail.com> Co-authored-by: Hector Toledo Soto <hsoto@transperfect.com> Co-authored-by: Hernan Martinez <hernan.c.martinez@gmail.com>
920 lines
18 KiB
C++
920 lines
18 KiB
C++
//
|
|
// PollSet.cpp
|
|
//
|
|
// Library: Net
|
|
// Package: Sockets
|
|
// Module: PollSet
|
|
//
|
|
// Copyright (c) 2016, Applied Informatics Software Engineering GmbH.
|
|
// All rights reserved.
|
|
//
|
|
// SPDX-License-Identifier: BSL-1.0
|
|
//
|
|
|
|
|
|
#include "Poco/Net/PollSet.h"
|
|
#include "Poco/Net/SocketImpl.h"
|
|
#include "Poco/Mutex.h"
|
|
#include <set>
|
|
|
|
|
|
#if defined(POCO_HAVE_FD_EPOLL)
|
|
#include <sys/epoll.h>
|
|
#include <sys/eventfd.h>
|
|
#elif defined(POCO_HAVE_FD_POLL)
|
|
#ifndef _WIN32
|
|
#include <poll.h>
|
|
#endif
|
|
#endif
|
|
|
|
|
|
namespace Poco {
|
|
namespace Net {
|
|
|
|
|
|
#if defined(POCO_HAVE_FD_EPOLL)
|
|
|
|
|
|
//
|
|
// Linux implementation using epoll
|
|
//
|
|
class PollSetImpl
|
|
{
|
|
public:
|
|
PollSetImpl(): _epollfd(epoll_create(1)),
|
|
_events(1024),
|
|
_eventfd(eventfd(0, 0))
|
|
{
|
|
int err = addImpl(_eventfd, PollSet::POLL_READ, 0);
|
|
if ((err) || (_epollfd < 0))
|
|
{
|
|
SocketImpl::error();
|
|
}
|
|
}
|
|
|
|
~PollSetImpl()
|
|
{
|
|
if (_epollfd >= 0) ::close(_epollfd);
|
|
if (_eventfd >= 0) ::close(_eventfd);
|
|
}
|
|
|
|
void add(const Socket& socket, int mode)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
SocketImpl* sockImpl = socket.impl();
|
|
|
|
int err = addImpl(sockImpl->sockfd(), mode, sockImpl);
|
|
|
|
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)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
poco_socket_t fd = socket.impl()->sockfd();
|
|
struct epoll_event ev;
|
|
ev.events = 0;
|
|
ev.data.ptr = 0;
|
|
int err = epoll_ctl(_epollfd, EPOLL_CTL_DEL, fd, &ev);
|
|
if (err) SocketImpl::error();
|
|
|
|
_socketMap.erase(socket.impl());
|
|
}
|
|
|
|
bool has(const Socket& socket) const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
SocketImpl* sockImpl = socket.impl();
|
|
return sockImpl &&
|
|
(_socketMap.find(sockImpl) != _socketMap.end());
|
|
}
|
|
|
|
bool empty() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _socketMap.empty();
|
|
}
|
|
|
|
void update(const Socket& socket, int mode)
|
|
{
|
|
poco_socket_t fd = socket.impl()->sockfd();
|
|
struct epoll_event ev;
|
|
ev.events = 0;
|
|
if (mode & PollSet::POLL_READ)
|
|
ev.events |= EPOLLIN;
|
|
if (mode & PollSet::POLL_WRITE)
|
|
ev.events |= EPOLLOUT;
|
|
if (mode & PollSet::POLL_ERROR)
|
|
ev.events |= EPOLLERR;
|
|
ev.data.ptr = socket.impl();
|
|
int err = epoll_ctl(_epollfd, EPOLL_CTL_MOD, fd, &ev);
|
|
if (err)
|
|
{
|
|
SocketImpl::error();
|
|
}
|
|
}
|
|
|
|
void clear()
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
::close(_epollfd);
|
|
_socketMap.clear();
|
|
_epollfd = epoll_create(1);
|
|
if (_epollfd < 0)
|
|
{
|
|
SocketImpl::error();
|
|
}
|
|
}
|
|
|
|
PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
|
|
{
|
|
PollSet::SocketModeMap result;
|
|
Poco::Timespan remainingTime(timeout);
|
|
int rc;
|
|
do
|
|
{
|
|
Poco::Timestamp start;
|
|
rc = epoll_wait(_epollfd, &_events[0], _events.size(), remainingTime.totalMilliseconds());
|
|
if (rc == 0) return result;
|
|
if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
|
|
{
|
|
Poco::Timestamp end;
|
|
Poco::Timespan waited = end - start;
|
|
if (waited < remainingTime)
|
|
remainingTime -= waited;
|
|
else
|
|
remainingTime = 0;
|
|
}
|
|
}
|
|
while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
|
|
if (rc < 0) SocketImpl::error();
|
|
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
for (int i = 0; i < rc; i++)
|
|
{
|
|
if (_events[i].data.ptr) // skip eventfd
|
|
{
|
|
std::map<void *, Socket>::iterator it = _socketMap.find(_events[i].data.ptr);
|
|
if (it != _socketMap.end())
|
|
{
|
|
if (_events[i].events & EPOLLIN)
|
|
result[it->second] |= PollSet::POLL_READ;
|
|
if (_events[i].events & EPOLLOUT)
|
|
result[it->second] |= PollSet::POLL_WRITE;
|
|
if (_events[i].events & EPOLLERR)
|
|
result[it->second] |= PollSet::POLL_ERROR;
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void wakeUp()
|
|
{
|
|
uint64_t val = 1;
|
|
int n = ::write(_eventfd, &val, sizeof(val));
|
|
if (n < 0) Socket::error();
|
|
}
|
|
|
|
int count() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return static_cast<int>(_socketMap.size());
|
|
}
|
|
|
|
private:
|
|
int addImpl(int fd, int mode, void* ptr)
|
|
{
|
|
struct epoll_event ev;
|
|
ev.events = 0;
|
|
if (mode & PollSet::POLL_READ)
|
|
ev.events |= EPOLLIN;
|
|
if (mode & PollSet::POLL_WRITE)
|
|
ev.events |= EPOLLOUT;
|
|
if (mode & PollSet::POLL_ERROR)
|
|
ev.events |= EPOLLERR;
|
|
ev.data.ptr = ptr;
|
|
return epoll_ctl(_epollfd, EPOLL_CTL_ADD, fd, &ev);
|
|
}
|
|
|
|
mutable Poco::FastMutex _mutex;
|
|
int _epollfd;
|
|
std::map<void*, Socket> _socketMap;
|
|
std::vector<struct epoll_event> _events;
|
|
int _eventfd;
|
|
};
|
|
|
|
|
|
#elif defined(POCO_HAVE_FD_POLL)
|
|
|
|
|
|
//
|
|
// BSD/Windows implementation using poll/WSAPoll
|
|
//
|
|
class PollSetImpl
|
|
{
|
|
public:
|
|
void add(const Socket& socket, int mode)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
poco_socket_t fd = socket.impl()->sockfd();
|
|
_addMap[fd] = mode;
|
|
_removeSet.erase(fd);
|
|
_socketMap[fd] = socket;
|
|
}
|
|
|
|
void remove(const Socket& socket)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
poco_socket_t fd = socket.impl()->sockfd();
|
|
_removeSet.insert(fd);
|
|
_addMap.erase(fd);
|
|
_socketMap.erase(fd);
|
|
}
|
|
|
|
bool has(const Socket& socket) const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
SocketImpl* sockImpl = socket.impl();
|
|
return sockImpl &&
|
|
(_socketMap.find(sockImpl->sockfd()) != _socketMap.end());
|
|
}
|
|
|
|
bool empty() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _socketMap.empty();
|
|
}
|
|
|
|
void update(const Socket& socket, int mode)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
poco_socket_t fd = socket.impl()->sockfd();
|
|
for (auto it = _pollfds.begin(); it != _pollfds.end(); ++it)
|
|
{
|
|
if (it->fd == fd)
|
|
{
|
|
it->events = 0;
|
|
it->revents = 0;
|
|
setMode(it->events, mode);
|
|
}
|
|
}
|
|
}
|
|
|
|
void clear()
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
_socketMap.clear();
|
|
_addMap.clear();
|
|
_removeSet.clear();
|
|
_pollfds.clear();
|
|
}
|
|
|
|
PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
|
|
{
|
|
PollSet::SocketModeMap result;
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
if (!_removeSet.empty())
|
|
{
|
|
for (auto it = _pollfds.begin(); it != _pollfds.end();)
|
|
{
|
|
if (_removeSet.find(it->fd) != _removeSet.end())
|
|
{
|
|
it = _pollfds.erase(it);
|
|
}
|
|
else ++it;
|
|
}
|
|
_removeSet.clear();
|
|
}
|
|
|
|
_pollfds.reserve(_pollfds.size() + _addMap.size());
|
|
for (auto it = _addMap.begin(); it != _addMap.end(); ++it)
|
|
{
|
|
pollfd pfd;
|
|
pfd.fd = it->first;
|
|
pfd.events = 0;
|
|
pfd.revents = 0;
|
|
setMode(pfd.events, it->second);
|
|
_pollfds.push_back(pfd);
|
|
}
|
|
_addMap.clear();
|
|
}
|
|
|
|
if (_pollfds.empty()) return result;
|
|
|
|
Poco::Timespan remainingTime(timeout);
|
|
int rc;
|
|
do
|
|
{
|
|
Poco::Timestamp start;
|
|
#ifdef _WIN32
|
|
rc = WSAPoll(&_pollfds[0], static_cast<ULONG>(_pollfds.size()), static_cast<INT>(remainingTime.totalMilliseconds()));
|
|
#else
|
|
rc = ::poll(&_pollfds[0], _pollfds.size(), remainingTime.totalMilliseconds());
|
|
#endif
|
|
if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
|
|
{
|
|
Poco::Timestamp end;
|
|
Poco::Timespan waited = end - start;
|
|
if (waited < remainingTime)
|
|
remainingTime -= waited;
|
|
else
|
|
remainingTime = 0;
|
|
}
|
|
}
|
|
while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
|
|
if (rc < 0) SocketImpl::error();
|
|
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
if (!_socketMap.empty())
|
|
{
|
|
for (auto it = _pollfds.begin(); it != _pollfds.end(); ++it)
|
|
{
|
|
std::map<poco_socket_t, Socket>::const_iterator its = _socketMap.find(it->fd);
|
|
if (its != _socketMap.end())
|
|
{
|
|
if ((it->revents & POLLIN)
|
|
#ifdef _WIN32
|
|
|| (it->revents & POLLHUP)
|
|
#endif
|
|
)
|
|
result[its->second] |= PollSet::POLL_READ;
|
|
if (it->revents & POLLOUT)
|
|
result[its->second] |= PollSet::POLL_WRITE;
|
|
if (it->revents & POLLERR || (it->revents & POLLHUP))
|
|
result[its->second] |= PollSet::POLL_ERROR;
|
|
}
|
|
it->revents = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void wakeUp()
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
int count() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return static_cast<int>(_socketMap.size());
|
|
}
|
|
|
|
private:
|
|
|
|
void setMode(short& target, int mode)
|
|
{
|
|
if (mode & PollSet::POLL_READ)
|
|
target |= POLLIN;
|
|
|
|
if (mode & PollSet::POLL_WRITE)
|
|
target |= POLLOUT;
|
|
}
|
|
|
|
mutable Poco::FastMutex _mutex;
|
|
std::map<poco_socket_t, Socket> _socketMap;
|
|
std::map<poco_socket_t, int> _addMap;
|
|
std::set<poco_socket_t> _removeSet;
|
|
std::vector<pollfd> _pollfds;
|
|
};
|
|
|
|
|
|
#else
|
|
|
|
|
|
#ifdef POCO_OS_FAMILY_WINDOWS
|
|
|
|
|
|
//
|
|
// Windows-specific implementation using select()
|
|
// The size of select set is determined at compile
|
|
// time (see FD_SETSIZE in SocketDefs.h).
|
|
//
|
|
// This implementation works around that limit by
|
|
// having multiple socket descriptor sets and,
|
|
// when needed, calling select() multiple times.
|
|
// To avoid multiple sets situtation, the FD_SETSIZE
|
|
// can be increased, however then Poco::Net library
|
|
// must be recompiled in order for the new setting
|
|
// to be in effect.
|
|
//
|
|
|
|
|
|
class PollSetImpl
|
|
{
|
|
public:
|
|
PollSetImpl() : _fdRead(1, {0, {0}}),
|
|
_fdWrite(1, {0, {0}}),
|
|
_fdExcept(1, {0, {0}}),
|
|
_pFDRead(std::make_unique<fd_set>()),
|
|
_pFDWrite(std::make_unique<fd_set>()),
|
|
_pFDExcept(std::make_unique<fd_set>()),
|
|
_nfd(0)
|
|
{
|
|
}
|
|
|
|
void add(const Socket& socket, int mode)
|
|
{
|
|
Poco::Net::SocketImpl* pImpl = socket.impl();
|
|
poco_check_ptr(pImpl);
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map[socket] = mode;
|
|
setMode(pImpl->sockfd(), mode);
|
|
}
|
|
|
|
void remove(const Socket& socket)
|
|
{
|
|
Poco::Net::SocketImpl* pImpl = socket.impl();
|
|
poco_check_ptr(pImpl);
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
remove(pImpl->sockfd());
|
|
_map.erase(socket);
|
|
}
|
|
|
|
bool has(const Socket& socket) const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _map.find(socket) != _map.end();
|
|
}
|
|
|
|
bool empty() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _map.empty();
|
|
}
|
|
|
|
void update(const Socket& socket, int mode)
|
|
{
|
|
Poco::Net::SocketImpl* pImpl = socket.impl();
|
|
poco_check_ptr(pImpl);
|
|
SOCKET fd = pImpl->sockfd();
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map[socket] = mode;
|
|
setMode(fd, mode);
|
|
if (!(mode & PollSet::POLL_READ)) remove(fd, _fdRead);
|
|
if (!(mode & PollSet::POLL_WRITE)) remove(fd, _fdWrite);
|
|
if (!(mode & PollSet::POLL_ERROR)) remove(fd, _fdExcept);
|
|
}
|
|
|
|
void clear()
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map.clear();
|
|
for (auto& fd : _fdRead) std::memset(&fd, 0, sizeof(fd));
|
|
for (auto& fd : _fdWrite) std::memset(&fd, 0, sizeof(fd));
|
|
for (auto& fd : _fdExcept) std::memset(&fd, 0, sizeof(fd));
|
|
_nfd = 0;
|
|
}
|
|
|
|
PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
|
|
{
|
|
Poco::Timestamp start;
|
|
poco_assert_dbg(_fdRead.size() == _fdWrite.size());
|
|
poco_assert_dbg(_fdWrite.size() == _fdExcept.size());
|
|
|
|
PollSet::SocketModeMap result;
|
|
if (_nfd == 0) return result;
|
|
|
|
Poco::Timespan remainingTime(timeout);
|
|
struct timeval tv {0, 1000};
|
|
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
auto readIt = _fdRead.begin();
|
|
auto writeIt = _fdWrite.begin();
|
|
auto exceptIt = _fdExcept.begin();
|
|
do
|
|
{
|
|
std::memcpy(_pFDRead.get(), &*readIt, sizeof(fd_set));
|
|
std::memcpy(_pFDWrite.get(), &*writeIt, sizeof(fd_set));
|
|
std::memcpy(_pFDExcept.get(), &*exceptIt, sizeof(fd_set));
|
|
|
|
int rc;
|
|
do
|
|
{
|
|
rc = ::select((int)_nfd + 1, _pFDRead.get(), _pFDWrite.get(), _pFDExcept.get(), &tv);
|
|
} while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
|
|
if (rc < 0) SocketImpl::error();
|
|
else if (rc > 0)
|
|
{
|
|
for (auto it = _map.begin(); it != _map.end(); ++it)
|
|
{
|
|
poco_socket_t fd = it->first.impl()->sockfd();
|
|
if (fd != POCO_INVALID_SOCKET)
|
|
{
|
|
if (FD_ISSET(fd, _pFDRead.get()))
|
|
{
|
|
result[it->first] |= PollSet::POLL_READ;
|
|
}
|
|
if (FD_ISSET(fd, _pFDWrite.get()))
|
|
{
|
|
result[it->first] |= PollSet::POLL_WRITE;
|
|
}
|
|
if (FD_ISSET(fd, _pFDExcept.get()))
|
|
{
|
|
result[it->first] |= PollSet::POLL_ERROR;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Timespan elapsed = Timestamp() - start;
|
|
if (++readIt == _fdRead.end())
|
|
{
|
|
if ((rc > 0) || (elapsed.totalMilliseconds() > timeout.totalMilliseconds()))
|
|
break;
|
|
readIt = _fdRead.begin();
|
|
writeIt = _fdWrite.begin();
|
|
exceptIt = _fdExcept.begin();
|
|
}
|
|
else
|
|
{
|
|
++writeIt;
|
|
++exceptIt;
|
|
}
|
|
|
|
Poco::UInt64 tOut = (((Poco::UInt64)tv.tv_sec * 1000000) + tv.tv_usec) * 2;
|
|
Poco::Timespan left = timeout - elapsed;
|
|
if (tOut > left.totalMicroseconds())
|
|
tOut = left.totalMicroseconds();
|
|
|
|
tv.tv_sec = static_cast<long>(tOut / 1000000);
|
|
tv.tv_usec = tOut % 1000000;
|
|
} while (true);
|
|
|
|
return result;
|
|
}
|
|
|
|
int count() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return static_cast<int>(_map.size());
|
|
}
|
|
|
|
void wakeUp()
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
private:
|
|
|
|
void setMode(std::vector<fd_set>& fdSet, SOCKET fd)
|
|
{
|
|
SOCKET* pFD = 0;
|
|
for (auto& fdr : fdSet)
|
|
{
|
|
SOCKET* begin = fdr.fd_array;
|
|
SOCKET* end = fdr.fd_array + fdr.fd_count;
|
|
pFD = std::find(begin, end, fd);
|
|
if (end != pFD)
|
|
{
|
|
FD_SET(fd, &fdr);
|
|
if (fd > _nfd) _nfd = fd;
|
|
return;
|
|
}
|
|
}
|
|
// not found, insert at first free location
|
|
for (auto& fdr : fdSet)
|
|
{
|
|
if (fdr.fd_count < FD_SETSIZE)
|
|
{
|
|
fdr.fd_count++;
|
|
fdr.fd_array[fdr.fd_count-1] = fd;
|
|
if (fd > _nfd) _nfd = fd;
|
|
return;
|
|
}
|
|
}
|
|
// all fd sets are full; insert another one
|
|
fdSet.push_back({0, {0}});
|
|
fd_set& fds = fdSet.back();
|
|
fds.fd_count = 1;
|
|
fds.fd_array[0] = fd;
|
|
if (fd > _nfd) _nfd = fd;
|
|
}
|
|
|
|
void setMode(SOCKET fd, int mode)
|
|
{
|
|
if (mode & PollSet::POLL_READ) setMode(_fdRead, fd);
|
|
if (mode & PollSet::POLL_WRITE) setMode(_fdWrite, fd);
|
|
if (mode & PollSet::POLL_ERROR) setMode(_fdExcept, fd);
|
|
}
|
|
|
|
void remove(SOCKET fd, std::vector<fd_set>& fdSets)
|
|
{
|
|
bool newNFD = false;
|
|
for (auto& fdSet : fdSets)
|
|
{
|
|
if (fdSet.fd_count)
|
|
{
|
|
newNFD = (fd == _nfd);
|
|
int i = 0;
|
|
for (; i < fdSet.fd_count; ++i)
|
|
{
|
|
if (fdSet.fd_array[i] == fd)
|
|
{
|
|
if (i == (fdSet.fd_count-1))
|
|
{
|
|
fdSet.fd_array[i] = 0;
|
|
}
|
|
else
|
|
{
|
|
for (; i < fdSet.fd_count-1; ++i)
|
|
{
|
|
fdSet.fd_array[i] = fdSet.fd_array[i+1];
|
|
if (newNFD && fdSet.fd_array[i] > _nfd)
|
|
_nfd = fdSet.fd_array[i];
|
|
}
|
|
}
|
|
fdSet.fd_array[fdSet.fd_count-1] = 0;
|
|
fdSet.fd_count--;
|
|
break;
|
|
}
|
|
if (newNFD && fdSet.fd_array[i] > _nfd)
|
|
_nfd = fdSet.fd_array[i];
|
|
}
|
|
}
|
|
}
|
|
if (newNFD)
|
|
{
|
|
findNFD(_fdRead);
|
|
findNFD(_fdWrite);
|
|
findNFD(_fdExcept);
|
|
}
|
|
}
|
|
|
|
void findNFD(std::vector<fd_set>& fdSets)
|
|
{
|
|
for (auto& fdSet : fdSets)
|
|
{
|
|
for (int i = 0; i < fdSet.fd_count; ++i)
|
|
{
|
|
if (fdSet.fd_array[i] > _nfd)
|
|
_nfd = fdSet.fd_array[i];
|
|
}
|
|
}
|
|
}
|
|
|
|
void remove(SOCKET fd)
|
|
{
|
|
remove(fd, _fdRead);
|
|
remove(fd, _fdWrite);
|
|
remove(fd, _fdExcept);
|
|
}
|
|
|
|
mutable Poco::FastMutex _mutex;
|
|
PollSet::SocketModeMap _map;
|
|
SOCKET _nfd;
|
|
std::vector<fd_set> _fdRead;
|
|
std::vector<fd_set> _fdWrite;
|
|
std::vector<fd_set> _fdExcept;
|
|
std::unique_ptr<fd_set> _pFDRead;
|
|
std::unique_ptr<fd_set> _pFDWrite;
|
|
std::unique_ptr<fd_set> _pFDExcept;
|
|
};
|
|
|
|
|
|
#else
|
|
|
|
|
|
//
|
|
// Fallback implementation using select()
|
|
//
|
|
class PollSetImpl
|
|
{
|
|
public:
|
|
void add(const Socket& socket, int mode)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map[socket] = mode;
|
|
}
|
|
|
|
void remove(const Socket& socket)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map.erase(socket);
|
|
}
|
|
|
|
bool has(const Socket& socket) const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _map.find(socket) != _map.end();
|
|
}
|
|
|
|
bool empty() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return _map.empty();
|
|
}
|
|
|
|
void update(const Socket& socket, int mode)
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map[socket] = mode;
|
|
}
|
|
|
|
void clear()
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
_map.clear();
|
|
}
|
|
|
|
PollSet::SocketModeMap poll(const Poco::Timespan& timeout)
|
|
{
|
|
fd_set fdRead;
|
|
fd_set fdWrite;
|
|
fd_set fdExcept;
|
|
int nfd = 0;
|
|
|
|
FD_ZERO(&fdRead);
|
|
FD_ZERO(&fdWrite);
|
|
FD_ZERO(&fdExcept);
|
|
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
for (auto it = _map.begin(); it != _map.end(); ++it)
|
|
{
|
|
poco_socket_t fd = it->first.impl()->sockfd();
|
|
if (fd != POCO_INVALID_SOCKET && it->second)
|
|
{
|
|
if (int(fd) > nfd) nfd = int(fd);
|
|
|
|
if (it->second & PollSet::POLL_READ)
|
|
{
|
|
FD_SET(fd, &fdRead);
|
|
}
|
|
if (it->second & PollSet::POLL_WRITE)
|
|
{
|
|
FD_SET(fd, &fdWrite);
|
|
}
|
|
if (it->second & PollSet::POLL_ERROR)
|
|
{
|
|
FD_SET(fd, &fdExcept);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
PollSet::SocketModeMap result;
|
|
if (nfd == 0) return result;
|
|
|
|
Poco::Timespan remainingTime(timeout);
|
|
int rc;
|
|
do
|
|
{
|
|
struct timeval tv;
|
|
tv.tv_sec = (long) remainingTime.totalSeconds();
|
|
tv.tv_usec = (long) remainingTime.useconds();
|
|
Poco::Timestamp start;
|
|
rc = ::select(nfd + 1, &fdRead, &fdWrite, &fdExcept, &tv);
|
|
if (rc < 0 && SocketImpl::lastError() == POCO_EINTR)
|
|
{
|
|
Poco::Timestamp end;
|
|
Poco::Timespan waited = end - start;
|
|
if (waited < remainingTime)
|
|
remainingTime -= waited;
|
|
else
|
|
remainingTime = 0;
|
|
}
|
|
}
|
|
while (rc < 0 && SocketImpl::lastError() == POCO_EINTR);
|
|
if (rc < 0) SocketImpl::error();
|
|
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
|
|
for (auto it = _map.begin(); it != _map.end(); ++it)
|
|
{
|
|
poco_socket_t fd = it->first.impl()->sockfd();
|
|
if (fd != POCO_INVALID_SOCKET)
|
|
{
|
|
if (FD_ISSET(fd, &fdRead))
|
|
{
|
|
result[it->first] |= PollSet::POLL_READ;
|
|
}
|
|
if (FD_ISSET(fd, &fdWrite))
|
|
{
|
|
result[it->first] |= PollSet::POLL_WRITE;
|
|
}
|
|
if (FD_ISSET(fd, &fdExcept))
|
|
{
|
|
result[it->first] |= PollSet::POLL_ERROR;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void wakeUp()
|
|
{
|
|
// TODO
|
|
}
|
|
|
|
int count() const
|
|
{
|
|
Poco::FastMutex::ScopedLock lock(_mutex);
|
|
return static_cast<int>(_map.size());
|
|
}
|
|
|
|
private:
|
|
mutable Poco::FastMutex _mutex;
|
|
PollSet::SocketModeMap _map;
|
|
};
|
|
|
|
|
|
#endif // POCO_OS_FAMILY_WINDOWS
|
|
|
|
|
|
#endif
|
|
|
|
|
|
PollSet::PollSet():
|
|
_pImpl(new PollSetImpl)
|
|
{
|
|
}
|
|
|
|
|
|
PollSet::~PollSet()
|
|
{
|
|
delete _pImpl;
|
|
}
|
|
|
|
|
|
void PollSet::add(const Socket& socket, int mode)
|
|
{
|
|
_pImpl->add(socket, mode);
|
|
}
|
|
|
|
|
|
void PollSet::remove(const Socket& socket)
|
|
{
|
|
_pImpl->remove(socket);
|
|
}
|
|
|
|
|
|
void PollSet::update(const Socket& socket, int mode)
|
|
{
|
|
_pImpl->update(socket, mode);
|
|
}
|
|
|
|
|
|
bool PollSet::has(const Socket& socket) const
|
|
{
|
|
return _pImpl->has(socket);
|
|
}
|
|
|
|
|
|
bool PollSet::empty() const
|
|
{
|
|
return _pImpl->empty();
|
|
}
|
|
|
|
|
|
void PollSet::clear()
|
|
{
|
|
_pImpl->clear();
|
|
}
|
|
|
|
|
|
PollSet::SocketModeMap PollSet::poll(const Poco::Timespan& timeout)
|
|
{
|
|
return _pImpl->poll(timeout);
|
|
}
|
|
|
|
|
|
int PollSet::count() const
|
|
{
|
|
return _pImpl->count();
|
|
}
|
|
|
|
|
|
void PollSet::wakeUp()
|
|
{
|
|
_pImpl->wakeUp();
|
|
}
|
|
|
|
|
|
} } // namespace Poco::Net
|