checkpoint

This commit is contained in:
Craig Dowell
2010-01-22 12:44:53 -08:00
parent 699ade6453
commit a58a79f06e
53 changed files with 1120 additions and 762 deletions

View File

@@ -191,7 +191,7 @@ main (int argc, char *argv[])
AsciiTraceHelper ascii;
Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("dynamic-global-routing.tr", "w");
Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("dynamic-global-routing.tr");
p2p.EnableAsciiAll (stream);
csma.EnableAsciiAll (stream);
internet.EnableAsciiAll (stream);

View File

@@ -146,10 +146,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("global-routing-injection32.tr", std::ios_base::binary | std::ios_base::out);
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("global-routing-injection32.tr"));
p2p.EnablePcapAll ("global-routing-injection32");
PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();

View File

@@ -119,10 +119,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("global-routing-slash32.tr", std::ios_base::binary | std::ios_base::out);
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("global-routing-slash32.tr"));
p2p.EnablePcapAll ("global-routing-slash32");
PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();

View File

@@ -121,9 +121,9 @@ main (int argc, char *argv[])
apps.Stop (Seconds (10.0));
AsciiTraceHelper ascii;
Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("mixed-global-routing.tr", "w");
Ptr<OutputStreamObject> stream = ascii.CreateFileStream ("mixed-global-routing.tr");
p2p.EnableAsciiAll (stream);
csma,EnableAsciiAll (stream);
csma.EnableAsciiAll (stream);
p2p.EnablePcapAll ("mixed-global-routing");
csma.EnablePcapAll ("mixed-global-routing", false);

View File

@@ -152,10 +152,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("simple-alternate-routing.tr");
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-alternate-routing.tr"));
p2p.EnablePcapAll ("simple-alternate-routing");
PointToPointHelper::EnableAsciiAll (ascii);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();

View File

@@ -145,10 +145,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("simple-global-routing.tr");
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-global-routing.tr"));
p2p.EnablePcapAll ("simple-global-routing");
PointToPointHelper::EnableAsciiAll (ascii);
// Flow Monitor
Ptr<FlowMonitor> flowmon;

View File

@@ -157,10 +157,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.1));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("simple-point-to-point-olsr.tr");
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("simple-point-to-point-olsr.tr"));
p2p.EnablePcapAll ("simple-point-to-point-olsr");
PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Stop (Seconds (30));

View File

@@ -151,10 +151,9 @@ int main (int argc, char** argv)
apps.Start (Seconds (2.0));
apps.Stop (Seconds (20.0));
std::ofstream ascii;
ascii.open ("simple-routing-ping6.tr");
csma.EnablePcapAll (std::string ("simple-routing-ping6"), true);
CsmaHelper::EnableAsciiAll (ascii);
AsciiTraceHelper ascii;
csma.EnableAsciiAll (ascii.CreateFileStream ("simple-routing-ping6.tr"));
csma.EnablePcapAll ("simple-routing-ping6", true);
NS_LOG_INFO ("Run Simulation.");
Simulator::Run ();

View File

@@ -124,10 +124,9 @@ main (int argc, char *argv[])
apps.Start (Seconds (1.0));
apps.Stop (Seconds (10.0));
std::ofstream ascii;
ascii.open ("static-routing-slash32.tr");
AsciiTraceHelper ascii;
p2p.EnableAsciiAll (ascii.CreateFileStream ("static-routing-slash32.tr"));
p2p.EnablePcapAll ("static-routing-slash32");
PointToPointHelper::EnableAsciiAll (ascii);
Simulator::Run ();
Simulator::Destroy ();