Attachment #2961 for bug #2825

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




   * \param packet a received packet
   * \return none
   */
  void BsmTrace (std::string context, Ptr<const Packet> packet);

  /**
   * \brief Returns the RoutingStats instance

}

void
RoutingHelper::BsmTrace (std::string context, Ptr<const Packet> packet)
{
  uint32_t pktBytes = packet->GetSize ();
  routingStats.IncTxBytes (pktBytes);

  uint32_t m_mobility; ///< mobility
  uint32_t m_nNodes; ///< number of nodes
  double m_TotalSimTime; ///< total sim time
  std::string m_rate; ///< rate
  std::string m_phyModeB; ///< phy mode
  std::string m_trName; ///< trace file name
  int m_nodeSpeed; ///< in m/s

    m_mobility (1),
    m_nNodes (156),
    m_TotalSimTime (300.01),
    m_rate ("2048bps"),
    m_phyModeB ("DsssRate11Mbps"),
    m_trName ("vanet-routing-compare"),
    m_nodeSpeed (20),

                                   "Log filename",
                                   ns3::StringValue ("low99-ct-unterstrass-1day.filt.7.adj.log"),
                                   ns3::MakeStringChecker ());
static ns3::GlobalValue g_rate ("VRCrate",
                                "Data rate",
                                ns3::StringValue ("2048bps"),
                                ns3::MakeStringChecker ());
static ns3::GlobalValue g_phyModeB ("VRCphyModeB",
                                    "PHY mode (802.11a)",
                                    ns3::StringValue ("DsssRate11Mbps"),

  // routing overhead
  std::ostringstream oss;
  oss.str ("");
  oss << "/NodeList/*/ApplicationList/*/$ns3::BsmApplication/Tx";
  Config::Connect (oss.str (), MakeCallback (&RoutingHelper::BsmTrace, m_routingHelper));
}

void

  m_traceFile = stringValue.Get ();
  GlobalValue::GetValueByName ("VRClogFile", stringValue);
  m_logFile = stringValue.Get ();
  GlobalValue::GetValueByName ("VRCrate", stringValue);
  m_rate = stringValue.Get ();
  GlobalValue::GetValueByName ("VRCphyModeB", stringValue);
  m_phyModeB = stringValue.Get ();
  GlobalValue::GetValueByName ("VRCtrName", stringValue);

  g_phyMode.SetValue (StringValue (m_phyMode));
  g_traceFile.SetValue (StringValue (m_traceFile));
  g_logFile.SetValue (StringValue (m_logFile));
  g_rate.SetValue (StringValue (m_rate));
  g_phyModeB.SetValue (StringValue (m_phyModeB));
  g_trName.SetValue (StringValue (m_trName));
  GlobalValue::GetValueByName ("VRCtrName", stringValue);

  cmd.AddValue ("traceFile", "Ns2 movement trace file", m_traceFile);
  cmd.AddValue ("logFile", "Log file", m_logFile);
  cmd.AddValue ("mobility", "1=trace;2=RWP", m_mobility);
  cmd.AddValue ("rate", "Rate", m_rate);
  cmd.AddValue ("phyModeB", "Phy mode 802.11b", m_phyModeB);
  cmd.AddValue ("speed", "Node speed (m/s)", m_nodeSpeed);
  cmd.AddValue ("pause", "Node pause (s)", m_nodePause);

void
VanetRoutingExperiment::ConfigureDefaults ()
{
  Config::SetDefault ("ns3::OnOffApplication::PacketSize",StringValue ("64"));
  Config::SetDefault ("ns3::OnOffApplication::DataRate",  StringValue (m_rate));

  //Set Non-unicastMode rate to unicast mode
  if (m_80211mode == 2)
    {

(-)a/src/wave/model/bsm-application.cc (-1 / +7 lines)

Lines 43-48	Link Here

    .SetParent<Application> ()

    .SetParent<Application> ()

    .SetGroupName ("Wave")

    .SetGroupName ("Wave")

    .AddConstructor<BsmApplication> ()

    .AddConstructor<BsmApplication> ()

    .AddTraceSource ("Tx", "A new packet is created and is sent",

                     MakeTraceSourceAccessor (&BsmApplication::m_txTrace),

                     "ns3::Packet::TracedCallback")

  return tid;

  return tid;

Lines 242-248	Link Here

242

      if (senderMoving != 0)

245

      if (senderMoving != 0)

243

246

244

          // send it!

247

          // send it!

245

          socket->Send (Create<Packet> (pktSize));

248

          Ptr<Packet> packet = Create<Packet> (pktSize);

249

          m_txTrace (packet);

250

251

          socket->Send (packet);

246

          // count it

252

          // count it

247

          m_waveBsmStats->IncTxPktCount ();

253

          m_waveBsmStats->IncTxPktCount ();

248

          m_waveBsmStats->IncTxByteCount (pktSize);

254

          m_waveBsmStats->IncTxByteCount (pktSize);

(-)a/src/wave/model/bsm-application.h (+3 lines)

Lines 104-109	Link Here

104

  virtual void DoDispose (void);

104

  virtual void DoDispose (void);

105

106

private:

106

private:

107

  /// Traced Callback: transmitted packets.

108

  TracedCallback<Ptr<const Packet> > m_txTrace;

109

107

  // inherited from Application base class.

110

  // inherited from Application base class.

108

  virtual void StartApplication (void);    ///< Called at time specified by Start

111

  virtual void StartApplication (void);    ///< Called at time specified by Start

109

  virtual void StopApplication (void);     ///< Called at time specified by Stop

112

  virtual void StopApplication (void);     ///< Called at time specified by Stop

Return to bug 2825