Left: | ||
Right: |
OLD | NEW |
---|---|
1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2009 CTTC | 3 * Copyright (c) 2009 CTTC |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
199 } | 199 } |
200 | 200 |
201 void | 201 void |
202 AthstatsWifiTraceSink::TxFinalDataFailedTrace (std::string context, Mac48Address address) | 202 AthstatsWifiTraceSink::TxFinalDataFailedTrace (std::string context, Mac48Address address) |
203 { | 203 { |
204 NS_LOG_FUNCTION (this << context << address); | 204 NS_LOG_FUNCTION (this << context << address); |
205 ++m_exceededRetryCount; | 205 ++m_exceededRetryCount; |
206 } | 206 } |
207 | 207 |
208 void | 208 void |
209 AthstatsWifiTraceSink::PhyRxOkTrace (std::string context, Ptr<const Packet> pack et, double snr, WifiMode mode, WifiPreamble preamble) | 209 AthstatsWifiTraceSink::PhyRxOkTrace (std::string context, Ptr<const Packet> pack et, double snr, WifiMode mode, enum WifiPreamble preamble) |
S. Deronne
2018/02/23 20:25:56
"enum" not needed
ammo6818-vandals.uidaho.edu
2018/02/25 10:41:45
enum removed
| |
210 { | 210 { |
211 NS_LOG_FUNCTION (this << context << packet << " mode=" << mode << " snr=" << s nr << "preamble=" << preamble); | 211 NS_LOG_FUNCTION (this << context << packet << " mode=" << mode << " snr=" << s nr << "preamble=" << preamble); |
212 ++m_phyRxOkCount; | 212 ++m_phyRxOkCount; |
213 } | 213 } |
214 | 214 |
215 void | 215 void |
216 AthstatsWifiTraceSink::PhyRxErrorTrace (std::string context, Ptr<const Packet> p acket, double snr) | 216 AthstatsWifiTraceSink::PhyRxErrorTrace (std::string context, Ptr<const Packet> p acket, double snr) |
217 { | 217 { |
218 NS_LOG_FUNCTION (this << context << packet << " snr=" << snr ); | 218 NS_LOG_FUNCTION (this << context << packet << " snr=" << snr ); |
219 ++m_phyRxErrorCount; | 219 ++m_phyRxErrorCount; |
220 } | 220 } |
221 | 221 |
222 void | 222 void |
223 AthstatsWifiTraceSink::PhyTxTrace (std::string context, Ptr<const Packet> packet , WifiMode mode, WifiPreamble preamble, uint8_t txPower) | 223 AthstatsWifiTraceSink::PhyTxTrace (std::string context, Ptr<const Packet> packet , WifiMode mode, WifiPreamble preamble, uint8_t txPower) |
224 { | 224 { |
225 NS_LOG_FUNCTION (this << context << packet << "PHYTX mode=" << mode ); | 225 NS_LOG_FUNCTION (this << context << packet << "PHYTX mode=" << mode ); |
226 ++m_phyTxCount; | 226 ++m_phyTxCount; |
227 } | 227 } |
228 | 228 |
229 void | 229 void |
230 AthstatsWifiTraceSink::PhyStateTrace (std::string context, Time start, Time dura tion, WifiPhy::State state) | 230 AthstatsWifiTraceSink::PhyStateTrace (std::string context, Time start, Time dura tion, WifiPhyState state) |
231 { | 231 { |
232 NS_LOG_FUNCTION (this << context << start << duration << state); | 232 NS_LOG_FUNCTION (this << context << start << duration << state); |
233 | 233 |
234 } | 234 } |
235 | 235 |
236 void | 236 void |
237 AthstatsWifiTraceSink::Open (std::string const &name) | 237 AthstatsWifiTraceSink::Open (std::string const &name) |
238 { | 238 { |
239 NS_LOG_FUNCTION (this << name); | 239 NS_LOG_FUNCTION (this << name); |
240 NS_ABORT_MSG_UNLESS (m_writer == 0, "AthstatsWifiTraceSink::Open (): m_writer already allocated (std::ofstream leak detected)"); | 240 NS_ABORT_MSG_UNLESS (m_writer == 0, "AthstatsWifiTraceSink::Open (): m_writer already allocated (std::ofstream leak detected)"); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
277 { | 277 { |
278 | 278 |
279 *m_writer << str; | 279 *m_writer << str; |
280 | 280 |
281 ResetCounters (); | 281 ResetCounters (); |
282 Simulator::Schedule (m_interval, &AthstatsWifiTraceSink::WriteStats, this) ; | 282 Simulator::Schedule (m_interval, &AthstatsWifiTraceSink::WriteStats, this) ; |
283 } | 283 } |
284 } | 284 } |
285 | 285 |
286 } //namespace ns3 | 286 } //namespace ns3 |
OLD | NEW |