From dfd965e6f801a295c3a334885c2abdd3134456c2 Mon Sep 17 00:00:00 2001 From: "Peter D. Barnes, Jr." Date: Fri, 26 Jun 2015 11:43:48 -0700 Subject: [PATCH] Revert unintentional change of third.cc trace file names, and remove execute bits. These were introduced in 11418:4d6051f4166f. Reported by Tom Henderson --- examples/tutorial/third.cc | 14 +++++++------- src/mpi/examples/third-distributed.cc | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) mode change 100755 => 100644 examples/tutorial/third.cc mode change 100755 => 100644 src/mpi/examples/third-distributed.cc diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc old mode 100755 new mode 100644 index e6360c4ae..abb2bd376 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -25,6 +25,10 @@ // Default Network Topology // +// Number of wifi or csma nodes can be increased up to 250 +// | +// Rank 0 | Rank 1 +// -------------------------|---------------------------- // Wifi 10.1.3.0 // AP // * * * * @@ -175,13 +179,9 @@ main (int argc, char *argv[]) if (tracing == true) { - pointToPoint.EnablePcapAll ("third-distributed-wifi"); - phy.EnablePcap ("third-distributed-wifi", apDevices.Get (0)); - csma.EnablePcap ("third-distributed-wifi", csmaDevices.Get (0), true); - - pointToPoint.EnablePcapAll ("third-distributed-csma"); - phy.EnablePcap ("third-distributed-csma", apDevices.Get (0)); - csma.EnablePcap ("third-distributed-csma", csmaDevices.Get (0), true); + pointToPoint.EnablePcapAll ("third"); + phy.EnablePcap ("third", apDevices.Get (0)); + csma.EnablePcap ("third", csmaDevices.Get (0), true); } Simulator::Run (); diff --git a/src/mpi/examples/third-distributed.cc b/src/mpi/examples/third-distributed.cc old mode 100755 new mode 100644 index 40624f9b0..17950b4fb --- a/src/mpi/examples/third-distributed.cc +++ b/src/mpi/examples/third-distributed.cc @@ -26,6 +26,7 @@ #include "ns3/mpi-module.h" // Default Network Topology +// // (same as third.cc from tutorial) // Distributed simulation, split along the p2p link // Number of wifi or csma nodes can be increased up to 250