Attachment #2669 for bug #2545

View | Details | Raw Unified | Return to bug 2545
Collapse All | Expand All

(-)a/src/flow-monitor/helper/flow-monitor-helper.cc (-2 / +2 lines)

Lines 146-152	Link Here

146

147

148

void

148

void

149

FlowMonitorHelper::SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes)

149

FlowMonitorHelper::SerializeToXmlStream (std::ostream &os, uint16_t indent, bool enableHistograms, bool enableProbes)

150

151

  if (m_flowMonitor)

151

  if (m_flowMonitor)

152

Lines 155-161	Link Here

155

156

157

std::string

157

std::string

158

FlowMonitorHelper::SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes)

158

FlowMonitorHelper::SerializeToXmlString (uint16_t indent, bool enableHistograms, bool enableProbes)

159

160

  std::ostringstream os;

160

  std::ostringstream os;

161

  if (m_flowMonitor)

161

  if (m_flowMonitor)

(-)a/src/flow-monitor/helper/flow-monitor-helper.h (-2 / +2 lines)

Lines 93-99	Link Here

   * \param enableHistograms if true, include also the histograms in the output

   * \param enableHistograms if true, include also the histograms in the output

   * \param enableProbes if true, include also the per-probe/flow pair statistics in the output

   * \param enableProbes if true, include also the per-probe/flow pair statistics in the output

*/

*/

  void SerializeToXmlStream (std::ostream &os, int indent, bool enableHistograms, bool enableProbes);

  void SerializeToXmlStream (std::ostream &os, uint16_t indent, bool enableHistograms, bool enableProbes);

/**

/**

   * Same as SerializeToXmlStream, but returns the output as a std::string

   * Same as SerializeToXmlStream, but returns the output as a std::string

Lines 102-108	Link Here

102

   * \param enableProbes if true, include also the per-probe/flow pair statistics in the output

102

   * \param enableProbes if true, include also the per-probe/flow pair statistics in the output

103

   * \return the XML output as string

103

   * \return the XML output as string

104

*/

104

*/

105

  std::string SerializeToXmlString (int indent, bool enableHistograms, bool enableProbes);

105

  std::string SerializeToXmlString (uint16_t indent, bool enableHistograms, bool enableProbes);

106

107

/**

107

/**

108

   * Same as SerializeToXmlStream, but writes to a file instead

108

   * Same as SerializeToXmlStream, but writes to a file instead




  /// Serializes the results to an std::ostream in XML format
  /// \param os the output stream
  /// \param indent number of spaces to use as base indentation level
  virtual void SerializeToXmlStream (std::ostream &os, uint16_t indent) const = 0;

protected:
  /// Returns a new, unique Flow Identifier
  /// \returns a new FlowId
  FlowId GetNewFlowId ();

  ///
  /// \brief Add a number of spaces for indentation purposes.
  /// \param os The stream to write to.
  /// \param level The number of spaces to add.
  void Indent (std::ostream &os, uint16_t level) const;

};

inline void
FlowClassifier::Indent (std::ostream &os, uint16_t level) const
{
  for (uint16_t __xpto = 0; __xpto < level; __xpto++) os << ' ';
}


} // namespace ns3





NS_OBJECT_ENSURE_REGISTERED (FlowMonitor);


inline static void
Indent (std::ostream &os, uint16_t level)
{
  for (uint16_t __xpto = 0; __xpto < level; __xpto++) os << ' ';
}


TypeId 
FlowMonitor::GetTypeId (void)
{

}

void
FlowMonitor::SerializeToXmlStream (std::ostream &os, uint16_t indent, bool enableHistograms, bool enableProbes)
{
  CheckForLostPackets ();

  Indent (os, indent); os << "<FlowMonitor>\n";
  indent += 2;
  Indent (os, indent); os << "<FlowStats>\n";
  indent += 2;
  for (FlowStatsContainerCI flowI = m_flowStats.begin ();
       flowI != m_flowStats.end (); flowI++)
    {

      Indent (os, indent);
#define ATTRIB(name) << " " # name "=\"" << flowI->second.name << "\""
      os << "<Flow flowId=\"" << flowI->first << "\""
      ATTRIB (timeFirstTxPacket)

      indent += 2;
      for (uint32_t reasonCode = 0; reasonCode < flowI->second.packetsDropped.size (); reasonCode++)
        {
          Indent (os, indent);
          os << "<packetsDropped reasonCode=\"" << reasonCode << "\""
          << " number=\"" << flowI->second.packetsDropped[reasonCode]
          << "\" />\n";
        }
      for (uint32_t reasonCode = 0; reasonCode < flowI->second.bytesDropped.size (); reasonCode++)
        {
          Indent (os, indent);
          os << "<bytesDropped reasonCode=\"" << reasonCode << "\""
          << " bytes=\"" << flowI->second.bytesDropped[reasonCode]
          << "\" />\n";

        }
      indent -= 2;

      Indent (os, indent); os << "</Flow>\n";
    }
  indent -= 2;
  Indent (os, indent); os << "</FlowStats>\n";

  for (std::list<Ptr<FlowClassifier> >::iterator iter = m_classifiers.begin ();
      iter != m_classifiers.end ();


  if (enableProbes)
    {
      Indent (os, indent); os << "<FlowProbes>\n";
      indent += 2;
      for (uint32_t i = 0; i < m_flowProbes.size (); i++)
        {
          m_flowProbes[i]->SerializeToXmlStream (os, indent, i);
        }
      indent -= 2;
      Indent (os, indent); os << "</FlowProbes>\n";
    }

  indent -= 2;
  Indent (os, indent); os << "</FlowMonitor>\n";
}


std::string
FlowMonitor::SerializeToXmlString (uint16_t indent, bool enableHistograms, bool enableProbes)
{
  std::ostringstream os;
  SerializeToXmlStream (os, indent, enableHistograms, enableProbes);




  /// \param indent number of spaces to use as base indentation level
  /// \param enableHistograms if true, include also the histograms in the output
  /// \param enableProbes if true, include also the per-probe/flow pair statistics in the output
  void SerializeToXmlStream (std::ostream &os, uint16_t indent, bool enableHistograms, bool enableProbes);

  /// Same as SerializeToXmlStream, but returns the output as a std::string
  /// \param indent number of spaces to use as base indentation level
  /// \param enableHistograms if true, include also the histograms in the output
  /// \param enableProbes if true, include also the per-probe/flow pair statistics in the output
  /// \return the XML output as string
  std::string SerializeToXmlString (uint16_t indent, bool enableHistograms, bool enableProbes);

  /// Same as SerializeToXmlStream, but writes to a file instead
  /// \param fileName name or path of the output file that will be created




}

void
Ipv4FlowClassifier::SerializeToXmlStream (std::ostream &os, uint16_t indent) const
{
  Indent (os, indent); os << "<Ipv4FlowClassifier>\n";

  INDENT (indent); os << "<Ipv4FlowClassifier>\n";

  indent += 2;
  for (std::map<FiveTuple, FlowId>::const_iterator
       iter = m_flowMap.begin (); iter != m_flowMap.end (); iter++)
    {
      Indent (os, indent);
      os << "<Flow flowId=\"" << iter->second << "\""
         << " sourceAddress=\"" << iter->first.sourceAddress << "\""
         << " destinationAddress=\"" << iter->first.destinationAddress << "\""

    }

  indent -= 2;
  Indent (os, indent); os << "</Ipv4FlowClassifier>\n";

#undef INDENT
}



(-)a/src/flow-monitor/model/ipv4-flow-classifier.h (-1 / +1 lines)

Lines 69-75	Link Here

  /// \returns the FiveTuple corresponding to flowId

  /// \returns the FiveTuple corresponding to flowId

  FiveTuple FindFlow (FlowId flowId) const;

  FiveTuple FindFlow (FlowId flowId) const;

  virtual void SerializeToXmlStream (std::ostream &os, int indent) const;

  virtual void SerializeToXmlStream (std::ostream &os, uint16_t indent) const;

private:

private:




}

void
Ipv6FlowClassifier::SerializeToXmlStream (std::ostream &os, uint16_t indent) const
{
  Indent (os, indent); os << "<Ipv6FlowClassifier>\n";

  INDENT (indent); os << "<Ipv6FlowClassifier>\n";

  indent += 2;
  for (std::map<FiveTuple, FlowId>::const_iterator
       iter = m_flowMap.begin (); iter != m_flowMap.end (); iter++)
    {
      Indent (os, indent);
      os << "<Flow flowId=\"" << iter->second << "\""
         << " sourceAddress=\"" << iter->first.sourceAddress << "\""
         << " destinationAddress=\"" << iter->first.destinationAddress << "\""

    }

  indent -= 2;
  Indent (os, indent); os << "</Ipv6FlowClassifier>\n";

#undef INDENT
}



(-)a/src/flow-monitor/model/ipv6-flow-classifier.h (-1 / +1 lines)

Lines 70-76	Link Here

  /// \returns the FiveTuple corresponding to flowId

  /// \returns the FiveTuple corresponding to flowId

  FiveTuple FindFlow (FlowId flowId) const;

  FiveTuple FindFlow (FlowId flowId) const;

  virtual void SerializeToXmlStream (std::ostream &os, int indent) const;

  virtual void SerializeToXmlStream (std::ostream &os, uint16_t indent) const;

private:

private:

Return to bug 2545