author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Fri, 04 Apr 2008 19:02:03 +0200 | |
changeset 2877 | 1e8a42e5d4c1 |
parent 2834 | 1aab57845b07 |
child 3051 | 399d3858d190 |
permissions | -rw-r--r-- |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
1 |
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
2 |
/* |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
3 |
* Copyright (c) 2006 INRIA |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
4 |
* |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation; |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
8 |
* |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
12 |
* GNU General Public License for more details. |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
13 |
* |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
17 |
* |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
18 |
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
19 |
*/ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
20 |
#include "ns3/system-wall-clock-ms.h" |
14
6dd7d31c6fc3
replace yans include with ns3 include
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
12
diff
changeset
|
21 |
#include "ns3/packet.h" |
882
777fcfabc1c8
rename packet-history.h to packet-metadata.h
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
881
diff
changeset
|
22 |
#include "ns3/packet-metadata.h" |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
23 |
#include <iostream> |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
24 |
#include <sstream> |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
25 |
|
16
99e833adbb46
change yans namespace to ns3
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
14
diff
changeset
|
26 |
using namespace ns3; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
|
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
28 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
29 |
class BenchHeader : public Header |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
30 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
31 |
public: |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
32 |
BenchHeader (); |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
33 |
bool IsOk (void) const; |
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
34 |
|
2643
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
35 |
static TypeId GetTypeId (void); |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
36 |
virtual TypeId GetInstanceTypeId (void) const; |
2646
c1fef7686472
remove dead code.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2643
diff
changeset
|
37 |
virtual void Print (std::ostream &os) const; |
2643
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
38 |
virtual uint32_t GetSerializedSize (void) const; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
39 |
virtual void Serialize (Buffer::Iterator start) const; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
40 |
virtual uint32_t Deserialize (Buffer::Iterator start); |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
41 |
private: |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
42 |
bool m_ok; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
43 |
}; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
44 |
|
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
45 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
46 |
BenchHeader<N>::BenchHeader () |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
47 |
: m_ok (false) |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
48 |
{} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
49 |
|
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
50 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
51 |
bool |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
52 |
BenchHeader<N>::IsOk (void) const |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
53 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
54 |
return m_ok; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
55 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
56 |
|
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
57 |
template <int N> |
2643
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
58 |
TypeId |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
59 |
BenchHeader<N>::GetTypeId (void) |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
60 |
{ |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
61 |
std::ostringstream oss; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
62 |
oss << "ns3::BenchHeader<"<<N<<">"; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
63 |
static TypeId tid = TypeId (oss.str ().c_str ()) |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
64 |
.SetParent<Header> () |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
65 |
; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
66 |
return tid; |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
67 |
} |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
68 |
template <int N> |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
69 |
TypeId |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
70 |
BenchHeader<N>::GetInstanceTypeId (void) const |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
71 |
{ |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
72 |
return GetTypeId (); |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
73 |
} |
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
74 |
|
2a3324f4dabe
define a TypeId for each Header/Trailer.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1869
diff
changeset
|
75 |
template <int N> |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
76 |
void |
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
77 |
BenchHeader<N>::Print (std::ostream &os) const |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
78 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
79 |
NS_ASSERT (false); |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
80 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
81 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
82 |
uint32_t |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
83 |
BenchHeader<N>::GetSerializedSize (void) const |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
84 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
85 |
return N; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
86 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
87 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
88 |
void |
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
89 |
BenchHeader<N>::Serialize (Buffer::Iterator start) const |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
90 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
91 |
start.WriteU8 (N, N); |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
92 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
93 |
template <int N> |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
94 |
uint32_t |
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
95 |
BenchHeader<N>::Deserialize (Buffer::Iterator start) |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
96 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
97 |
m_ok = true; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
98 |
for (int i = 0; i < N; i++) |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
99 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
100 |
if (start.ReadU8 () != N) |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
101 |
{ |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
102 |
m_ok = false; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
103 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
104 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
105 |
return N; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
106 |
} |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
107 |
|
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
108 |
|
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
109 |
|
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
110 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
111 |
benchPtrA (uint32_t n) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
112 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
113 |
BenchHeader<25> ipv4; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
114 |
BenchHeader<8> udp; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
115 |
|
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
116 |
for (uint32_t i = 0; i < n; i++) { |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
117 |
Ptr<Packet> p = Create<Packet> (2000); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
118 |
p->AddHeader (udp); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
119 |
p->AddHeader (ipv4); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
120 |
Ptr<Packet> o = p->Copy (); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
121 |
o->RemoveHeader (ipv4); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
122 |
o->RemoveHeader (udp); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
123 |
} |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
124 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
125 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
126 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
127 |
benchPtrB (uint32_t n) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
128 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
129 |
BenchHeader<25> ipv4; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
130 |
BenchHeader<8> udp; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
131 |
|
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
132 |
for (uint32_t i = 0; i < n; i++) { |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
133 |
Ptr<Packet> p = Create<Packet> (2000); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
134 |
p->AddHeader (udp); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
135 |
p->AddHeader (ipv4); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
136 |
} |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
137 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
138 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
139 |
static void |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
140 |
ptrC2 (Ptr<Packet> p) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
141 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
142 |
BenchHeader<8> udp; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
143 |
|
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
144 |
p->RemoveHeader (udp); |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
145 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
146 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
147 |
static void |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
148 |
ptrC1 (Ptr<Packet> p) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
149 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
150 |
BenchHeader<25> ipv4; |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
151 |
p->RemoveHeader (ipv4); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
152 |
ptrC2 (p); |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
153 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
154 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
155 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
156 |
benchPtrC (uint32_t n) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
157 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
158 |
BenchHeader<25> ipv4; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
159 |
BenchHeader<8> udp; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
160 |
|
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
161 |
for (uint32_t i = 0; i < n; i++) { |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
162 |
Ptr<Packet> p = Create<Packet> (2000); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
163 |
p->AddHeader (udp); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
164 |
p->AddHeader (ipv4); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
165 |
ptrC1 (p); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
166 |
} |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
167 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
168 |
|
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
169 |
#if 0 |
884
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
170 |
static void |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
171 |
benchPrint (uint32_t n) |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
172 |
{ |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
173 |
PacketPrinter printer; |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
174 |
BenchHeader<25> ipv4; |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
175 |
BenchHeader<8> udp; |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
176 |
Ptr<Packet> p = Create<Packet> (2000); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
177 |
p->AddHeader (udp); |
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
178 |
p->AddHeader (ipv4); |
884
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
179 |
|
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
180 |
for (uint32_t i = 0; i < n; i++) |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
181 |
{ |
1866
e7dbcc4df546
do not use Packet objects directly. Use Ptr<Packet> instead
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
1323
diff
changeset
|
182 |
p->Print (std::cerr, printer); |
884
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
183 |
} |
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
184 |
} |
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
185 |
#endif |
884
f3836277079e
fix uleb128 reading bug
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
883
diff
changeset
|
186 |
|
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
187 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
188 |
static void |
53
ae406f4957d5
variable/method/function coding style update
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
16
diff
changeset
|
189 |
runBench (void (*bench) (uint32_t), uint32_t n, char const *name) |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
190 |
{ |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
191 |
SystemWallClockMs time; |
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
192 |
time.Start (); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
193 |
(*bench) (n); |
832
3d1243d770d9
fix the packet benchmark and enable it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
150
diff
changeset
|
194 |
unsigned long long deltaMs = time.End (); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
195 |
double ps = n; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
196 |
ps *= 1000; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
197 |
ps /= deltaMs; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
198 |
std::cout << name<<"=" << ps << " packets/s" << std::endl; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
199 |
} |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
200 |
|
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
201 |
int main (int argc, char *argv[]) |
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
202 |
{ |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
203 |
uint32_t n = 0; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
204 |
while (argc > 0) { |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
832
diff
changeset
|
205 |
if (strncmp ("--n=", argv[0],strlen ("--n=")) == 0) |
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
832
diff
changeset
|
206 |
{ |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
207 |
char const *nAscii = argv[0] + strlen ("--n="); |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
208 |
n = atoi (nAscii); |
833
224bfad58818
a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
832
diff
changeset
|
209 |
} |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
210 |
argc--; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
211 |
argv++; |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
212 |
} |
1814
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
213 |
if (n == 0) |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
214 |
{ |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
215 |
std::cerr << "Error-- number of packets must be specified " << |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
216 |
"by command-line argument --n=(number of packets)" << std::endl; |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
217 |
exit (1); |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
218 |
} |
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
219 |
std::cout << "Running bench-packets with n=" << n << std::endl; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
220 |
|
1814
21c9c4dd9768
update bench-packets.cc program
Tom Henderson <tomh@tomh.org>
parents:
1323
diff
changeset
|
221 |
Packet::EnableMetadata (); |
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
222 |
runBench (&benchPtrA, n, "a"); |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
223 |
runBench (&benchPtrB, n, "b"); |
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
224 |
runBench (&benchPtrC, n, "c"); |
894
d6715af78f7e
update packet benchmark
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
884
diff
changeset
|
225 |
|
1322
b6a4885a92df
re-enable packet benchmarking
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
894
diff
changeset
|
226 |
//runBench (&benchPrint, n, "print"); |
894
d6715af78f7e
update packet benchmark
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
884
diff
changeset
|
227 |
runBench (&benchPtrA, n, "meta-a"); |
d6715af78f7e
update packet benchmark
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
884
diff
changeset
|
228 |
runBench (&benchPtrB, n, "meta-b"); |
d6715af78f7e
update packet benchmark
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
884
diff
changeset
|
229 |
runBench (&benchPtrC, n, "meta-c"); |
d6715af78f7e
update packet benchmark
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
884
diff
changeset
|
230 |
|
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
231 |
|
150
663120712cd9
fix coding style
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
131
diff
changeset
|
232 |
return 0; |
12
917ba023c576
utils and samples
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
233 |
} |