F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplicy policy handling

Browse Source
This commit is contained in:
Mathieu Lacage
2007-09-28 10:42:29 +02:00
parent cbf46c9ec4
commit 82070b999c
2 changed files with 48 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/simulator/timer.cc
View File

@@ -12,57 +12,20 @@ Timer::Timer ()
m_impl (0)
{}
Timer::Timer (int flags)
: m_flags (flags),
Timer::Timer (enum SchedulePolicy schedulePolicy,
enum DestroyPolicy destroyPolicy)
: m_flags (schedulePolicy | destroyPolicy),
m_delay (FemtoSeconds (0)),
m_event (),
m_impl (0)
{
if (flags & GARBAGE_COLLECT)
{
if (flags != GARBAGE_COLLECT)
{
NS_FATAL_ERROR ("You cannot specify another Timer flag with the GARBAGE_COLLECT flag.");
}
}
else
{
int onSchedule = 0;
if (m_flags & CHECK_ON_SCHEDULE)
{
onSchedule++;
}
if (m_flags & CANCEL_ON_SCHEDULE)
{
onSchedule++;
}
if (m_flags & REMOVE_ON_SCHEDULE)
{
onSchedule++;
}
int onDestroy = 0;
if (m_flags & CHECK_ON_DESTROY)
{
onDestroy++;
}
if (m_flags & CANCEL_ON_DESTROY)
{
onDestroy++;
}
if (m_flags & REMOVE_ON_DESTROY)
{
onDestroy++;
}
if (onSchedule > 1)
{
NS_FATAL_ERROR ("You cannot specify more than one ON_SCHEDULE flag on a Timer.");
}
if (onDestroy > 1)
{
NS_FATAL_ERROR ("You cannot specify more than one ON_DESTROY flag on a Timer.");
}
}
}
{}
Timer::Timer (enum GarbageCollectPolicy policy)
: m_flags (GARBAGE_COLLECT),
m_delay (FemtoSeconds (0)),
m_event (),
m_impl (0)
{}
Timer::~Timer ()
{
@@ -190,7 +153,7 @@ TimerTests::RunTests (void)
int a = 0;
int &b = a;
const int &c = a;
Timer timer = Timer (0);
Timer timer;
timer.SetFunction (&bari);
timer.SetArguments (2);

82
src/simulator/timer.h
View File

@@ -24,57 +24,48 @@ class TimerImpl;
class Timer
{
public:
enum {
/**
* This policy enforces a check before each call to Timer::Schedule
* to verify that the timer has already expired. This policy
* is incompatible with CANCEL_ON_SCHEDULE REMOVE_ON_SCHEDULE, and,
* GARBAGE_COLLECT.
*/
CHECK_ON_SCHEDULE = (1<<0),
/**
* This policy enforces a check from the destructor of the Timer
* to verify that the timer has already expired. This policy is
* incompatible with CANCEL_ON_DESTROY, REMOVE_ON_DESTROY, and
* GARBAGE_COLLECT.
*/
CHECK_ON_DESTROY = (1<<1),
enum SchedulePolicy {
/**
* This policy cancels the event before scheduling a new event
* for each call to Timer::Schedule. This policy
* is incompatible with CHECK_ON_SCHEDULE, REMOVE_ON_SCHEDULE, and,
* GARBAGE_COLLECT.
* for each call to Timer::Schedule.
*/
CANCEL_ON_SCHEDULE = (1<<2),
/**
* This policy cancels the event from the destructor of the Timer
* to verify that the event has already expired. This policy is
* incompatible with CHECK_ON_DESTROY, REMOVE_ON_DESTROY, and
* GARBAGE_COLLECT.
*/
CANCEL_ON_DESTROY = (1<<3),
CANCEL_ON_SCHEDULE = (1<<0),
/**
* This policy removes the event from the simulation event list
* before scheduling a new event for each call to Timer::Schedule.
* This policy is incompatible with CHECK_ON_SCHEDULE,
* CANCEL_ON_SCHEDULE, and, GARBAGE_COLLECT.
*/
REMOVE_ON_SCHEDULE = (1<<4),
REMOVE_ON_SCHEDULE = (1<<1),
/**
* This policy enforces a check before each call to Timer::Schedule
* to verify that the timer has already expired.
*/
CHECK_ON_SCHEDULE = (1<<2),
};
enum DestroyPolicy {
/**
* This policy cancels the event from the destructor of the Timer
* to verify that the event has already expired.
*/
CANCEL_ON_DESTROY = (1<<3),
/**
* This policy removes the event from the simulation event list
* when the destructor of the Timer is invoked. This policy is
* incompatible with CHECK_ON_DESTROY, CANCEL_ON_DESTROY, and
* GARBAGE_COLLECT.
* when the destructor of the Timer is invoked.
*/
REMOVE_ON_DESTROY = (1<<5),
REMOVE_ON_DESTROY = (1<<4),
/**
* This policy is incompatible with all other policies. Event
* event scheduled with this policy is kept track of by an
* This policy enforces a check from the destructor of the Timer
* to verify that the timer has already expired.
*/
CHECK_ON_DESTROY = (1<<5)
};
enum GarbageCollectPolicy {
/**
* Every event scheduled with this policy is kept track of by an
* event garbage collector which makes sure that all events
* of timers with a GARBAGE_COLLECT policy are cancelled at the
* end of the simulation.
*/
GARBAGE_COLLECT = (1<<6),
GARBAGE_COLLECT = (1<<6)
};
/**
* create a timer with a default event lifetime management policy:
@@ -83,17 +74,16 @@ public:
*/
Timer ();
/**
* \param flags the event lifetime management policies to use
*
* The set of flag combinations allowed is:
* - none
* - GARBAGE_COLLECT
* - one of CANCEL_ON_DESTROY, REMOVE_ON_DESTROY, or, CHECK_ON_DESTROY
* - one of CANCEL_ON_SCHEDULE, REMOVE_ON_SCHEDULE, or, CHECK_ON_SCHEDULE
* - one of CANCEL_ON_DESTROY, REMOVE_ON_DESTROY, or, CHECK_ON_DESTROY ored
* with one of CANCEL_ON_SCHEDULE, REMOVE_ON_SCHEDULE, or, CHECK_ON_SCHEDULE.
* \param scheduleFlags the event lifetime management policies to use for schedule events
* \param destroyFlags the event lifetime management policies to use for destroy events
*/
Timer (int flags);
Timer (enum SchedulePolicy schedulePolicy,
enum DestroyPolicy destroyPolicy);
/**
* \param policy the garbage collect policy. Only one
* value is possible.
*/
Timer (enum GarbageCollectPolicy policy);
~Timer ();
/**