do not use Queue::CreateDefault
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Sun, 02 Mar 2008 21:57:28 +0100
changeset 2533 80cdc3eec057
parent 2532 86a40c7cbfe9
child 2534 0dd75c81244e
do not use Queue::CreateDefault
examples/csma-broadcast.cc
examples/csma-multicast.cc
examples/csma-one-subnet.cc
examples/csma-packet-socket.cc
examples/mixed-global-routing.cc
examples/simple-global-routing.cc
examples/udp-echo.cc
src/devices/csma/csma-ipv4-topology.cc
src/devices/point-to-point/point-to-point-topology.cc
tutorial/point-to-point-ipv4-topology.cc
utils/print-introspected-doxygen.cc
--- a/examples/csma-broadcast.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/csma-broadcast.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -93,12 +93,6 @@
 #endif
 
   // Set up some default values for the simulation.  Use the Bind()
-  // technique to tell the system what subclass of Queue to use,
-  // and what the queue limit is
-
-  // The below Bind command tells the queue factory which class to
-  // instantiate, when the queue factory is invoked in the topology code
-  DefaultValue::Bind ("Queue", "DropTailQueue");
 
   // Allow the user to override any of the defaults and the above
   // Bind()s at run-time, via command-line arguments
--- a/examples/csma-multicast.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/csma-multicast.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -93,12 +93,7 @@
 #endif
 //
 // Set up default values for the simulation.  Use the DefaultValue::Bind()
-// technique to tell the system what subclass of Queue to use.  The Bind
-// command command tells the queue factory which class to instantiate when the
-// queue factory is invoked in the topology code
-//
-  DefaultValue::Bind ("Queue", "DropTailQueue");
-//
+
 // Allow the user to override any of the defaults and the above Bind() at
 // run-time, via command-line arguments
 //
--- a/examples/csma-one-subnet.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/csma-one-subnet.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -85,12 +85,6 @@
   LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_ALL);
 #endif
 //
-// Set up default values for the simulation.  Use the DefaultValue::Bind()
-// technique to tell the system what subclass of Queue to use.  The Bind
-// command command tells the queue factory which class to instantiate when the
-// queue factory is invoked in the topology code
-//
-  DefaultValue::Bind ("Queue", "DropTailQueue");
 //
 // Allow the user to override any of the defaults and the above Bind() at
 // run-time, via command-line arguments
--- a/examples/csma-packet-socket.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/csma-packet-socket.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -54,6 +54,7 @@
 #include "ns3/socket.h"
 #include "ns3/onoff-application.h"
 #include "ns3/queue.h"
+#include "ns3/drop-tail-queue.h"
 
 using namespace ns3;
 
@@ -67,7 +68,7 @@
                                                                "EncapsulationMode", String ("Llc"));
   node->AddDevice (device);
   device->Attach (channel);
-  Ptr<Queue> queue = Queue::CreateDefault ();
+  Ptr<Queue> queue = CreateObject<DropTailQueue> ();
   device->AddQueue (queue);
   return device;
 }
--- a/examples/mixed-global-routing.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/mixed-global-routing.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -104,13 +104,7 @@
   LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_ALL);
 #endif
   // Set up some default values for the simulation.  Use the Bind ()
-  // technique to tell the system what subclass of Queue to use,
-  // and what the queue limit is
 
-  // The below DefaultValue::Bind command tells the queue factory which 
-  // class to instantiate, when the queue factory is invoked in the 
-  // topology code
-  DefaultValue::Bind ("Queue", "DropTailQueue");
 
   Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210));
   Config::SetDefault ("OnOffApplication::DataRate", DataRate ("448kb/s"));
--- a/examples/simple-global-routing.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/simple-global-routing.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -105,12 +105,6 @@
   LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_ALL);
 #endif
   // Set up some default values for the simulation.  Use the 
-  // DefaultValue::Bind () technique to tell the system what subclass of 
-  // Queue to use, and what the queue limit is
-
-  // The below Bind command tells the queue factory which class to
-  // instantiate, when the queue factory is invoked in the topology code
-  DefaultValue::Bind ("Queue", "DropTailQueue");
 
   Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210));
   Config::SetDefault ("OnOffApplication::DataRate", DataRate ("448kb/s"));
--- a/examples/udp-echo.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/examples/udp-echo.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -85,14 +85,7 @@
   LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_ALL);
   LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_ALL);
 #endif
-//
-// Set up default values for the simulation.  Use the DefaultValue::Bind()
-// technique to tell the system what subclass of Queue to use.  The Bind
-// command command tells the queue factory which class to instantiate when the
-// queue factory is invoked in the topology code
-//
-  DefaultValue::Bind ("Queue", "DropTailQueue");
-//
+
 // Allow the user to override any of the defaults and the above Bind() at
 // run-time, via command-line arguments
 //
--- a/src/devices/csma/csma-ipv4-topology.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/src/devices/csma/csma-ipv4-topology.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -26,6 +26,7 @@
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/queue.h"
+#include "ns3/drop-tail-queue.h"
 #include "ns3/string.h"
 
 #include "csma-channel.h"
@@ -40,7 +41,7 @@
   Ptr<CsmaChannel> channel,
   Mac48Address addr)
 {
-  Ptr<Queue> q = Queue::CreateDefault ();
+  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
 
   // assume full-duplex
   Ptr<CsmaNetDevice> nd = CreateObjectWith<CsmaNetDevice> ("Node", node, 
@@ -59,7 +60,7 @@
                                      Ptr<CsmaChannel> ch,
                                      Mac48Address addr)
 {
-  Ptr<Queue> q = Queue::CreateDefault ();
+  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
 
   Ptr<CsmaNetDevice> nd0 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
@@ -85,7 +86,7 @@
                                      Ptr<CsmaChannel> ch,
                                      Mac48Address addr)
 {
-  Ptr<Queue> q = Queue::CreateDefault ();
+  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
 
   Ptr<CsmaNetDevice> nd0 = CreateObjectWith<CsmaNetDevice> ("Node", n1, 
                                                             "Address", addr,
--- a/src/devices/point-to-point/point-to-point-topology.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/src/devices/point-to-point/point-to-point-topology.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -31,6 +31,7 @@
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/queue.h"
+#include "ns3/drop-tail-queue.h"
 
 #include "point-to-point-channel.h"
 #include "point-to-point-net-device.h"
@@ -51,7 +52,7 @@
                                                                              "Address", Mac48Address::Allocate ());
   n1->AddDevice (net1);
 
-  Ptr<Queue> q = Queue::CreateDefault ();
+  Ptr<Queue> q = CreateObjectWith<DropTailQueue> ();
   net1->AddQueue(q);
   net1->Attach (channel);
   
@@ -59,7 +60,7 @@
                                                                              "Address", Mac48Address::Allocate ());
   n2->AddDevice (net2);
 
-  q = Queue::CreateDefault ();
+  q = CreateObjectWith<DropTailQueue> ();
   net2->AddQueue(q);
   net2->Attach (channel);
 
--- a/tutorial/point-to-point-ipv4-topology.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/tutorial/point-to-point-ipv4-topology.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -21,6 +21,7 @@
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/queue.h"
+#include "ns3/drop-tail-queue.h"
 
 #include "ns3/point-to-point-channel.h"
 #include "ns3/point-to-point-net-device.h"
@@ -47,7 +48,7 @@
     CreateObjectWith<PointToPointNetDevice> ("Node", node, 
                                              "Address", Mac48Address::Allocate ());
   node->AddDevice (nd);
-  Ptr<Queue> q = Queue::CreateDefault ();
+  Ptr<Queue> q = CreateObject<DropTailQueue> ();
   nd->AddQueue(q);
   nd->Attach (channel);
 
--- a/utils/print-introspected-doxygen.cc	Sun Mar 02 21:12:21 2008 +0100
+++ b/utils/print-introspected-doxygen.cc	Sun Mar 02 21:57:28 2008 +0100
@@ -5,6 +5,7 @@
 #include "ns3/point-to-point-net-device.h"
 #include "ns3/csma-net-device.h"
 #include "ns3/queue.h"
+#include "ns3/drop-tail-queue.h"
 #include "ns3/mobility-model-notifier.h"
 #include "ns3/default-value.h"
 #include "ns3/string.h"
@@ -123,12 +124,12 @@
   Ptr<PointToPointNetDevice> p2p = CreateObjectWith<PointToPointNetDevice> ("Node", node, 
 									    "Address", Mac48Address::Allocate ());
   node->AddDevice (p2p);
-  p2p->AddQueue (Queue::CreateDefault ());
+  p2p->AddQueue (CreateObject<DropTailQueue> ());
   Ptr<CsmaNetDevice> csma = CreateObjectWith<CsmaNetDevice> ("Node", node, 
 							     "Address", Mac48Address::Allocate (),
 							     "EncapsulationMode", String ("Llc"));
   node->AddDevice (csma);
-  csma->AddQueue (Queue::CreateDefault ());
+  csma->AddQueue (CreateObject<DropTailQueue> ());
 
   TraceResolver::SourceCollection collection;
   NodeList::GetTraceResolver ()->CollectSources ("", TraceContext (), &collection);