author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Sat, 28 Oct 2006 21:21:53 +0200 | |
changeset 146 | 2c9ef359e320 |
parent 145 | 947b77174b72 |
child 147 | 705658c244c3 |
permissions | -rw-r--r-- |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
1 |
/* -*- Mode:NS3; -*- */ |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2005,2006 INRIA |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* All rights reserved. |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License version 2 as |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* published by the Free Software Foundation; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* GNU General Public License for more details. |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
20 |
*/ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
21 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
22 |
#include "simulator.h" |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#include "scheduler.h" |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
24 |
#include "event-impl.h" |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
25 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include <math.h> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
#include <cassert> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
#include <fstream> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
29 |
#include <list> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
30 |
#include <vector> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
31 |
#include <iostream> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
#define noTRACE_SIMU 1 |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
34 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
35 |
#ifdef TRACE_SIMU |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
36 |
#include <iostream> |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
37 |
# define TRACE(x) \ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
38 |
std::Cout << "SIMU TRACE " << Simulator::nowS () << " " << x << std::endl; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
39 |
# define TRACE_S(x) \ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
40 |
std::cout << "SIMU TRACE " << x << std::endl; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
41 |
#else /* TRACE_SIMU */ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
42 |
# define TRACE(format,...) |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
43 |
# define TRACE_S(format,...) |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
44 |
#endif /* TRACE_SIMU */ |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
45 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
46 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
47 |
namespace ns3 { |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
48 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
49 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
50 |
class SimulatorPrivate { |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
51 |
public: |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
52 |
SimulatorPrivate (Scheduler *events); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
53 |
~SimulatorPrivate (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
54 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
55 |
void EnableLogTo (char const *filename); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
56 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
57 |
bool IsFinished (void) const; |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
58 |
Time Next (void) const; |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
59 |
void Stop (void); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
60 |
void StopAt (Time const &time); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
61 |
EventId Schedule (Time const &time, EventImpl *event); |
145
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
62 |
void ScheduleNow (EventImpl *event); |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
63 |
void ScheduleDestroy (EventImpl *event); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
64 |
void Remove (EventId ev); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
65 |
void Cancel (EventId ev); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
66 |
bool IsExpired (EventId ev); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
67 |
void Run (void); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
68 |
Time Now (void) const; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
69 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
70 |
private: |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
71 |
void ProcessOneEvent (void); |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
72 |
uint64_t NextNs (void) const; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
73 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
74 |
typedef std::list<std::pair<EventImpl *,uint32_t> > Events; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
75 |
Events m_destroy; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
76 |
uint64_t m_stopAt; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
77 |
bool m_stop; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
78 |
Scheduler *m_events; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
79 |
uint32_t m_uid; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
80 |
uint32_t m_currentUid; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
81 |
uint64_t m_currentNs; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
82 |
std::ofstream m_log; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
83 |
std::ifstream m_inputLog; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
84 |
bool m_logEnable; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
85 |
}; |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
86 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
87 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
88 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
89 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
90 |
SimulatorPrivate::SimulatorPrivate (Scheduler *events) |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
91 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
92 |
m_stop = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
93 |
m_stopAt = 0; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
94 |
m_events = events; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
95 |
m_uid = 0; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
96 |
m_logEnable = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
97 |
m_currentNs = 0; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
98 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
99 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
100 |
SimulatorPrivate::~SimulatorPrivate () |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
101 |
{ |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
102 |
while (!m_destroy.empty ()) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
103 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
104 |
EventImpl *ev = m_destroy.front ().first; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
105 |
m_destroy.pop_front (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
106 |
TRACE ("handle destroy " << ev); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
107 |
ev->Invoke (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
108 |
delete ev; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
109 |
} |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
110 |
delete m_events; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
111 |
m_events = (Scheduler *)0xdeadbeaf; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
112 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
113 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
114 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
115 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
116 |
SimulatorPrivate::EnableLogTo (char const *filename) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
117 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
118 |
m_log.open (filename); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
119 |
m_logEnable = true; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
120 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
121 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
122 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
123 |
SimulatorPrivate::ProcessOneEvent (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
124 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
125 |
EventImpl *nextEv = m_events->PeekNext (); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
126 |
Scheduler::EventKey nextKey = m_events->PeekNextKey (); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
127 |
m_events->RemoveNext (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
128 |
TRACE ("handle " << nextEv); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
129 |
m_currentNs = nextKey.m_ns; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
130 |
m_currentUid = nextKey.m_uid; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
131 |
if (m_logEnable) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
132 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
133 |
m_log << "e "<<nextKey.m_uid << " " << nextKey.m_ns << std::endl; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
134 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
135 |
nextEv->Invoke (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
136 |
delete nextEv; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
137 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
139 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
140 |
SimulatorPrivate::IsFinished (void) const |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
141 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
142 |
return m_events->IsEmpty (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
143 |
} |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
144 |
uint64_t |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
145 |
SimulatorPrivate::NextNs (void) const |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
146 |
{ |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
147 |
assert (!m_events->IsEmpty ()); |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
148 |
Scheduler::EventKey nextKey = m_events->PeekNextKey (); |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
149 |
return nextKey.m_ns; |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
150 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
151 |
Time |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
152 |
SimulatorPrivate::Next (void) const |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
153 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
154 |
return NanoSeconds (NextNs ()); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
155 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
156 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
157 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
158 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
159 |
SimulatorPrivate::Run (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
161 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
162 |
while (!m_events->IsEmpty () && !m_stop && |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
163 |
(m_stopAt == 0 || m_stopAt > NextNs ())) |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
164 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
165 |
ProcessOneEvent (); |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
166 |
} |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
167 |
m_log.close (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
168 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
169 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
170 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
171 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
172 |
SimulatorPrivate::Stop (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
173 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
174 |
m_stop = true; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
175 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
176 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
177 |
SimulatorPrivate::StopAt (Time const &at) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
178 |
{ |
144
f07f6fb0f660
fix Time::ApproximateTo* return type
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
143
diff
changeset
|
179 |
assert (at.IsPositive ()); |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
180 |
m_stopAt = at.ApproximateToNanoSeconds (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
181 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
182 |
EventId |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
183 |
SimulatorPrivate::Schedule (Time const &time, EventImpl *event) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
184 |
{ |
144
f07f6fb0f660
fix Time::ApproximateTo* return type
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
143
diff
changeset
|
185 |
assert (time.IsPositive ()); |
f07f6fb0f660
fix Time::ApproximateTo* return type
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
143
diff
changeset
|
186 |
assert (time >= NanoSeconds (m_currentNs)); |
f07f6fb0f660
fix Time::ApproximateTo* return type
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
143
diff
changeset
|
187 |
uint64_t ns = (uint64_t) time.ApproximateToNanoSeconds (); |
f07f6fb0f660
fix Time::ApproximateTo* return type
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
143
diff
changeset
|
188 |
Scheduler::EventKey key = {ns, m_uid}; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
189 |
if (m_logEnable) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
190 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
191 |
m_log << "i "<<m_currentUid<<" "<<m_currentNs<<" " |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
192 |
<<m_uid<<" "<<time.ApproximateToNanoSeconds () << std::endl; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
193 |
} |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
194 |
m_uid++; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
195 |
return m_events->Insert (event, key); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
196 |
} |
145
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
197 |
void |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
198 |
SimulatorPrivate::ScheduleNow (EventImpl *event) |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
199 |
{ |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
200 |
//XXX |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
201 |
} |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
202 |
void |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
203 |
SimulatorPrivate::ScheduleDestroy (EventImpl *event) |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
204 |
{ |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
205 |
//XXX |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
206 |
} |
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
207 |
|
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
208 |
Time |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
209 |
SimulatorPrivate::Now (void) const |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
210 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
211 |
return NanoSeconds (m_currentNs); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
212 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
213 |
|
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
214 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
215 |
SimulatorPrivate::Remove (EventId ev) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
216 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
217 |
Scheduler::EventKey key; |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
218 |
EventImpl *impl = m_events->Remove (ev, &key); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
219 |
delete impl; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
220 |
if (m_logEnable) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
221 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
222 |
m_log << "r " << m_currentUid << " " << m_currentNs << " " |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
223 |
<< key.m_uid << " " << key.m_ns << std::endl; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
224 |
} |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
225 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
226 |
|
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
227 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
228 |
SimulatorPrivate::Cancel (EventId id) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
229 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
230 |
assert (m_events->IsValid (id)); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
231 |
EventImpl *ev = id.GetEventImpl (); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
232 |
ev->Cancel (); |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
233 |
} |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
234 |
|
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
235 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
236 |
SimulatorPrivate::IsExpired (EventId ev) |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
237 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
238 |
if (ev.GetEventImpl () != 0 && |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
239 |
ev.GetNs () <= m_currentNs && |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
240 |
ev.GetUid () < m_currentUid) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
241 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
242 |
return false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
243 |
} |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
244 |
return true; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
245 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
246 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
247 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
248 |
}; // namespace ns3 |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
249 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
250 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
251 |
#include "scheduler-list.h" |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
252 |
#include "scheduler-heap.h" |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
253 |
#include "scheduler-map.h" |
45
f963078c6e95
enable user-provided schedulers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
38
diff
changeset
|
254 |
#include "scheduler-factory.h" |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
255 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
256 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
257 |
namespace ns3 { |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
258 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
259 |
SimulatorPrivate *Simulator::m_priv = 0; |
52
72a52d59ee9f
member variables coding style change
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
45
diff
changeset
|
260 |
Simulator::ListType Simulator::m_listType = LINKED_LIST; |
72a52d59ee9f
member variables coding style change
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
45
diff
changeset
|
261 |
SchedulerFactory const*Simulator::m_schedFactory = 0; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
262 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
263 |
void Simulator::SetLinkedList (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
264 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
265 |
m_listType = LINKED_LIST; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
266 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
267 |
void Simulator::SetBinaryHeap (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
268 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
269 |
m_listType = BINARY_HEAP; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
270 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
271 |
void Simulator::SetStdMap (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
272 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
273 |
m_listType = STD_MAP; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
274 |
} |
45
f963078c6e95
enable user-provided schedulers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
38
diff
changeset
|
275 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
276 |
Simulator::SetExternal (SchedulerFactory const*factory) |
45
f963078c6e95
enable user-provided schedulers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
38
diff
changeset
|
277 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
278 |
assert (factory != 0); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
279 |
m_schedFactory = factory; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
280 |
m_listType = EXTERNAL; |
45
f963078c6e95
enable user-provided schedulers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
38
diff
changeset
|
281 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
282 |
void Simulator::EnableLogTo (char const *filename) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
283 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
284 |
GetPriv ()->EnableLogTo (filename); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
285 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
286 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
288 |
SimulatorPrivate * |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
289 |
Simulator::GetPriv (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
{ |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
291 |
if (m_priv == 0) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
292 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
293 |
Scheduler *events; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
294 |
switch (m_listType) { |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
295 |
case LINKED_LIST: |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
296 |
events = new SchedulerList (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
297 |
break; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
298 |
case BINARY_HEAP: |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
299 |
events = new SchedulerHeap (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
300 |
break; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
301 |
case STD_MAP: |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
302 |
events = new SchedulerMap (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
303 |
break; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
304 |
case EXTERNAL: |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
305 |
events = m_schedFactory->Create (); |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
306 |
default: // not reached |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
307 |
events = 0; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
308 |
assert (false); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
309 |
break; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
310 |
} |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
311 |
m_priv = new SimulatorPrivate (events); |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
312 |
} |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
313 |
TRACE_S ("priv " << m_priv); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
314 |
return m_priv; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
315 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
318 |
Simulator::Destroy (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
319 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
320 |
delete m_priv; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
321 |
m_priv = 0; |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
322 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
324 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
325 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
326 |
Simulator::IsFinished (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
327 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
328 |
return GetPriv ()->IsFinished (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
329 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
330 |
Time |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
331 |
Simulator::Next (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
332 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
333 |
return GetPriv ()->Next (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
334 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
335 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
336 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
337 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
338 |
Simulator::Run (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
339 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
340 |
GetPriv ()->Run (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
341 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
342 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
343 |
Simulator::Stop (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
344 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
345 |
TRACE ("stop"); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
346 |
GetPriv ()->Stop (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
347 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
348 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
349 |
Simulator::StopAt (Time const &at) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
350 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
351 |
GetPriv ()->StopAt (at); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
352 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
353 |
Time |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
354 |
Simulator::Now (void) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
355 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
356 |
return GetPriv ()->Now (); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
357 |
} |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
358 |
|
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
359 |
EventImpl * |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
360 |
Simulator::MakeEvent (void (*f) (void)) |
145
947b77174b72
start of work to re-implement Schedule* methods
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
361 |
{ |
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
362 |
// zero arg version |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
363 |
class EventFunctionImpl0 : public EventImpl { |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
364 |
public: |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
365 |
typedef void (*F)(void); |
75
0f3f4b0a158b
reorganize the implementation of template member methods in Simulator class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
54
diff
changeset
|
366 |
|
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
367 |
EventFunctionImpl0 (F function) |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
368 |
: m_function (function) |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
369 |
{} |
120
0747c110cc88
make destructor public to avoid compiler warning.
mlacage@nef.inria.fr
parents:
114
diff
changeset
|
370 |
virtual ~EventFunctionImpl0 () {} |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
371 |
protected: |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
372 |
virtual void Notify (void) { |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
373 |
(*m_function) (); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
374 |
} |
111
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
375 |
private: |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
376 |
F m_function; |
ad64f88919b5
try to get rid of tabs which sneaked in
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
110
diff
changeset
|
377 |
} *ev = new EventFunctionImpl0 (f); |
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
378 |
return ev; |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
379 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
380 |
EventId |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
381 |
Simulator::Schedule (Time const &time, EventImpl *ev) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
382 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
383 |
return GetPriv ()->Schedule (time, ev); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
384 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
385 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
386 |
Simulator::ScheduleNow (EventImpl *ev) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
387 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
388 |
GetPriv ()->ScheduleNow (ev); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
389 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
390 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
391 |
Simulator::ScheduleDestroy (EventImpl *ev) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
392 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
393 |
GetPriv ()->ScheduleDestroy (ev); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
394 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
395 |
EventId |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
396 |
Simulator::Schedule (Time const &time, void (*f) (void)) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
397 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
398 |
return Schedule (time, MakeEvent (f)); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
399 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
400 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
401 |
Simulator::ScheduleNow (void (*f) (void)) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
402 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
403 |
return ScheduleNow (MakeEvent (f)); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
404 |
} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
405 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
406 |
Simulator::ScheduleDestroy (void (*f) (void)) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
407 |
{ |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
408 |
return ScheduleDestroy (MakeEvent (f)); |
75
0f3f4b0a158b
reorganize the implementation of template member methods in Simulator class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
54
diff
changeset
|
409 |
} |
0f3f4b0a158b
reorganize the implementation of template member methods in Simulator class
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
54
diff
changeset
|
410 |
|
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
411 |
|
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
412 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
413 |
Simulator::Remove (EventId ev) |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
414 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
415 |
return GetPriv ()->Remove (ev); |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
416 |
} |
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
417 |
|
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
418 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
419 |
Simulator::Cancel (EventId ev) |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
420 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
421 |
return GetPriv ()->Cancel (ev); |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
422 |
} |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
423 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
424 |
Simulator::IsExpired (EventId id) |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
425 |
{ |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
426 |
return GetPriv ()->IsExpired (id); |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
427 |
} |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
24
diff
changeset
|
428 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
429 |
}; // namespace ns3 |
9
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
430 |
|
2c31ae7c94db
import from yans
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
431 |
|
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
432 |
#ifdef RUN_SELF_TESTS |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
433 |
|
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
434 |
#include "ns3/test.h" |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
435 |
|
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
436 |
namespace ns3 { |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
437 |
|
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
438 |
static void foo0 (void) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
439 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
440 |
static void foo1 (int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
441 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
442 |
static void foo2 (int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
443 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
444 |
static void foo3 (int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
445 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
446 |
static void foo4 (int, int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
447 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
448 |
static void foo5 (int, int, int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
449 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
450 |
|
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
451 |
|
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
452 |
class SimulatorTests : public Test { |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
453 |
public: |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
454 |
SimulatorTests (); |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
455 |
virtual ~SimulatorTests (); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
456 |
virtual bool RunTests (void); |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
457 |
private: |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
458 |
uint64_t NowUs (); |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
459 |
bool RunOneTest (void); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
460 |
void A (int a); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
461 |
void B (int b); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
462 |
void C (int c); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
463 |
void D (int d); |
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
464 |
void bar0 (void); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
465 |
void bar1 (int); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
466 |
void bar2 (int, int); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
467 |
void bar3 (int, int, int); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
468 |
void bar4 (int, int, int, int); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
469 |
void bar5 (int, int, int, int, int); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
470 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
471 |
bool m_b; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
472 |
bool m_a; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
473 |
bool m_c; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
474 |
bool m_d; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
475 |
EventId m_idC; |
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
476 |
}; |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
477 |
|
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
478 |
SimulatorTests::SimulatorTests () |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
479 |
: Test ("Simulator") |
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
480 |
{} |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
481 |
SimulatorTests::~SimulatorTests () |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
482 |
{} |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
483 |
uint64_t |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
484 |
SimulatorTests::NowUs (void) |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
485 |
{ |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
486 |
uint64_t ns = Now ().ApproximateToNanoSeconds (); |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
487 |
return ns / 1000; |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
488 |
} |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
489 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
490 |
SimulatorTests::A (int a) |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
491 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
492 |
m_a = false; |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
493 |
} |
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
494 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
495 |
SimulatorTests::B (int b) |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
496 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
497 |
if (b != 2 || NowUs () != 11) |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
498 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
499 |
m_b = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
500 |
} |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
501 |
else |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
502 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
503 |
m_b = true; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
504 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
505 |
Simulator::Remove (m_idC); |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
506 |
Simulator::Schedule (Now () + MicroSeconds (10), &SimulatorTests::D, this, 4); |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
507 |
} |
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
508 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
509 |
SimulatorTests::C (int c) |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
510 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
511 |
m_c = false; |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
512 |
} |
32 | 513 |
void |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
514 |
SimulatorTests::D (int d) |
32 | 515 |
{ |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
516 |
if (d != 4 || NowUs () != (11+10)) |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
517 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
518 |
m_d = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
519 |
} |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
520 |
else |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
521 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
522 |
m_d = true; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
523 |
} |
32 | 524 |
} |
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
525 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
526 |
SimulatorTests::bar0 (void) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
527 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
528 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
529 |
SimulatorTests::bar1 (int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
530 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
531 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
532 |
SimulatorTests::bar2 (int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
533 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
534 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
535 |
SimulatorTests::bar3 (int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
536 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
537 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
538 |
SimulatorTests::bar4 (int, int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
539 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
540 |
void |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
541 |
SimulatorTests::bar5 (int, int, int, int, int) |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
542 |
{} |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
543 |
|
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
544 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
545 |
SimulatorTests::RunOneTest (void) |
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
546 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
547 |
bool ok = true; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
548 |
m_a = true; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
549 |
m_b = false; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
550 |
m_c = true; |
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
551 |
m_d = false; |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
552 |
|
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
553 |
EventId a = Simulator::Schedule (Now () + MicroSeconds (10), &SimulatorTests::A, this, 1); |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
554 |
Simulator::Schedule (Now () + MicroSeconds (11), &SimulatorTests::B, this, 2); |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
129
diff
changeset
|
555 |
m_idC = Simulator::Schedule (Now () + MicroSeconds (12), &SimulatorTests::C, this, 3); |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
556 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
557 |
Simulator::Cancel (a); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
558 |
Simulator::Run (); |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
559 |
|
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
560 |
if (!m_a || !m_b || !m_c || !m_d) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
561 |
{ |
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
562 |
ok = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
563 |
} |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
564 |
return ok; |
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
565 |
} |
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
566 |
bool |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
567 |
SimulatorTests::RunTests (void) |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
568 |
{ |
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
569 |
bool ok = true; |
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
570 |
|
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
571 |
Simulator::SetLinkedList (); |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
572 |
if (!RunOneTest ()) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
573 |
{ |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
574 |
ok = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
575 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
576 |
Simulator::Destroy (); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
577 |
Simulator::SetBinaryHeap (); |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
578 |
if (!RunOneTest ()) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
579 |
{ |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
580 |
ok = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
581 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
582 |
Simulator::Destroy (); |
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
583 |
Simulator::SetStdMap (); |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
584 |
if (!RunOneTest ()) |
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
585 |
{ |
114
fe0504af6d16
test each default event scheduler
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
111
diff
changeset
|
586 |
ok = false; |
129
c6c58f17dd01
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
122
diff
changeset
|
587 |
} |
122
6b8f1eda5c57
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
121
diff
changeset
|
588 |
Simulator::Destroy (); |
31
2def0da92178
add simulator tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
30
diff
changeset
|
589 |
|
146
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
590 |
|
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
591 |
Simulator::Schedule (Seconds (0.0), &foo0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
592 |
Simulator::Schedule (Seconds (0.0), &foo1, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
593 |
Simulator::Schedule (Seconds (0.0), &foo2, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
594 |
Simulator::Schedule (Seconds (0.0), &foo3, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
595 |
Simulator::Schedule (Seconds (0.0), &foo4, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
596 |
Simulator::Schedule (Seconds (0.0), &foo5, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
597 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar0, this); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
598 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar1, this, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
599 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar2, this, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
600 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar3, this, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
601 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar4, this, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
602 |
Simulator::Schedule (Seconds (0.0), &SimulatorTests::bar5, this, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
603 |
Simulator::ScheduleNow (&foo0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
604 |
Simulator::ScheduleNow (&foo1, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
605 |
Simulator::ScheduleNow (&foo2, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
606 |
Simulator::ScheduleNow (&foo3, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
607 |
Simulator::ScheduleNow (&foo4, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
608 |
Simulator::ScheduleNow (&foo5, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
609 |
Simulator::ScheduleNow (&SimulatorTests::bar0, this); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
610 |
Simulator::ScheduleNow (&SimulatorTests::bar1, this, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
611 |
Simulator::ScheduleNow (&SimulatorTests::bar2, this, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
612 |
Simulator::ScheduleNow (&SimulatorTests::bar3, this, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
613 |
Simulator::ScheduleNow (&SimulatorTests::bar4, this, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
614 |
Simulator::ScheduleNow (&SimulatorTests::bar5, this, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
615 |
Simulator::ScheduleDestroy (&foo0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
616 |
Simulator::ScheduleDestroy (&foo1, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
617 |
Simulator::ScheduleDestroy (&foo2, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
618 |
Simulator::ScheduleDestroy (&foo3, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
619 |
Simulator::ScheduleDestroy (&foo4, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
620 |
Simulator::ScheduleDestroy (&foo5, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
621 |
Simulator::ScheduleDestroy (&SimulatorTests::bar0, this); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
622 |
Simulator::ScheduleDestroy (&SimulatorTests::bar1, this, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
623 |
Simulator::ScheduleDestroy (&SimulatorTests::bar2, this, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
624 |
Simulator::ScheduleDestroy (&SimulatorTests::bar3, this, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
625 |
Simulator::ScheduleDestroy (&SimulatorTests::bar4, this, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
626 |
Simulator::ScheduleDestroy (&SimulatorTests::bar5, this, 0, 0, 0, 0, 0); |
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
627 |
|
2c9ef359e320
implement overloads for ScheduleNow and ScheduleDestroy
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
145
diff
changeset
|
628 |
|
54
f860e6f94787
change indent to be 4 spaces
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
53
diff
changeset
|
629 |
return ok; |
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
630 |
} |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
631 |
|
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
52
diff
changeset
|
632 |
SimulatorTests gSimulatorTests; |
30
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
633 |
|
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
634 |
}; // namespace ns3 |
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
635 |
|
eb38b7903dfb
add empty simulator test
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
29
diff
changeset
|
636 |
#endif /* RUN_SELF_TESTS */ |
24 | 637 |
|
638 |
||
37
af78cb75be51
improve tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
36
diff
changeset
|
639 |