strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to std::chrono from Poco::Time and simplify lots.

Browse source
This commit is contained in:
Michael Meeks 2017-03-17 20:51:45 +00:00
parent e9dbab6900
commit 3a5ca4b03f
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/ServerSocket.hpp
View file

@ -87,7 +87,8 @@ public:
void dumpState(std::ostream& os) override; void dumpState(std::ostream& os) override;
HandleResult handlePoll(const Poco::Timestamp &/* now */, int events) override HandleResult handlePoll(std::chrono::steady_clock::time_point /* now */,
int events) override
{ {
if (events & POLLIN) if (events & POLLIN)
{ {

33
net/Socket.hpp
View file

@ -29,9 +29,8 @@
#include <mutex> #include <mutex>
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#include <chrono>
#include <Poco/Timespan.h>
#include <Poco/Timestamp.h>
#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/HTTPResponse.h>
#include "Common.hpp" #include "Common.hpp"
@ -77,11 +76,12 @@ public:
virtual int getPollEvents() = 0; virtual int getPollEvents() = 0;
/// Contract the poll timeout to match our needs /// Contract the poll timeout to match our needs
virtual void updateTimeout(Poco::Timestamp &/*timeout*/) { /* do nothing */ } virtual void updateTimeout(std::chrono::steady_clock::time_point /* now */,
int & /* timeoutMaxMs */) { /* do nothing */ }
/// Handle results of events returned from poll /// Handle results of events returned from poll
enum class HandleResult { CONTINUE, SOCKET_CLOSED }; enum class HandleResult { CONTINUE, SOCKET_CLOSED };
virtual HandleResult handlePoll(const Poco::Timestamp &now, int events) = 0; virtual HandleResult handlePoll(std::chrono::steady_clock::time_point now, int events) = 0;
/// manage latency issues around packet aggregation /// manage latency issues around packet aggregation
void setNoDelay(bool noDelay = true) void setNoDelay(bool noDelay = true)
@ -291,29 +291,29 @@ public:
} }
/// Poll the sockets for available data to read or buffer to write. /// Poll the sockets for available data to read or buffer to write.
void poll(const int timeoutMaxMs) void poll(int timeoutMaxMs)
{ {
assert(isCorrectThread()); assert(isCorrectThread());
Poco::Timestamp now; std::chrono::steady_clock::time_point now =
Poco::Timestamp timeout = now; std::chrono::steady_clock::now();
timeout += Poco::Timespan(0 /* s */, timeoutMaxMs * 1000 /* us */);
// The events to poll on change each spin of the loop. // The events to poll on change each spin of the loop.
setupPollFds(timeout); setupPollFds(now, timeoutMaxMs);
const size_t size = _pollSockets.size(); const size_t size = _pollSockets.size();
int rc; int rc;
do do
{ {
rc = ::poll(&_pollFds[0], size + 1, (timeout - now)/1000); rc = ::poll(&_pollFds[0], size + 1, timeoutMaxMs);
} }
while (rc < 0 && errno == EINTR); while (rc < 0 && errno == EINTR);
LOG_TRC("Poll completed with " << rc << " live polls " LOG_TRC("Poll completed with " << rc << " live polls max (" << timeoutMaxMs << "ms)"
<< ((rc==0) ? "(timeout)" : "")); << ((rc==0) ? "(timedout)" : ""));
// Fire the callback and remove dead fds. // Fire the callback and remove dead fds.
Poco::Timestamp newNow; std::chrono::steady_clock::time_point newNow =
std::chrono::steady_clock::now();
for (int i = static_cast<int>(size) - 1; i >= 0; --i) for (int i = static_cast<int>(size) - 1; i >= 0; --i)
{ {
Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED; Socket::HandleResult res = Socket::HandleResult::SOCKET_CLOSED;
@ -438,7 +438,8 @@ public:
private: private:
/// Initialize the poll fds array with the right events /// Initialize the poll fds array with the right events
void setupPollFds(Poco::Timestamp &timeout) void setupPollFds(std::chrono::steady_clock::time_point now,
int &timeoutMaxMs)
{ {
const size_t size = _pollSockets.size(); const size_t size = _pollSockets.size();
@ -448,7 +449,7 @@ private:
{ {
_pollFds[i].fd = _pollSockets[i]->getFD(); _pollFds[i].fd = _pollSockets[i]->getFD();
_pollFds[i].events = _pollSockets[i]->getPollEvents(); _pollFds[i].events = _pollSockets[i]->getPollEvents();
_pollSockets[i]->updateTimeout(timeout); _pollSockets[i]->updateTimeout(now, timeoutMaxMs);
_pollFds[i].revents = 0; _pollFds[i].revents = 0;
} }
@ -669,7 +670,7 @@ protected:
/// Called when a polling event is received. /// Called when a polling event is received.
/// @events is the mask of events that triggered the wake. /// @events is the mask of events that triggered the wake.
HandleResult handlePoll(const Poco::Timestamp & /* now */, HandleResult handlePoll(std::chrono::steady_clock::time_point /* now */,
const int events) override const int events) override
{ {
assert(isCorrectThread()); assert(isCorrectThread());