summaryrefslogtreecommitdiff
path: root/lib/common/Timer.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/common/Timer.cpp')
-rw-r--r--lib/common/Timer.cpp202
1 files changed, 0 insertions, 202 deletions
diff --git a/lib/common/Timer.cpp b/lib/common/Timer.cpp
index 390ddf8e..ad6b5e8d 100644
--- a/lib/common/Timer.cpp
+++ b/lib/common/Timer.cpp
@@ -8,14 +8,6 @@
//
// --------------------------------------------------------------------------
-<<<<<<< HEAD
-#ifdef WIN32
- #define _WIN32_WINNT 0x0500
-#endif
-
-#include "Box.h"
-
-=======
#include "Box.h"
#ifdef WIN32
@@ -26,7 +18,6 @@
# endif
#endif
->>>>>>> 0.12
#include <signal.h>
#include <cstring>
@@ -39,11 +30,7 @@ std::vector<Timer*>* Timers::spTimers = NULL;
bool Timers::sRescheduleNeeded = false;
#define TIMER_ID "timer " << mName << " (" << this << ") "
-<<<<<<< HEAD
-#define TIMER_ID_OF(t) "timer " << (t).GetName() << " (" << &(t) << ") "
-=======
#define TIMER_ID_OF(t) "timer " << (t).GetName() << " (" << &(t) << ")"
->>>>>>> 0.12
typedef void (*sighandler_t)(int);
@@ -132,10 +119,7 @@ void Timers::Add(Timer& rTimer)
{
ASSERT(spTimers);
ASSERT(&rTimer);
-<<<<<<< HEAD
-=======
BOX_TRACE(TIMER_ID_OF(rTimer) " added to global queue, rescheduling");
->>>>>>> 0.12
spTimers->push_back(&rTimer);
Reschedule();
}
@@ -153,10 +137,7 @@ void Timers::Remove(Timer& rTimer)
{
ASSERT(spTimers);
ASSERT(&rTimer);
-<<<<<<< HEAD
-=======
BOX_TRACE(TIMER_ID_OF(rTimer) " removed from global queue, rescheduling");
->>>>>>> 0.12
bool restart = true;
while (restart)
@@ -191,13 +172,6 @@ void Timers::RescheduleIfNeeded()
}
}
-<<<<<<< HEAD
-#define FORMAT_MICROSECONDS(t) \
- (int)(t / 1000000) << "." << \
- (int)(t % 1000000) << " seconds"
-
-=======
->>>>>>> 0.12
// --------------------------------------------------------------------------
//
// Function
@@ -260,19 +234,9 @@ void Timers::Reschedule()
if (timeToExpiry <= 0)
{
-<<<<<<< HEAD
- /*
- BOX_TRACE("timer " << *i << " has expired, "
- "triggering it");
- */
- BOX_TRACE(TIMER_ID_OF(**i) "has expired, "
- "triggering " <<
- FORMAT_MICROSECONDS(-timeToExpiry) <<
-=======
BOX_TRACE(TIMER_ID_OF(**i) " has expired, "
"triggering " <<
BOX_FORMAT_MICROSECONDS(-timeToExpiry) <<
->>>>>>> 0.12
" late");
rTimer.OnExpire();
spTimers->erase(i);
@@ -282,13 +246,8 @@ void Timers::Reschedule()
else
{
/*
-<<<<<<< HEAD
- BOX_TRACE("timer " << *i << " has not "
- "expired, triggering in " <<
-=======
BOX_TRACE(TIMER_ID_OF(**i) " has not expired, "
"triggering in " <<
->>>>>>> 0.12
FORMAT_MICROSECONDS(timeToExpiry) <<
" seconds");
*/
@@ -329,13 +288,8 @@ void Timers::Reschedule()
}
else
{
-<<<<<<< HEAD
- BOX_TRACE("timer: next event: " << nameOfNextEvent <<
- " expires in " << FORMAT_MICROSECONDS(timeToNextEvent));
-=======
BOX_TRACE("timer: next event: " << nameOfNextEvent << " at " <<
FormatTime(timeNow + timeToNextEvent, false, true));
->>>>>>> 0.12
}
struct itimerval timeout;
@@ -375,11 +329,7 @@ void Timers::SignalHandler(int unused)
// --------------------------------------------------------------------------
//
// Function
-<<<<<<< HEAD
-// Name: Timer::Timer(size_t timeoutSecs,
-=======
// Name: Timer::Timer(size_t timeoutMillis,
->>>>>>> 0.12
// const std::string& rName)
// Purpose: Standard timer constructor, takes a timeout in
// seconds from now, and an optional name for
@@ -388,161 +338,82 @@ void Timers::SignalHandler(int unused)
//
// --------------------------------------------------------------------------
-<<<<<<< HEAD
-Timer::Timer(size_t timeoutSecs, const std::string& rName)
-: mExpires(GetCurrentBoxTime() + SecondsToBoxTime(timeoutSecs)),
-=======
Timer::Timer(size_t timeoutMillis, const std::string& rName)
: mExpires(0),
->>>>>>> 0.12
mExpired(false),
mName(rName)
#ifdef WIN32
, mTimerHandle(INVALID_HANDLE_VALUE)
#endif
{
-<<<<<<< HEAD
- #ifndef BOX_RELEASE_BUILD
- if (timeoutSecs == 0)
- {
- BOX_TRACE(TIMER_ID "initialised for " << timeoutSecs <<
- " secs, will not fire");
- }
- else
- {
- BOX_TRACE(TIMER_ID "initialised for " << timeoutSecs <<
- " secs, to fire at " << FormatTime(mExpires, false, true));
- }
- #endif
-
- if (timeoutSecs == 0)
- {
- mExpires = 0;
- }
- else
- {
- Timers::Add(*this);
- Start(timeoutSecs * MICRO_SEC_IN_SEC_LL);
- }
-=======
Set(timeoutMillis, true /* isInit */);
->>>>>>> 0.12
}
// --------------------------------------------------------------------------
//
// Function
// Name: Timer::Start()
-<<<<<<< HEAD
-// Purpose: This internal function initialises an OS TimerQueue
-// timer on Windows, while on Unixes there is only a
-// single global timer, managed by the Timers class,
-// so this method does nothing.
-=======
// Purpose: This internal function recalculates the remaining
// time (timeout) from the expiry time, and then calls
// Start(timeoutMillis).
->>>>>>> 0.12
// Created: 27/07/2008
//
// --------------------------------------------------------------------------
void Timer::Start()
{
-<<<<<<< HEAD
-#ifdef WIN32
-=======
->>>>>>> 0.12
box_time_t timeNow = GetCurrentBoxTime();
int64_t timeToExpiry = mExpires - timeNow;
if (timeToExpiry <= 0)
{
BOX_WARNING(TIMER_ID << "fudging expiry from -" <<
-<<<<<<< HEAD
- FORMAT_MICROSECONDS(-timeToExpiry))
- timeToExpiry = 1;
- }
-
- Start(timeToExpiry);
-#endif
-=======
BOX_FORMAT_MICROSECONDS(-timeToExpiry))
timeToExpiry = 1;
}
Start(timeToExpiry / MICRO_SEC_IN_MILLI_SEC);
->>>>>>> 0.12
}
// --------------------------------------------------------------------------
//
// Function
-<<<<<<< HEAD
-// Name: Timer::Start(int64_t delayInMicros)
-// Purpose: This internal function initialises an OS TimerQueue
-// timer on Windows, with a specified delay already
-// calculated to save us doing it again. Like
-// Timer::Start(), on Unixes it does nothing.
-=======
// Name: Timer::Start(int64_t timeoutMillis)
// Purpose: This internal function adds this timer to the global
// timer list, and on Windows it initialises an OS
// TimerQueue timer for it.
->>>>>>> 0.12
// Created: 27/07/2008
//
// --------------------------------------------------------------------------
-<<<<<<< HEAD
-void Timer::Start(int64_t delayInMicros)
-{
-=======
void Timer::Start(int64_t timeoutMillis)
{
ASSERT(mExpires != 0);
Timers::Add(*this);
->>>>>>> 0.12
#ifdef WIN32
// only call me once!
ASSERT(mTimerHandle == INVALID_HANDLE_VALUE);
-<<<<<<< HEAD
- int64_t delayInMillis = delayInMicros / 1000;
-
-=======
->>>>>>> 0.12
// Windows XP always seems to fire timers up to 20 ms late,
// at least on my test laptop. Not critical in practice, but our
// tests are precise enough that they will fail if we don't
// correct for it.
-<<<<<<< HEAD
- delayInMillis -= 20;
-
- // Set a system timer to call our timer routine
- if (CreateTimerQueueTimer(&mTimerHandle, NULL, TimerRoutine,
- (PVOID)this, delayInMillis, 0, WT_EXECUTEINTIMERTHREAD)
-=======
timeoutMillis -= 20;
// Set a system timer to call our timer routine
if (CreateTimerQueueTimer(&mTimerHandle, NULL, TimerRoutine,
(PVOID)this, timeoutMillis, 0, WT_EXECUTEINTIMERTHREAD)
->>>>>>> 0.12
== FALSE)
{
BOX_ERROR(TIMER_ID "failed to create timer: " <<
GetErrorMessage(GetLastError()));
mTimerHandle = INVALID_HANDLE_VALUE;
}
-<<<<<<< HEAD
-=======
else
{
BOX_INFO(TIMER_ID << "set for " << timeoutMillis << " ms");
}
->>>>>>> 0.12
#endif
}
@@ -550,29 +421,20 @@ void Timer::Start(int64_t timeoutMillis)
//
// Function
// Name: Timer::Stop()
-<<<<<<< HEAD
-// Purpose: This internal function deletes the associated OS
-// TimerQueue timer on Windows, and on Unixes does
-// nothing.
-=======
// Purpose: This internal function removes us from the global
// list of timers, resets our expiry time, and on
// Windows it deletes the associated OS TimerQueue timer.
->>>>>>> 0.12
// Created: 27/07/2008
//
// --------------------------------------------------------------------------
void Timer::Stop()
{
-<<<<<<< HEAD
-=======
if (mExpires != 0)
{
Timers::Remove(*this);
}
->>>>>>> 0.12
#ifdef WIN32
if (mTimerHandle != INVALID_HANDLE_VALUE)
{
@@ -602,12 +464,6 @@ Timer::~Timer()
BOX_TRACE(TIMER_ID "destroyed");
#endif
-<<<<<<< HEAD
- Timers::Remove(*this);
- Stop();
-}
-
-=======
Stop();
}
@@ -632,7 +488,6 @@ void Timer::LogAssignment(const Timer &From)
#endif
}
->>>>>>> 0.12
// --------------------------------------------------------------------------
//
// Function
@@ -652,36 +507,10 @@ Timer::Timer(const Timer& rToCopy)
, mTimerHandle(INVALID_HANDLE_VALUE)
#endif
{
-<<<<<<< HEAD
- #ifndef BOX_RELEASE_BUILD
- if (mExpired)
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "already expired, will not fire");
- }
- else if (mExpires == 0)
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "no expiry, will not fire");
- }
- else
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "to fire at " <<
- (int)(mExpires / 1000000) << "." <<
- (int)(mExpires % 1000000));
- }
- #endif
-
- if (!mExpired && mExpires != 0)
- {
- Timers::Add(*this);
-=======
LogAssignment(rToCopy);
if (!mExpired && mExpires != 0)
{
->>>>>>> 0.12
Start();
}
}
@@ -700,32 +529,8 @@ Timer::Timer(const Timer& rToCopy)
Timer& Timer::operator=(const Timer& rToCopy)
{
-<<<<<<< HEAD
- #ifndef BOX_RELEASE_BUILD
- if (rToCopy.mExpired)
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "already expired, will not fire");
- }
- else if (rToCopy.mExpires == 0)
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "no expiry, will not fire");
- }
- else
- {
- BOX_TRACE(TIMER_ID "initialised from timer " << &rToCopy << ", "
- "to fire at " <<
- (int)(rToCopy.mExpires / 1000000) << "." <<
- (int)(rToCopy.mExpires % 1000000));
- }
- #endif
-
- Timers::Remove(*this);
-=======
LogAssignment(rToCopy);
->>>>>>> 0.12
Stop();
mExpires = rToCopy.mExpires;
@@ -734,10 +539,6 @@ Timer& Timer::operator=(const Timer& rToCopy)
if (!mExpired && mExpires != 0)
{
-<<<<<<< HEAD
- Timers::Add(*this);
-=======
->>>>>>> 0.12
Start();
}
@@ -747,8 +548,6 @@ Timer& Timer::operator=(const Timer& rToCopy)
// --------------------------------------------------------------------------
//
// Function
-<<<<<<< HEAD
-=======
// Name: Timer::Reset(size_t timeoutMillis)
// Purpose: Simple reset operation for an existing Timer. Avoids
// the need to create a temporary timer just to modify
@@ -810,7 +609,6 @@ void Timer::Set(size_t timeoutMillis, bool isInit)
// --------------------------------------------------------------------------
//
// Function
->>>>>>> 0.12
// Name: Timer::OnExpire()
// Purpose: Method called by Timers::Reschedule (on Unixes)
// on next poll after timer expires, or from
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 03:48:05 +0000