ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve DeadlineTimer

Browse Source
This commit is contained in:
Vinnie Falco
2013-07-10 08:36:04 -07:00
parent 3ff1c41a67
commit bca90f2110
2 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.cpp
View File

@@ -43,11 +43,24 @@ public:
bassert (m_items.empty ());
}
void activate (DeadlineTimer* timer)
// Okay to call on an active timer.
// However, an extra notification may still happen due to concurrency.
//
void activate (DeadlineTimer* timer, double secondsRecurring, Time const& when)
{
bassert (secondsRecurring >= 0);
LockType::ScopedLockType lock (m_mutex);
bassert (! timer->m_isActive);
if (timer->m_isActive)
{
m_items.erase (m_items.iterator_to (*timer));
timer->m_isActive = false;
}
timer->m_secondsRecurring = secondsRecurring;
timer->m_notificationTime = when;
insertSorted (*timer);
timer->m_isActive = true;
@@ -219,26 +232,25 @@ DeadlineTimer::~DeadlineTimer ()
void DeadlineTimer::setExpiration (double secondsUntilDeadline)
{
m_secondsRecurring = 0;
m_notificationTime = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
bassert (secondsUntilDeadline > 0);
m_manager->activate (this);
Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
m_manager->activate (this, 0, when);
}
void DeadlineTimer::setRecurringExpiration (double secondsUntilDeadline)
{
m_secondsRecurring = secondsUntilDeadline;
m_notificationTime = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
bassert (secondsUntilDeadline > 0);
m_manager->activate (this);
Time const when = Time::getCurrentTime () + RelativeTime (secondsUntilDeadline);
m_manager->activate (this, secondsUntilDeadline, when);
}
void DeadlineTimer::setExpirationTime (Time absoluteDeadline)
void DeadlineTimer::setExpirationTime (Time const& when)
{
m_secondsRecurring = 0;
m_notificationTime = absoluteDeadline;
m_manager->activate (this);
m_manager->activate (this, 0, when);
}
void DeadlineTimer::reset ()

30
Subtrees/beast/modules/beast_basics/events/beast_DeadlineTimer.h
View File

@@ -46,21 +46,49 @@ public:
~DeadlineTimer ();
/** Set the timer to go off once in the future.
If the timer is already active, this will reset it.
@note If the timer is already active, a notification may still
occur due to concurrency.
@param secondsUntilDeadline The number of seconds until the timer
will send a notification. This must be
greater than zero.
*/
void setExpiration (double secondsUntilDeadline);
/** Set the timer to go off repeatedly with the specified frequency.
If the timer is already active, this will reset it.
@note If the timer is already active, a notification may still
occur due to concurrency.
@param secondsUntilDeadline The number of seconds until the timer
will send a notification. This must be
greater than zero.
*/
void setRecurringExpiration (double secondsUntilDeadline);
/** Set the timer to go off at a specific time.
If the timer is already active, this will reset it.
@note If the timer is already active, a notification may still
occur due to concurrency.
@note If the time is in the past, the timer will go off
immediately.
*/
void setExpirationTime (Time absoluteDeadline);
void setExpirationTime (Time const& when);
/** Reset the timer so that no more notifications are sent.
It is okay to call this on an inactive timer.
@note If the timer is already active, a notification may still
occur due to concurrency.
*/
void reset ();