-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/* Copyright (c) 2011, 2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
/*
* Copyright (c) 2008 INRIA
*
* Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
*/
-#include "ns3/abort.h"
-#include "ns3/log.h"
+#include <ns3/abort.h>
#include "ns3/simulator.h"
#include "ns3/point-to-point-net-device.h"
#include "ns3/point-to-point-channel.h"
#include "ns3/trace-helper.h"
#include "my-point-to-point-helper.h"
-NS_LOG_COMPONENT_DEFINE ("MyPointToPointHelper");
-
-///> RED Parameters see src/node/red-queue.* for details
-//.AddAttribute ("Mode",
-// "Whether to use Bytes (see MaxBytes) or Packets (see MaxPackets) as the maximum queue size metric.",
-// EnumValue (BYTES), ///> currently supports BYTES only
-// MakeEnumAccessor (&RedQueue::SetMode),
-// MakeEnumChecker (BYTES, "Bytes",
-// PACKETS, "Packets"))
-// .AddAttribute ("MaxPackets",
-// "The maximum number of packets accepted by this RedQueue.",
-// UintegerValue (100),
-// MakeUintegerAccessor (&RedQueue::m_maxPackets),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("MaxBytes",
-// "The maximum number of bytes accepted by this RedQueue.",
-// UintegerValue (100000),
-// MakeUintegerAccessor (&RedQueue::m_maxBytes),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("m_burst",
-// "maximum number of m_burst packets accepted by this queue",
-// UintegerValue (6), ///> bursts must be > minTh/avpkt
-// MakeUintegerAccessor (&RedQueue::m_burst),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("m_avPkt",
-// "In bytes, use with m_burst to determine the time constant for average queue size calculations",
-// UintegerValue (1024), ///> average packet size
-// MakeUintegerAccessor (&RedQueue::m_avPkt),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("m_minTh",
-// "Average queue size at which marking becomes a m_prob",
-// UintegerValue (5120), ///> in bytes 1024x5
-// MakeUintegerAccessor (&RedQueue::m_minTh),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("m_maxTh",
-// "Maximal marking m_prob, should be at least twice min to prevent synchronous retransmits",
-// UintegerValue (15360), ///> in bytes 1024x15
-// MakeUintegerAccessor (&RedQueue::m_maxTh),
-// MakeUintegerChecker<uint32_t> ())
-// .AddAttribute ("m_rate",
-// "this m_rate is used for calculating the average queue size after some idle time.",
-// UintegerValue (1500000), ///> in bps, should be set to bandwidth of interface
-// MakeUintegerAccessor (&RedQueue::m_rate),
-// MakeUintegerChecker<uint64_t> ())
-// .AddAttribute ("m_prob",
-// "Probability for marking, suggested values are 0.01 and 0.02",
-// DoubleValue (0.02),
-// MakeDoubleAccessor (&RedQueue::m_prob),
-// MakeDoubleChecker <double> ())
+#include "xbt/log.h"
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
+
std::string qMode = "Bytes";
std::string qBurst = "6";
std::string qAvPkt = "1024";
MyPointToPointHelper::MyPointToPointHelper ()
{
m_queueFactory.SetTypeId ("ns3::DropTailQueue");
- m_queueFactory_red.SetTypeId ("ns3::RedQueue");
-// m_queueFactory_red.Set ("Mode", StringValue (qMode));
-// m_queueFactory_red.Set ("MaxBytes",StringValue (qLimit));
-// m_queueFactory_red.Set ("m_burst", StringValue (qBurst));
-// m_queueFactory_red.Set ("m_avPkt", StringValue (qAvPkt));
-// m_queueFactory_red.Set ("m_minTh", StringValue (qthMin));
-// m_queueFactory_red.Set ("m_maxTh", StringValue (qthMax));
-// m_queueFactory_red.Set ("m_rate", StringValue (qIdleRate));
-// m_queueFactory_red.Set ("m_prob", StringValue (qProb));
m_deviceFactory.SetTypeId ("ns3::PointToPointNetDevice");
m_channelFactory.SetTypeId ("ns3::PointToPointChannel");
m_remoteChannelFactory.SetTypeId ("ns3::PointToPointRemoteChannel");
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
- NS_LOG_INFO ("MyPointToPointHelper::EnablePcapInternal(): Device " << device << " not of type ns3::PointToPointNetDevice");
+ XBT_INFO ("MyPointToPointHelper::EnablePcapInternal(): Device not of type ns3::PointToPointNetDevice");
return;
}
Ptr<PointToPointNetDevice> device = nd->GetObject<PointToPointNetDevice> ();
if (device == 0)
{
- NS_LOG_INFO ("MyPointToPointHelper::EnableAsciiInternal(): Device " << device <<
- " not of type ns3::PointToPointNetDevice");
+ XBT_INFO ("MyPointToPointHelper::EnableAsciiInternal(): Device not of type ns3::PointToPointNetDevice");
return;
}
//
// If we are provided an OutputStreamWrapper, we are expected to use it, and
- // to providd a context. We are free to come up with our own context if we
+ // to provide a context. We are free to come up with our own context if we
// want, and use the AsciiTraceHelper Hook*WithContext functions, but for
// compatibility and simplicity, we just use Config::Connect and let it deal
// with the context.
return Install (c.Get (0), c.Get (1));
}
-NetDeviceContainer
-MyPointToPointHelper::Install (Ptr<Node> a, e_ns3_network_element_type_t type_a, Ptr<Node> b, e_ns3_network_element_type_t type_b)
-{
- NetDeviceContainer container;
- Ptr<Queue> queueA;
- Ptr<Queue> queueB;
-
- Ptr<PointToPointNetDevice> devA = m_deviceFactory.Create<PointToPointNetDevice> ();
- devA->SetAddress (Mac48Address::Allocate ());
- a->AddDevice (devA);
-
- if(type_a == NS3_NETWORK_ELEMENT_ROUTER){
- queueA = m_queueFactory_red.Create<Queue> ();
- }
- else
- queueA = m_queueFactory.Create<Queue> ();
- devA->SetQueue (queueA);
-
- Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> ();
- devB->SetAddress (Mac48Address::Allocate ());
- b->AddDevice (devB);
-
- if(type_b == NS3_NETWORK_ELEMENT_ROUTER){
- queueB = m_queueFactory_red.Create<Queue> ();
- }
- else
- queueB = m_queueFactory.Create<Queue> ();
- devB->SetQueue (queueB);
-
- // If MPI is enabled, we need to see if both nodes have the same system id
- // (rank), and the rank is the same as this instance. If both are true,
- //use a normal p2p channel, otherwise use a remote channel
- bool useNormalChannel = true;
- Ptr<PointToPointChannel> channel = 0;
- if (MpiInterface::IsEnabled ())
- {
- uint32_t n1SystemId = a->GetSystemId ();
- uint32_t n2SystemId = b->GetSystemId ();
- uint32_t currSystemId = MpiInterface::GetSystemId ();
- if (n1SystemId != currSystemId || n2SystemId != currSystemId)
- {
- useNormalChannel = false;
- }
- }
- if (useNormalChannel)
- {
- channel = m_channelFactory.Create<PointToPointChannel> ();
- }
- else
- {
- channel = m_remoteChannelFactory.Create<PointToPointRemoteChannel> ();
- Ptr<MpiReceiver> mpiRecA = CreateObject<MpiReceiver> ();
- Ptr<MpiReceiver> mpiRecB = CreateObject<MpiReceiver> ();
- mpiRecA->SetReceiveCallback (MakeCallback (&PointToPointNetDevice::Receive, devA));
- mpiRecB->SetReceiveCallback (MakeCallback (&PointToPointNetDevice::Receive, devB));
- devA->AggregateObject (mpiRecA);
- devB->AggregateObject (mpiRecB);
- }
-
- devA->Attach (channel);
- devB->Attach (channel);
- container.Add (devA);
- container.Add (devB);
-
- return container;
-}
-
NetDeviceContainer
MyPointToPointHelper::Install (Ptr<Node> a, Ptr<Node> b)
{
//use a normal p2p channel, otherwise use a remote channel
bool useNormalChannel = true;
Ptr<PointToPointChannel> channel = 0;
- if (MpiInterface::IsEnabled ())
- {
+ if (MpiInterface::IsEnabled ()) {
uint32_t n1SystemId = a->GetSystemId ();
uint32_t n2SystemId = b->GetSystemId ();
uint32_t currSystemId = MpiInterface::GetSystemId ();
if (n1SystemId != currSystemId || n2SystemId != currSystemId)
- {
useNormalChannel = false;
- }
- }
+ }
if (useNormalChannel)
- {
channel = m_channelFactory.Create<PointToPointChannel> ();
- }
- else
- {
+ else {
channel = m_remoteChannelFactory.Create<PointToPointRemoteChannel> ();
Ptr<MpiReceiver> mpiRecA = CreateObject<MpiReceiver> ();
Ptr<MpiReceiver> mpiRecB = CreateObject<MpiReceiver> ();
