ns-3.24: comparison doc/tutorial/source/data-collection.rst

equal deleted inserted replaced

-:19b4146b1d39
+:e943837b17ad
 type the following command: ``diff -u sixth.cc seventh.cc``, and examine
 some of the new lines of this diff:
 ::
-+  std::string probeName;
++  std::string probeType;
-+  std::string probeTrace;
++  std::string tracePath;
 +  if (useV6 == false)
 +    {
 ...
-+      probeName = "ns3::Ipv4PacketProbe";
++      probeType = "ns3::Ipv4PacketProbe";
-+      probeTrace = "/NodeList/*/$ns3::Ipv4L3Protocol/Tx";
++      tracePath = "/NodeList/*/$ns3::Ipv4L3Protocol/Tx";
 +    }
 +  else
 +    {
 ...
-+      probeName = "ns3::Ipv6PacketProbe";
++      probeType = "ns3::Ipv6PacketProbe";
-+      probeTrace = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
++      tracePath = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
 +    }
 ...
 +   // Use GnuplotHelper to plot the packet byte count over time
 +   GnuplotHelper plotHelper;
 +
 +   plotHelper.ConfigurePlot ("seventh-packet-byte-count",
 +                             "Packet Byte Count vs. Time",
 +                             "Time (Seconds)",
 +                             "Packet Byte Count");
 +
-+   // Specify the probe type, probe path (in configuration namespace), and
++   // Specify the probe type, trace source path (in configuration namespace), and
 +   // probe output trace source ("OutputBytes") to plot.  The fourth argument
 +   // specifies the name of the data series label on the plot.  The last
 +   // argument formats the plot by specifying where the key should be placed.
-+   plotHelper.PlotProbe (probeName,
++   plotHelper.PlotProbe (probeType,
-+                         probeTrace,
++                         tracePath,
 +                         "OutputBytes",
 +                         "Packet Byte Count",
 +                         GnuplotAggregator::KEY_BELOW);
 +
 +   // Use FileHelper to write out the packet byte count over time
 +   // Set the labels for this formatted output file.
 +   fileHelper.Set2dFormat ("Time (Seconds) = %.3e\tPacket Byte Count = %.0f");
 +
 +   // Specify the probe type, probe path (in configuration namespace), and
 +   // probe output trace source ("OutputBytes") to write.
-+   fileHelper.WriteProbe (probeName,
++   fileHelper.WriteProbe (probeType,
-+                          probeTrace,
++                          tracePath,
 +                          "OutputBytes");
 +
 Simulator::Stop (Seconds (20));
 Simulator::Run ();
 Simulator::Destroy ();
 The careful reader will have noticed, when testing the IPv6 command
-line attribute, that ``seventh.cc`` had created a number of new output files:
+line attribute above, that ``seventh.cc`` had created a number of new output files:
 ::
 seventh-packet-byte-count-0.txt
 seventh-packet-byte-count-1.txt
 source is hooked.  First, note above in the program we declared a few
 variables for later use:
 ::
-+  std::string probeName;
++  std::string probeType;
-+  std::string probeTrace;
++  std::string tracePath;
-+  probeName = "ns3::Ipv6PacketProbe";
++  probeType = "ns3::Ipv6PacketProbe";
-+  probeTrace = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
++  tracePath = "/NodeList/*/$ns3::Ipv6L3Protocol/Tx";
 We use them here:
 ::
-+  // Specify the probe type, probe path (in configuration namespace), and
++  // Specify the probe type, trace source path (in configuration namespace), and
 +  // probe output trace source ("OutputBytes") to plot.  The fourth argument
 +  // specifies the name of the data series label on the plot.  The last
 +  // argument formats the plot by specifying where the key should be placed.
-+  plotHelper.PlotProbe (probeName,
++  plotHelper.PlotProbe (probeType,
-+                        probeTrace,
++                        tracePath,
 +                        "OutputBytes",
 +                        "Packet Byte Count",
 +                        GnuplotAggregator::KEY_BELOW);
-The first two arguments are the name of the probe type and the probe trace.
+The first two arguments are the name of the probe type and the trace source path.
 These two are probably the hardest to determine when you try to use
 this framework to plot other traces.  The probe trace here is the ``Tx``
 trace source of class ``Ipv6L3Protocol``.  When we examine this class
 implementation (``src/internet/model/ipv6-l3-protocol.cc``) we can
 observe:
 +
 +   // Set the labels for this formatted output file.
 +   fileHelper.Set2dFormat ("Time (Seconds) = %.3e\tPacket Byte Count = %.0f");
-Finally, the probe of interest must be hooked.  Again, the probeName and
+Finally, the trace source of interest must be hooked.  Again, the probeType and
-probeTrace variables in this example are used, and the probe's output
+tracePath variables in this example are used, and the probe's output
 trace source "OutputBytes" is hooked:
 ::
 +
-+   // Specify the probe type, probe path (in configuration namespace), and
++   // Specify the probe type, trace source path (in configuration namespace), and
 +   // probe output trace source ("OutputBytes") to write.
-+   fileHelper.WriteProbe (probeName,
++   fileHelper.WriteProbe (probeType,
-+                          probeTrace,
++                          tracePath,
 +                          "OutputBytes");
 +
 The wildcard fields in this trace source specifier match two trace sources.
 Unlike the GnuplotHelper example, in which two data series were overlaid

changeset 11027	e943837b17ad
parent 10186	cfbc9491d7e7
child 11028	abeb2185bce5