Fix clang-tidy readability-isolate-declaration warnings

This commit is contained in:
Eduardo Almeida
2022-10-06 22:20:10 +00:00
parent f65238a0db
commit c1e7757315
130 changed files with 701 additions and 258 deletions

View File

@@ -294,7 +294,10 @@ int main (int argc, char *argv[])
rxS2R2Bytes.reserve (20);
rxS3R1Bytes.reserve (10);
NodeContainer S1, S2, S3, R2;
NodeContainer S1;
NodeContainer S2;
NodeContainer S3;
NodeContainer R2;
Ptr<Node> T1 = CreateObject<Node> ();
Ptr<Node> T2 = CreateObject<Node> ();
Ptr<Node> R1 = CreateObject<Node> ();

View File

@@ -140,7 +140,8 @@ int main (int argc, char *argv [])
Config::SetDefault ("ns3::DropTailQueue<Packet>::MaxSize", QueueSizeValue (QueueSize ("1p")));
Config::SetDefault (queueDisc + "::MaxSize", QueueSizeValue (QueueSize ("100p")));
NodeContainer sender, receiver;
NodeContainer sender;
NodeContainer receiver;
NodeContainer routers;
sender.Create (1);
receiver.Create (1);

View File

@@ -151,7 +151,9 @@ int main (int argc, char *argv[])
}
// Create nodes
NodeContainer leftNodes, rightNodes, routers;
NodeContainer leftNodes;
NodeContainer rightNodes;
NodeContainer routers;
routers.Create (2);
leftNodes.Create (1);
rightNodes.Create (1);

View File

@@ -153,7 +153,9 @@ int main (int argc, char *argv[])
float stopTime = startTime + simDuration;
// Create nodes
NodeContainer n1, n2, n3;
NodeContainer n1;
NodeContainer n2;
NodeContainer n3;
n1.Create (1);
n2.Create (1);
n3.Create (1);
@@ -269,7 +271,9 @@ int main (int argc, char *argv[])
// Flows configuration
// Bidirectional TCP streams with ping like flent tcp_bidirectional test.
uint16_t port = 7;
ApplicationContainer uploadApp, downloadApp, sourceApps;
ApplicationContainer uploadApp;
ApplicationContainer downloadApp;
ApplicationContainer sourceApps;
// Configure and install upload flow
Address addUp (InetSocketAddress (Ipv4Address::GetAny (), port));
PacketSinkHelper sinkHelperUp ("ns3::TcpSocketFactory", addUp);

View File

@@ -122,7 +122,14 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
WifiMacHelper mac;
NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;
NetDeviceContainer staDeviceA;
NetDeviceContainer staDeviceB;
NetDeviceContainer staDeviceC;
NetDeviceContainer staDeviceD;
NetDeviceContainer apDeviceA;
NetDeviceContainer apDeviceB;
NetDeviceContainer apDeviceC;
NetDeviceContainer apDeviceD;
Ssid ssid;
//Network A

View File

@@ -107,7 +107,14 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
WifiMacHelper mac;
NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;
NetDeviceContainer staDeviceA;
NetDeviceContainer staDeviceB;
NetDeviceContainer staDeviceC;
NetDeviceContainer staDeviceD;
NetDeviceContainer apDeviceA;
NetDeviceContainer apDeviceB;
NetDeviceContainer apDeviceC;
NetDeviceContainer apDeviceD;
Ssid ssid;
// Network A

View File

@@ -173,7 +173,8 @@ int main (int argc, char *argv[])
NodeContainer wifiApNode;
wifiApNode.Create (1);
NetDeviceContainer apDevice, staDevices;
NetDeviceContainer apDevice;
NetDeviceContainer staDevices;
WifiMacHelper mac;
WifiHelper wifi;
std::string channelStr ("{0, " + std::to_string (channelWidth) + ", ");

View File

@@ -126,13 +126,15 @@ int main (int argc, char *argv[])
Ipv4AddressHelper address;
address.SetBase ("192.168.1.0", "255.255.255.0");
Ipv4InterfaceContainer staNodeInterfaces, apNodeInterface;
Ipv4InterfaceContainer staNodeInterfaces;
Ipv4InterfaceContainer apNodeInterface;
staNodeInterfaces = address.Assign (staDevices);
apNodeInterface = address.Assign (apDevice);
// Setting applications
ApplicationContainer sourceApplications, sinkApplications;
ApplicationContainer sourceApplications;
ApplicationContainer sinkApplications;
std::vector<uint8_t> tosValues = {0x70, 0x28, 0xb8, 0xc0}; //AC_BE, AC_BK, AC_VI, AC_VO
uint32_t portNumber = 9;
for (uint32_t index = 0; index < nWifi; ++index)

View File

@@ -403,7 +403,8 @@ Experiment::SendMultiDestinations (Ptr<Node> sender, NodeContainer c)
ev->SetAttribute ("Mean", DoubleValue (m_expMean));
ev->SetAttribute ("Bound", DoubleValue (m_totalTime));
double start = 0.0, stop;
double start = 0.0;
double stop;
uint32_t destIndex;
for (uint32_t i = 0; i < c.GetN (); i++)
@@ -585,7 +586,15 @@ Experiment::Run (const WifiHelper &wifi, const YansWifiPhyHelper &wifiPhy,
//GenerateNeighbors(NodeContainer, uint32_t sender)
//Note: these senders are hand-picked in order to ensure good coverage
//you might have to change these values for other grids
NodeContainer c1, c2, c3, c4, c5, c6, c7, c8, c9;
NodeContainer c1;
NodeContainer c2;
NodeContainer c3;
NodeContainer c4;
NodeContainer c5;
NodeContainer c6;
NodeContainer c7;
NodeContainer c8;
NodeContainer c9;
c1 = GenerateNeighbors (c, 22);
c2 = GenerateNeighbors (c, 24);

View File

@@ -136,7 +136,14 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));
WifiMacHelper mac;
NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;
NetDeviceContainer staDeviceA;
NetDeviceContainer staDeviceB;
NetDeviceContainer staDeviceC;
NetDeviceContainer staDeviceD;
NetDeviceContainer apDeviceA;
NetDeviceContainer apDeviceB;
NetDeviceContainer apDeviceC;
NetDeviceContainer apDeviceD;
Ssid ssid;
// Network A