Attachment #1155 for bug #1179

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

(-)a/src/visualizer/model/pyviz.cc (+20 lines)

Lines 153-164	Link Here

153

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::PointToPointNetDevice/MacRx",

153

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::PointToPointNetDevice/MacRx",

154

                   MakeCallback (&PyViz::TraceNetDevRxPointToPoint, this));

154

                   MakeCallback (&PyViz::TraceNetDevRxPointToPoint, this));

155

156

  // WiMax

156

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Tx",

157

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Tx",

157

                   MakeCallback (&PyViz::TraceNetDevTxWimax, this));

158

                   MakeCallback (&PyViz::TraceNetDevTxWimax, this));

158

159

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Rx",

160

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Rx",

160

                   MakeCallback (&PyViz::TraceNetDevRxWimax, this));

161

                   MakeCallback (&PyViz::TraceNetDevRxWimax, this));

161

162

163

  // LTE

164

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::LteNetDevice/Tx",

165

                   MakeCallback (&PyViz::TraceNetDevTxLte, this));

166

167

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::LteNetDevice/Rx",

168

                   MakeCallback (&PyViz::TraceNetDevRxLte, this));

162

169

163

170

164

void

171

void

Lines 820-825	Link Here

820

  TraceNetDevRxCommon (context, packet, source);

827

  TraceNetDevRxCommon (context, packet, source);

821

828

822

829

830

void

831

PyViz::TraceNetDevTxLte (std::string context, Ptr<const Packet> packet, Mac48Address const &destination)

832

833

  NS_LOG_FUNCTION (context);

834

  TraceNetDevTxCommon (context, packet, destination);

835

836

837

void

838

PyViz::TraceNetDevRxLte (std::string context, Ptr<const Packet> packet, Mac48Address const &source)

839

840

  NS_LOG_FUNCTION (context);

841

  TraceNetDevRxCommon (context, packet, source);

842

823

843

824

// ---------------------

844

// ---------------------

825

845

(-)a/src/visualizer/model/pyviz.h (+3 lines)

Lines 212-217	Link Here

212

  void TraceNetDevTxWimax (std::string context, Ptr<const Packet> packet, Mac48Address const &destination);

212

  void TraceNetDevTxWimax (std::string context, Ptr<const Packet> packet, Mac48Address const &destination);

213

  void TraceNetDevRxWimax (std::string context, Ptr<const Packet> packet, Mac48Address const &source);

213

  void TraceNetDevRxWimax (std::string context, Ptr<const Packet> packet, Mac48Address const &source);

214

215

  void TraceNetDevTxLte (std::string context, Ptr<const Packet> packet, Mac48Address const &destination);

216

  void TraceNetDevRxLte (std::string context, Ptr<const Packet> packet, Mac48Address const &source);

217

215

  inline NetDeviceStatistics & FindNetDeviceStatistics (int node, int interface);

218

  inline NetDeviceStatistics & FindNetDeviceStatistics (int node, int interface);

216

219

217

  void DoPause (std::string const &message);

220

  void DoPause (std::string const &message);

(-)a/src/visualizer/visualizer/base.py (+2 lines)

Lines 34-39	Link Here

    ns3.MeshPointDevice: NetDeviceTraits(is_virtual=True),

    ns3.MeshPointDevice: NetDeviceTraits(is_virtual=True),

    ns3.SubscriberStationNetDevice: NetDeviceTraits(is_wireless=True),

    ns3.SubscriberStationNetDevice: NetDeviceTraits(is_wireless=True),

    ns3.BaseStationNetDevice: NetDeviceTraits(is_wireless=True),

    ns3.BaseStationNetDevice: NetDeviceTraits(is_wireless=True),

    ns3.UeNetDevice: NetDeviceTraits(is_wireless=True),

    ns3.EnbNetDevice: NetDeviceTraits(is_wireless=True),

def lookup_netdevice_traits(class_type):

def lookup_netdevice_traits(class_type):

Return to bug 1179