From 135a4ab58caecb87a9dbd90a91ccdfabd7d4db13 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 12 Dec 2007 13:17:04 +0100 Subject: [PATCH] add MacStation::ReportFinal* methods for onoe rate control model --- src/devices/wifi/arf-mac-stations.cc | 7 +++++++ src/devices/wifi/arf-mac-stations.h | 2 ++ src/devices/wifi/cr-mac-stations.cc | 7 +++++++ src/devices/wifi/cr-mac-stations.h | 3 +++ src/devices/wifi/ideal-mac-stations.cc | 7 +++++++ src/devices/wifi/ideal-mac-stations.h | 2 ++ src/devices/wifi/mac-stations.cc | 10 ++++++++++ src/devices/wifi/mac-stations.h | 2 ++ 8 files changed, 40 insertions(+) diff --git a/src/devices/wifi/arf-mac-stations.cc b/src/devices/wifi/arf-mac-stations.cc index 3802cee9a..5ac04373d 100644 --- a/src/devices/wifi/arf-mac-stations.cc +++ b/src/devices/wifi/arf-mac-stations.cc @@ -164,6 +164,13 @@ void ArfMacStation::ReportDataOk (double ackSnr, WifiMode ackMode, double dataSn m_recovery = true; } } +void +ArfMacStation::ReportFinalRtsFailed (void) +{} +void +ArfMacStation::ReportFinalDataFailed (void) +{} + WifiMode ArfMacStation::DoGetDataMode (uint32_t size) { diff --git a/src/devices/wifi/arf-mac-stations.h b/src/devices/wifi/arf-mac-stations.h index 52987dcdc..019b1933c 100644 --- a/src/devices/wifi/arf-mac-stations.h +++ b/src/devices/wifi/arf-mac-stations.h @@ -63,6 +63,8 @@ public: virtual void ReportDataFailed (void); virtual void ReportRtsOk (double ctsSnr, WifiMode ctsMode, double rtsSnr); virtual void ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr); + virtual void ReportFinalRtsFailed (void); + virtual void ReportFinalDataFailed (void); private: virtual ArfMacStations *GetStations (void) const; diff --git a/src/devices/wifi/cr-mac-stations.cc b/src/devices/wifi/cr-mac-stations.cc index 41c60d6a5..d7e1aa5d3 100644 --- a/src/devices/wifi/cr-mac-stations.cc +++ b/src/devices/wifi/cr-mac-stations.cc @@ -46,6 +46,13 @@ CrMacStation::ReportRtsOk (double ctsSnr, WifiMode ctsMode, double rtsSnr) void CrMacStation::ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr) {} +void +CrMacStation::ReportFinalRtsFailed (void) +{} +void +CrMacStation::ReportFinalDataFailed (void) +{} + WifiMode CrMacStation::DoGetDataMode (uint32_t size) { diff --git a/src/devices/wifi/cr-mac-stations.h b/src/devices/wifi/cr-mac-stations.h index 501593fd0..3a994e8b5 100644 --- a/src/devices/wifi/cr-mac-stations.h +++ b/src/devices/wifi/cr-mac-stations.h @@ -59,6 +59,9 @@ public: virtual void ReportDataFailed (void); virtual void ReportRtsOk (double ctsSnr, WifiMode ctsMode, double rtsSnr); virtual void ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr); + virtual void ReportFinalRtsFailed (void); + virtual void ReportFinalDataFailed (void); + private: virtual CrMacStations *GetStations (void) const; virtual WifiMode DoGetDataMode (uint32_t size); diff --git a/src/devices/wifi/ideal-mac-stations.cc b/src/devices/wifi/ideal-mac-stations.cc index 8a6244575..5a037eb0e 100644 --- a/src/devices/wifi/ideal-mac-stations.cc +++ b/src/devices/wifi/ideal-mac-stations.cc @@ -93,6 +93,13 @@ IdealMacStation::ReportDataOk (double ackSnr, WifiMode ackMode, double dataSnr) TRACE ("got cts for rts snr="<