From cdbb45e4480c719b03bca229498635ec945f109d Mon Sep 17 00:00:00 2001 From: Daniel Frey Date: Fri, 1 Dec 2023 11:30:26 +0100 Subject: [PATCH] Rename parameter --- include/tao/pq/internal/poll.hpp | 2 +- include/tao/pq/poll.hpp | 2 +- src/lib/pq/connection.cpp | 10 +++++----- src/lib/pq/internal/poll.cpp | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/tao/pq/internal/poll.hpp b/include/tao/pq/internal/poll.hpp index 00a0ef6..3d959e0 100644 --- a/include/tao/pq/internal/poll.hpp +++ b/include/tao/pq/internal/poll.hpp @@ -9,7 +9,7 @@ namespace tao::pq::internal { - [[nodiscard]] auto poll( const int socket, const bool wait_for_write, const int timeout ) -> pq::poll::status; + [[nodiscard]] auto poll( const int socket, const bool wait_for_write, const int timeout_ms ) -> pq::poll::status; } // namespace tao::pq::internal diff --git a/include/tao/pq/poll.hpp b/include/tao/pq/poll.hpp index c0d8b57..efdbb32 100644 --- a/include/tao/pq/poll.hpp +++ b/include/tao/pq/poll.hpp @@ -15,7 +15,7 @@ namespace tao::pq::poll again }; - using callback = status( const int socket, const bool wait_for_write, const int timeout ); + using callback = status( const int socket, const bool wait_for_write, const int timeout_ms ); } // namespace tao::pq::poll diff --git a/src/lib/pq/connection.cpp b/src/lib/pq/connection.cpp index 052448b..c12cf92 100644 --- a/src/lib/pq/connection.cpp +++ b/src/lib/pq/connection.cpp @@ -220,15 +220,15 @@ namespace tao::pq void connection::wait( const bool wait_for_write, const std::chrono::steady_clock::time_point end ) { while( true ) { - int timeout = -1; + int timeout_ms = -1; if( m_timeout ) { - timeout = static_cast< int >( std::chrono::duration_cast< std::chrono::milliseconds >( end - std::chrono::steady_clock::now() ).count() ); - if( timeout < 0 ) { - timeout = 0; // LCOV_EXCL_LINE + timeout_ms = static_cast< int >( std::chrono::duration_cast< std::chrono::milliseconds >( end - std::chrono::steady_clock::now() ).count() ); + if( timeout_ms < 0 ) { + timeout_ms = 0; // LCOV_EXCL_LINE } } - switch( m_poll( socket(), wait_for_write, timeout ) ) { + switch( m_poll( socket(), wait_for_write, timeout_ms ) ) { case poll::status::timeout: m_pgconn.reset(); throw timeout_reached( "timeout reached" ); diff --git a/src/lib/pq/internal/poll.cpp b/src/lib/pq/internal/poll.cpp index 6c2bf14..296f9b7 100644 --- a/src/lib/pq/internal/poll.cpp +++ b/src/lib/pq/internal/poll.cpp @@ -54,13 +54,13 @@ namespace tao::pq::internal } // namespace - auto poll( const int socket, const bool wait_for_write, const int timeout ) -> pq::poll::status + auto poll( const int socket, const bool wait_for_write, const int timeout_ms ) -> pq::poll::status { #if defined( _WIN32 ) const short events = POLLIN | ( wait_for_write ? POLLOUT : 0 ); WSAPOLLFD pfd = { static_cast< SOCKET >( socket ), events, 0 }; - const auto result = WSAPoll( &pfd, 1, timeout ); + const auto result = WSAPoll( &pfd, 1, timeout_ms ); switch( result ) { case 0: return pq::poll::status::timeout; @@ -85,7 +85,7 @@ namespace tao::pq::internal const short events = POLLIN | ( wait_for_write ? POLLOUT : 0 ); pollfd pfd = { socket, events, 0 }; errno = 0; - const auto result = ::poll( &pfd, 1, timeout ); + const auto result = ::poll( &pfd, 1, timeout_ms ); switch( result ) { case 0: return pq::poll::status::timeout;