From 8b9fb7b105d12e97375a24c5cded881ccbf272ce Mon Sep 17 00:00:00 2001
From: "George F. Riley" <riley@ece.gatech.edu>
Date: Thu, 22 Mar 2007 14:54:20 -0400
Subject: [PATCH] Clean up parameter passing per TOm's request

---
 .sconf_temp/.cache                     |   9 +++++
 .sconf_temp/conftest_0.c               |   3 ++
 .sconf_temp/conftest_1.c               |   3 ++
 build.pyc                              | Bin 0 -> 24535 bytes
 config.log                             |  22 ++++++++++++
 src/common/smartvector.h               |   3 +-
 src/devices/serial/serial-channel.cc   |  10 +++---
 src/devices/serial/serial-channel.h    |   5 +--
 src/devices/serial/serial-net-device.h |   2 +-
 src/devices/serial/serial-topology.h   |   8 ++---
 src/node/node.h                        |  32 +++++++++++-------
 src/node/ref-counted-object.h          |  45 +++++++++++++++++++++++++
 12 files changed, 115 insertions(+), 27 deletions(-)
 create mode 100644 .sconf_temp/.cache
 create mode 100644 .sconf_temp/conftest_0.c
 create mode 100644 .sconf_temp/conftest_1.c
 create mode 100644 build.pyc
 create mode 100644 config.log
 create mode 100644 src/node/ref-counted-object.h

diff --git a/.sconf_temp/.cache b/.sconf_temp/.cache
new file mode 100644
index 000000000..81c062c51
--- /dev/null
+++ b/.sconf_temp/.cache
@@ -0,0 +1,9 @@
+(dp1
+S'data'
+p2
+(dp3
+sS'scons_version'
+p4
+S'0.96.1'
+p5
+s.
\ No newline at end of file
diff --git a/.sconf_temp/conftest_0.c b/.sconf_temp/conftest_0.c
new file mode 100644
index 000000000..e1e0b39fd
--- /dev/null
+++ b/.sconf_temp/conftest_0.c
@@ -0,0 +1,3 @@
+
+#include "stdlib.h"
+
diff --git a/.sconf_temp/conftest_1.c b/.sconf_temp/conftest_1.c
new file mode 100644
index 000000000..c0c823d8c
--- /dev/null
+++ b/.sconf_temp/conftest_1.c
@@ -0,0 +1,3 @@
+
+#include "stdint.h"
+
diff --git a/build.pyc b/build.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5a0edb5287f73f4eda6d3343fe347361ecaf0cb4
GIT binary patch
literal 24535
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
F{{u6wOC10J

literal 0
HcmV?d00001

diff --git a/config.log b/config.log
new file mode 100644
index 000000000..5e6cd0a55
--- /dev/null
+++ b/config.log
@@ -0,0 +1,22 @@
+
+file /Users/riley/lib/scons/SCons/Environment.py,line 1019:
+	Configure( confdir = .sconf_temp )
+
+Checking for C header file stdlib.h... .sconf_temp/conftest_0.c <- 
+  |
+  |#include "stdlib.h"
+  |
+  |
+gcc -c -o .sconf_temp/conftest_0.o .sconf_temp/conftest_0.c
+yes
+
+file /Users/riley/lib/scons/SCons/Environment.py,line 1019:
+	Configure( confdir = .sconf_temp )
+
+Checking for C header file stdint.h... .sconf_temp/conftest_1.c <- 
+  |
+  |#include "stdint.h"
+  |
+  |
+gcc -c -o .sconf_temp/conftest_1.o .sconf_temp/conftest_1.c
+yes
diff --git a/src/common/smartvector.h b/src/common/smartvector.h
index db72975e6..fc76b19dc 100644
--- a/src/common/smartvector.h
+++ b/src/common/smartvector.h
@@ -29,7 +29,8 @@ namespace ns3 {
 // Define a "smart" vector container to be used by any ns3 object
 // maintaining a collection of pointers, which must be freed at
 // a later time.  The template parameter T must be a pointer, or an
-// object supporting the delete operator.  The vector implementation
+// object supporting the delete operator, and the dereferenced object
+// must support the Copy() operation.  The vector implementation
 // has in inefficient "Remove" operation, that removes and deletes
 // a single element in the container.  If frequent "Remove" operations
 // are needed, the SmartSet is likey a better choice.
diff --git a/src/devices/serial/serial-channel.cc b/src/devices/serial/serial-channel.cc
index ece101dbd..2c4945bbc 100644
--- a/src/devices/serial/serial-channel.cc
+++ b/src/devices/serial/serial-channel.cc
@@ -46,8 +46,8 @@ SerialChannel::SerialChannel()
 }
 
 SerialChannel::SerialChannel(
-  DataRate bps, 
-  Time delay)
+  const DataRate& bps, 
+  const Time& delay)
 : 
   Channel ("Serial Channel"), 
   m_bps (bps), 
@@ -59,9 +59,9 @@ SerialChannel::SerialChannel(
 }
 
 SerialChannel::SerialChannel(
-  std::string name,
-  DataRate bps, 
-  Time delay)
+  const std::string& name,
+  const DataRate& bps, 
+  const Time& delay)
 : 
   Channel (name),
   m_bps (bps), 
diff --git a/src/devices/serial/serial-channel.h b/src/devices/serial/serial-channel.h
index a4400ed7f..af809322a 100644
--- a/src/devices/serial/serial-channel.h
+++ b/src/devices/serial/serial-channel.h
@@ -59,8 +59,9 @@ public:
   static const int N_DEVICES = 2;
 
   SerialChannel ();
-  SerialChannel (DataRate bps, Time delay);
-  SerialChannel (std::string name, DataRate bps, Time delay);
+  SerialChannel (const DataRate& bps, const Time& delay);
+  SerialChannel (const std::string& name,
+                 const DataRate& bps, const Time& delay);
 
   void Attach (SerialPhy* phy);
   bool Propagate (Packet& p, SerialPhy *src);
diff --git a/src/devices/serial/serial-net-device.h b/src/devices/serial/serial-net-device.h
index 59f901e65..f3f4cf921 100644
--- a/src/devices/serial/serial-net-device.h
+++ b/src/devices/serial/serial-net-device.h
@@ -51,7 +51,7 @@ private:
 
 public:
   bool Attach(SerialChannel* ch);
-  void AddQueue(Queue *);
+  void AddQueue(Queue*);
   // called by SerialPhy
   void Receive (Packet& p);
 
diff --git a/src/devices/serial/serial-topology.h b/src/devices/serial/serial-topology.h
index 1c5cbf13b..eb13615bc 100644
--- a/src/devices/serial/serial-topology.h
+++ b/src/devices/serial/serial-topology.h
@@ -30,7 +30,7 @@ namespace ns3 {
 
 class SerialChannel;
 class Node;
-class IpvrAddress;
+class IPAddr;
 //class SerialNetDevice;
 //class Queue;
 //class Rate;
@@ -44,13 +44,12 @@ public:
   // with the specified IP addresses,  with specified maximum transmission rate
   // and propagation delay.
   static SerialChannel* AddSerialLink(
-    Node*, const Ipv4Address&, 
-    Node*, const Ipv4Address&,
+    Node*, const IPAddr&, 
+    Node*, const IPAddr&,
     // const Rate&,
     uint64_t,
     const Time&);
 
-#if 0
   // Get the connecting node n1 to node n2
   static Channel* GetChannel(Node*, Node*);
   // Get the NetDevice connecting node n1 to n2
@@ -59,7 +58,6 @@ public:
   static Queue* GetQueue(Node*, Node*);
   // Set the queue associated with a link between two nodes
   static Queue* SetQueue(Node*, Node*, const Queue&);
-#endif
 };
 
 } // namespace ns3
diff --git a/src/node/node.h b/src/node/node.h
index f347b5e77..483183ed8 100644
--- a/src/node/node.h
+++ b/src/node/node.h
@@ -58,17 +58,7 @@
 // 3) If needed, implement a destructor.  Again, this is typically only
 //    needed if you use dynamic memory.
 // 4) Implement a Copy() method that returns a copy of your capability.
-// 5) Where possible Create a "Null" capability subclass of your capability
-//    that does nothing.  For example, the basic energy model provides the
-//    NullEnergyModel that is returned by the node base class "GetEnergyModel()"
-//    call when the energy model does not exist.  This Null capability of course
-//    has the same API as all energy models, but does nothing.  THis allows
-//    users of the energy model to use the pointer returned by GetEnergyModel()
-//    without having to check for the nil return.
-// 6) Implement a static GetNullCapability() method that returns either a
-//     pointer to the Null capability (see 5 above) of a nil pointer if no
-//     null capability exists.
-// 7) Implement a "Get*" virtual method in the node base that returns
+// 5) Implement a "Get*" virtual method in the node base that returns
 //    the null capability.
 //
 // To implement a variation on an existing capability, perform
@@ -85,13 +75,14 @@
 // and those modifying ns3 for their own uses are encouraged to subclass
 // an existing capability where possible.
 
-#ifndef NODE_H
-#define NODE_H
+#ifndef __NODE_H__
+#define __NODE_H__
 
 #include <vector>
 #include <list>
 
 #include "ns3/smartvector.h"
+#include "ns3/smartset.h"
 
 namespace ns3 {
 
@@ -107,6 +98,9 @@ class NodeList;
 
 class Node {
 friend class NodeList;
+friend class SmartVector<Node*>;
+friend class SmartSet<Node*>;
+
 public:
   typedef SmartVector<Node*> SmartNodeVec_t;
   Node();
@@ -120,6 +114,18 @@ public:
   uint32_t GetSystemId (void) const;
   void SetSystemId(uint32_t s);
 
+#ifdef REMOVE_FOR_NOW
+  // Define a protected delete operator. This will prevent users
+  // from attempting to delete Node objects.  The deletion of
+  // Nodes is completely the responsibility of the Node class,
+  // and in no case should be deleted by users.
+protected:
+  void operator delete(void* a)
+  { // Just call the normal delete
+    ::delete (Node*)a;
+  }
+#endif
+public:
   // Static methods for creating nodes and managing the node stack
 
   // Create a new node.  The node will be a copy of the top of the
diff --git a/src/node/ref-counted-object.h b/src/node/ref-counted-object.h
new file mode 100644
index 000000000..3442fca8f
--- /dev/null
+++ b/src/node/ref-counted-object.h
@@ -0,0 +1,45 @@
+// -*- Mode:NS3 -*-
+//
+// Copyright (c) 2006 Georgia Tech Research Corporation
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 2 as
+// published by the Free Software Foundation;
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// Author: George F. Riley<riley@ece.gatech.edu>
+// Based on original class declaration by Mathieu Lacage
+//
+
+#ifndef __REF_COUNTED_OBJECT__
+#define __REF_COUNTED_OBJECT__
+
+class RefCountedObject
+{
+public:
+  RefCountedObject() : m_count(1) {}
+  virtual ~RefCountedObject() {}
+  
+  void Ref()
+  {
+    m_count++;
+  }
+
+  void Unref()
+  {
+    if (!--m_count) delete this;  // Refcount to zero, delete
+  }
+private:
+  uint32_t m_count;
+};
+#endif
+