author | Tom Henderson <tomh@tomh.org> |
Sat, 15 Dec 2012 23:02:03 -0800 | |
changeset 9195 | f0be2daaa38f |
parent 9187 | 8ef8d8bae350 |
child 9196 | 097915486ed0 |
permissions | -rw-r--r-- |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
144
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2005,2006 INRIA |
680
0bbe0e4d73c6
add reference to Emmanuelle in Authors/Copyright
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
679
diff
changeset
|
4 |
* Copyright (c) 2007 Emmanuelle Laprise |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* This program is free software; you can redistribute it and/or modify |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* it under the terms of the GNU General Public License version 2 as |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* published by the Free Software Foundation; |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* This program is distributed in the hope that it will be useful, |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* GNU General Public License for more details. |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* along with this program; if not, write to the Free Software |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
680
0bbe0e4d73c6
add reference to Emmanuelle in Authors/Copyright
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
679
diff
changeset
|
20 |
* TimeStep support by Emmanuelle Laprise <emmanuelle.laprise@bluekazoo.ca> |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
21 |
*/ |
679
0c4773ca0f29
avoid cyclic dependency between Simulator and Time code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
678
diff
changeset
|
22 |
#include "nstime.h" |
7383
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
23 |
#include "abort.h" |
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
24 |
#include "global-value.h" |
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
25 |
#include "enum.h" |
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
26 |
#include "string.h" |
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
27 |
#include "object.h" |
c5e131450339
remove ns3/ prefix which is un-needed now that all files are in same module.
Mathieu Lacage <mathieu.lacage@gmail.com>
parents:
7169
diff
changeset
|
28 |
#include "config.h" |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
29 |
#include "log.h" |
9063
32755d0516f4
Bug 1237 - code cleanups related to includes
Vedran Miletić <rivanvx@gmail.com>
parents:
7579
diff
changeset
|
30 |
#include <cmath> |
6511
d9f23a956ef2
add missing include
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6506
diff
changeset
|
31 |
#include <sstream> |
25
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
32 |
|
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
33 |
namespace ns3 { |
9b3bb088c560
first cut at george's ideas on api
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
34 |
|
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
35 |
NS_LOG_COMPONENT_DEFINE ("Time"); |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
36 |
|
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
37 |
Time::Time (const std::string& s) |
372
c242f488ef0b
Added back corrected version of TimeUnit(string)
Raj@rajib-bhattacharjeas-computer.local
parents:
367
diff
changeset
|
38 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
39 |
NS_LOG_FUNCTION (this << &s); |
7579
91a0ff9ee4eb
Bug 1204 - Can't Parse Time +100000000.0ns
Mitch Watrous <watrous@u.washington.edu>
parents:
7383
diff
changeset
|
40 |
std::string::size_type n = s.find_first_not_of ("+-0123456789."); |
372
c242f488ef0b
Added back corrected version of TimeUnit(string)
Raj@rajib-bhattacharjeas-computer.local
parents:
367
diff
changeset
|
41 |
if (n != std::string::npos) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
42 |
{ // Found non-numeric |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
43 |
std::istringstream iss; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
44 |
iss.str (s.substr (0, n)); |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
45 |
double r; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
46 |
iss >> r; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
47 |
std::string trailer = s.substr (n, std::string::npos); |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
48 |
if (trailer == std::string ("s")) |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
49 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
50 |
*this = Time::FromDouble (r, Time::S); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
51 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
52 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
53 |
if (trailer == std::string ("ms")) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
54 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
55 |
*this = Time::FromDouble (r, Time::MS); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
56 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
57 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
58 |
if (trailer == std::string ("us")) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
59 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
60 |
*this = Time::FromDouble (r, Time::US); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
61 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
62 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
63 |
if (trailer == std::string ("ns")) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
64 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
65 |
*this = Time::FromDouble (r, Time::NS); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
66 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
67 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
68 |
if (trailer == std::string ("ps")) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
69 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
70 |
*this = Time::FromDouble (r, Time::PS); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
71 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
72 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
73 |
if (trailer == std::string ("fs")) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
74 |
{ |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
75 |
*this = Time::FromDouble (r, Time::FS); |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
76 |
return; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
77 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
78 |
NS_ABORT_MSG ("Can't Parse Time " << s); |
372
c242f488ef0b
Added back corrected version of TimeUnit(string)
Raj@rajib-bhattacharjeas-computer.local
parents:
367
diff
changeset
|
79 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
80 |
// else |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
81 |
// they didn't provide units, assume seconds |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
82 |
std::istringstream iss; |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
83 |
iss.str (s); |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
84 |
double v; |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
85 |
iss >> v; |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
86 |
*this = Time::FromDouble (v, Time::S); |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
87 |
} |
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
88 |
|
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
89 |
struct Time::Resolution |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
90 |
Time::GetNsResolution (void) |
7169
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
91 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
92 |
NS_LOG_FUNCTION_NOARGS (); |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
93 |
struct Resolution resolution; |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
94 |
SetResolution (Time::NS, &resolution); |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
95 |
return resolution; |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
96 |
} |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
97 |
void |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
98 |
Time::SetResolution (enum Unit resolution) |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
99 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
100 |
NS_LOG_FUNCTION (resolution); |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
101 |
SetResolution (resolution, PeekResolution ()); |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
102 |
} |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
103 |
void |
9186
8934b7c0c1cb
bug 954: avoid segfault upon startup due to recursion in TimeSet code to Simulator::Schedule
Mathieu Lacage <mathieu.lacage@cutebugs.net>
parents:
9183
diff
changeset
|
104 |
Time::SetResolution (enum Unit unit, struct Resolution *resolution) |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
105 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
106 |
NS_LOG_FUNCTION (unit << resolution); |
7169
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
107 |
int8_t power [LAST] = { 15, 12, 9, 6, 3, 0}; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
108 |
for (int i = 0; i < Time::LAST; i++) |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
109 |
{ |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
110 |
int shift = power[i] - power[(int)unit]; |
9063
32755d0516f4
Bug 1237 - code cleanups related to includes
Vedran Miletić <rivanvx@gmail.com>
parents:
7579
diff
changeset
|
111 |
uint64_t factor = (uint64_t) std::pow (10, std::fabs (shift)); |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
112 |
struct Information *info = &resolution->info[i]; |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
113 |
info->factor = factor; |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
114 |
if (shift == 0) |
7169
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
115 |
{ |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
116 |
info->timeFrom = int64x64_t (1); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
117 |
info->timeTo = int64x64_t (1); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
118 |
info->toMul = true; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
119 |
info->fromMul = true; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
120 |
} |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
121 |
else if (shift > 0) |
7169
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
122 |
{ |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
123 |
info->timeFrom = int64x64_t (factor); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
124 |
info->timeTo = int64x64_t::Invert (factor); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
125 |
info->toMul = false; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
126 |
info->fromMul = true; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
127 |
} |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
128 |
else |
7169
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
129 |
{ |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
130 |
NS_ASSERT (shift < 0); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
131 |
info->timeFrom = int64x64_t::Invert (factor); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
132 |
info->timeTo = int64x64_t (factor); |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
133 |
info->toMul = true; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
134 |
info->fromMul = false; |
358f71a624d8
core coding style changes
Josh Pelkey <jpelkey@gatech.edu>
parents:
7045
diff
changeset
|
135 |
} |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
136 |
} |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
137 |
resolution->unit = unit; |
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
138 |
} |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
139 |
enum Time::Unit |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
140 |
Time::GetResolution (void) |
9186
8934b7c0c1cb
bug 954: avoid segfault upon startup due to recursion in TimeSet code to Simulator::Schedule
Mathieu Lacage <mathieu.lacage@cutebugs.net>
parents:
9183
diff
changeset
|
141 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
142 |
NS_LOG_FUNCTION_NOARGS (); |
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
143 |
return PeekResolution ()->unit; |
9183
1a2abe07b53d
bug 954: Changing the simulation time resolution does not work well with attributes
Peter D. Barnes, Jr. <barnes26@llnl.gov>
parents:
9134
diff
changeset
|
144 |
} |
1a2abe07b53d
bug 954: Changing the simulation time resolution does not work well with attributes
Peter D. Barnes, Jr. <barnes26@llnl.gov>
parents:
9134
diff
changeset
|
145 |
|
1a2abe07b53d
bug 954: Changing the simulation time resolution does not work well with attributes
Peter D. Barnes, Jr. <barnes26@llnl.gov>
parents:
9134
diff
changeset
|
146 |
|
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
147 |
std::ostream& |
2409
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
148 |
operator<< (std::ostream& os, const Time & time) |
209
8b343b9727d7
fix EventId::IsExpired and Simulator::IsExpired, add EventId::IsRunning, add relevant tests, replace Seconds, MilliSeconds, MicroSeconds, and, NanoSeconds classes by functions named similarly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
199
diff
changeset
|
149 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
150 |
NS_LOG_FUNCTION (&os << time); |
911
de8102a51fbf
append correct unit when printing Time objects
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
684
diff
changeset
|
151 |
std::string unit; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
152 |
switch (Time::GetResolution ()) |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
153 |
{ |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
154 |
case Time::S: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
155 |
unit = "s"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
156 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
157 |
case Time::MS: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
158 |
unit = "ms"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
159 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
160 |
case Time::US: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
161 |
unit = "us"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
162 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
163 |
case Time::NS: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
164 |
unit = "ns"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
165 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
166 |
case Time::PS: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
167 |
unit = "ps"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
168 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
169 |
case Time::FS: |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
170 |
unit = "fs"; |
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
171 |
break; |
6514
92a84235d8f2
get rid of TimeUnit<N>
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6511
diff
changeset
|
172 |
case Time::LAST: |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
173 |
NS_ABORT_MSG ("can't be reached"); |
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
174 |
unit = "unreachable"; |
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
175 |
break; |
6180
cd0d8ba00e6c
coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6177
diff
changeset
|
176 |
} |
7044
f94b264549d1
introduce implicit conversion operator
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
7040
diff
changeset
|
177 |
int64x64_t v = time; |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
178 |
os << v << unit; |
209
8b343b9727d7
fix EventId::IsExpired and Simulator::IsExpired, add EventId::IsRunning, add relevant tests, replace Seconds, MilliSeconds, MicroSeconds, and, NanoSeconds classes by functions named similarly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
199
diff
changeset
|
179 |
return os; |
8b343b9727d7
fix EventId::IsExpired and Simulator::IsExpired, add EventId::IsRunning, add relevant tests, replace Seconds, MilliSeconds, MicroSeconds, and, NanoSeconds classes by functions named similarly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
199
diff
changeset
|
180 |
} |
2409
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
181 |
std::istream& operator>> (std::istream& is, Time & time) |
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
182 |
{ |
9195
f0be2daaa38f
bug 954: back out changesets 1a2abe07b53d, 8934b7c0c1cb, and 8ef8d8bae350
Tom Henderson <tomh@tomh.org>
parents:
9187
diff
changeset
|
183 |
NS_LOG_FUNCTION (&is << time); |
2409
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
184 |
std::string value; |
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
185 |
is >> value; |
6496
ed210e7279a7
rewrite time integer support for 32bit systems.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
6418
diff
changeset
|
186 |
time = Time (value); |
2409
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
187 |
return is; |
8744ec60e8e6
convert RandomVariable, Rectangle, Vector, and Time to the new Class Helper
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2396
diff
changeset
|
188 |
} |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
189 |
|
2447
eee344085a96
convert to new helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2436
diff
changeset
|
190 |
ATTRIBUTE_VALUE_IMPLEMENT (Time); |
eee344085a96
convert to new helpers
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2436
diff
changeset
|
191 |
ATTRIBUTE_CHECKER_IMPLEMENT (Time); |
2427
9245ec163111
split checker from ParamSpec.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2409
diff
changeset
|
192 |
|
2390
7e6dfae536cd
add Value support to Time
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2170
diff
changeset
|
193 |
} // namespace ns3 |
143
552ff26b4224
new Time implementation
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
194 |