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

(-)a/src/topology-read/helper/topology-reader-helper.cc (-4 / +3 lines)
 Lines 47-53   TopologyReaderHelper::SetFileType (const std::string fileType) Link Here 
47 
  m_fileType = fileType;
 47 
  m_fileType = fileType;
48 
}
 48 
}
49 

          49
          

        

            

              50
              

              
              
            

        

          51
          
Ptr<TopologyReader>

          50
          
Ptr<TopologyReader>

        

        

          52
          
TopologyReaderHelper::GetTopologyReader ()

          51
          
TopologyReaderHelper::GetTopologyReader ()

        

        

          53
          
{

          52
          
{

        

  

    

    

       Lines 59-75
      TopologyReaderHelper::GetTopologyReader () 
    
  Link Here 
    

  

        

          59
          
      if (m_fileType == "Orbis")

          58
          
      if (m_fileType == "Orbis")

        

        

          60
          
        {

          59
          
        {

        

        

          61
          
          NS_LOG_INFO ("Creating Orbis formatted data input.");

          60
          
          NS_LOG_INFO ("Creating Orbis formatted data input.");

        

          
            

              62
              
          m_inFile = CreateObject<OrbisTopologyReader> ();


              61
              
          m_inFile = Create<OrbisTopologyReader> ();

            

        

          63
          
        }

          62
          
        }

        

        

          64
          
      else if (m_fileType == "Inet")

          63
          
      else if (m_fileType == "Inet")

        

        

          65
          
        {

          64
          
        {

        

        

          66
          
          NS_LOG_INFO ("Creating Inet formatted data input.");

          65
          
          NS_LOG_INFO ("Creating Inet formatted data input.");

        

          
            

              67
              
          m_inFile = CreateObject<InetTopologyReader> ();


              66
              
          m_inFile = Create<InetTopologyReader> ();

            

        

          68
          
        }

          67
          
        }

        

        

          69
          
      else if (m_fileType == "Rocketfuel")

          68
          
      else if (m_fileType == "Rocketfuel")

        

        

          70
          
        {

          69
          
        {

        

        

          71
          
          NS_LOG_INFO ("Creating Rocketfuel formatted data input.");

          70
          
          NS_LOG_INFO ("Creating Rocketfuel formatted data input.");

        

          
            

              72
              
          m_inFile = CreateObject<RocketfuelTopologyReader> ();


              71
              
          m_inFile = Create<RocketfuelTopologyReader> ();

            

        

          73
          
        }

          72
          
        }

        

        

          74
          
      else

          73
          
      else

        

        

          75
          
        {

          74
          
        {

        



(-)a/src/topology-read/helper/topology-reader-helper.h
      (-3 / +2 lines)




  

    

    

       Lines 22-32
       
    
  Link Here 
    

  

        

          22
          
#ifndef TOPOLOGY_READER_HELPER_H

          22
          
#ifndef TOPOLOGY_READER_HELPER_H

        

        

          23
          
#define TOPOLOGY_READER_HELPER_H

          23
          
#define TOPOLOGY_READER_HELPER_H

        

        

          24
          

          24
          

        

            

              25
              
#include "ns3/topology-reader.h"

              
              
            

            

              26
              
#include <string>

            

            

              27
              

            

        

          28
          
namespace ns3 {

          25
          
namespace ns3 {

        

        

          29
          

          26
          

        

            

              
              
              27
              
class TopologyReader;

            

            

              28
              

            

        

          30
          
/**

          29
          
/**

        

        

          31
          
 * \ingroup topology

          30
          
 * \ingroup topology

        

        

          32
          
 *

          31
          
 *

        



(-)a/src/topology-read/model/inet-topology-reader.cc
      (-10 / +10 lines)




  

    

    

       Lines 28-46
       
    
  Link Here 
    

  

        

          28
          

          28
          

        

        

          29
          
using namespace std;

          29
          
using namespace std;

        

        

          30
          

          30
          

        

            

              31
              
namespace ns3 {

              
              
            

            

              32
              

            

        

          33
          
NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");

          31
          
NS_LOG_COMPONENT_DEFINE ("InetTopologyReader");

        

        

          34
          

          32
          

        

          
            

              35
              
NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader);


              33
              
namespace ns3 {

            

            

              
              

              34
              

            

            


              35
              
// NS_OBJECT_ENSURE_REGISTERED (InetTopologyReader);

            

        

          36
          

          36
          

        

          
            

              37
              
TypeId InetTopologyReader::GetTypeId (void)


              37
              
// TypeId InetTopologyReader::GetTypeId (void)

            

            

              38
              
{


              38
              
// {

            

            

              39
              
  static TypeId tid = TypeId ("ns3::InetTopologyReader")


              39
              
//   static TypeId tid = TypeId ("ns3::InetTopologyReader")

            

            

              40
              
    .SetParent<Object> ()


              40
              
//     .SetParent<Object> ()

            

            

              41
              
  ;


              41
              
//   ;

            

            

              42
              
  return tid;


              42
              
//   return tid;

            

            

              43
              
}


              43
              
// }

            

        

          44
          

          44
          

        

        

          45
          
InetTopologyReader::InetTopologyReader ()

          45
          
InetTopologyReader::InetTopologyReader ()

        

        

          46
          
{

          46
          
{

        



(-)a/src/topology-read/model/inet-topology-reader.h
      (-1 / +1 lines)




  

    

    

       Lines 47-53
      namespace ns3 { 
    
  Link Here 
    

  

        

          47
          
class InetTopologyReader : public TopologyReader

          47
          
class InetTopologyReader : public TopologyReader

        

        

          48
          
{

          48
          
{

        

        

          49
          
public:

          49
          
public:

        

          
            

              50
              
  static TypeId GetTypeId (void);


              50
              
  // static TypeId GetTypeId (void);

            

        

          51
          

          51
          

        

        

          52
          
  InetTopologyReader ();

          52
          
  InetTopologyReader ();

        

        

          53
          
  virtual ~InetTopologyReader ();

          53
          
  virtual ~InetTopologyReader ();

        



(-)a/src/topology-read/model/orbis-topology-reader.cc
      (-10 / +10 lines)




  

    

    

       Lines 29-47
       
    
  Link Here 
    

  

        

          29
          

          29
          

        

        

          30
          
using namespace std;

          30
          
using namespace std;

        

        

          31
          

          31
          

        

            

              32
              
namespace ns3 {

              
              
            

            

              33
              

            

        

          34
          
NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");

          32
          
NS_LOG_COMPONENT_DEFINE ("OrbisTopologyReader");

        

        

          35
          

          33
          

        

          
            

              36
              
NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader);


              34
              
namespace ns3 {

            

            

              
              

              35
              

            

            


              36
              
// NS_OBJECT_ENSURE_REGISTERED (OrbisTopologyReader);

            

        

          37
          

          37
          

        

          
            

              38
              
TypeId OrbisTopologyReader::GetTypeId (void)


              38
              
// TypeId OrbisTopologyReader::GetTypeId (void)

            

            

              39
              
{


              39
              
// {

            

            

              40
              
  static TypeId tid = TypeId ("ns3::OrbisTopologyReader")


              40
              
//   static TypeId tid = TypeId ("ns3::OrbisTopologyReader")

            

            

              41
              
    .SetParent<Object> ()


              41
              
//     .SetParent<Object> ()

            

            

              42
              
  ;


              42
              
//   ;

            

            

              43
              
  return tid;


              43
              
//   return tid;

            

            

              44
              
}


              44
              
// }

            

        

          45
          

          45
          

        

        

          46
          
OrbisTopologyReader::OrbisTopologyReader ()

          46
          
OrbisTopologyReader::OrbisTopologyReader ()

        

        

          47
          
{

          47
          
{

        



(-)a/src/topology-read/model/orbis-topology-reader.h
      (-1 / +1 lines)




  

    

    

       Lines 44-50
      namespace ns3 { 
    
  Link Here 
    

  

        

          44
          
class OrbisTopologyReader : public TopologyReader

          44
          
class OrbisTopologyReader : public TopologyReader

        

        

          45
          
{

          45
          
{

        

        

          46
          
public:

          46
          
public:

        

          
            

              47
              
  static TypeId GetTypeId (void);


              47
              
  // static TypeId GetTypeId (void);

            

        

          48
          

          48
          

        

        

          49
          
  OrbisTopologyReader ();

          49
          
  OrbisTopologyReader ();

        

        

          50
          
  virtual ~OrbisTopologyReader ();

          50
          
  virtual ~OrbisTopologyReader ();

        



(-)a/src/topology-read/model/rocketfuel-topology-reader.cc
      (-10 / +10 lines)




  

    

    

       Lines 28-46
       
    
  Link Here 
    

  

        

          28
          
#include "ns3/unused.h"

          28
          
#include "ns3/unused.h"

        

        

          29
          
#include "rocketfuel-topology-reader.h"

          29
          
#include "rocketfuel-topology-reader.h"

        

        

          30
          

          30
          

        

            

              31
              
namespace ns3 {

              
              
            

            

              32
              

            

        

          33
          
NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");

          31
          
NS_LOG_COMPONENT_DEFINE ("RocketfuelTopologyReader");

        

        

          34
          

          32
          

        

          
            

              35
              
NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader);


              33
              
namespace ns3 {

            

            

              
              

              34
              

            

            


              35
              
// NS_OBJECT_ENSURE_REGISTERED (RocketfuelTopologyReader);

            

        

          36
          

          36
          

        

          
            

              37
              
TypeId RocketfuelTopologyReader::GetTypeId (void)


              37
              
// TypeId RocketfuelTopologyReader::GetTypeId (void)

            

            

              38
              
{


              38
              
// {

            

            

              39
              
  static TypeId tid = TypeId ("ns3::RocketfuelTopologyReader")


              39
              
//   static TypeId tid = TypeId ("ns3::RocketfuelTopologyReader")

            

            

              40
              
    .SetParent<Object> ()


              40
              
//     .SetParent<Object> ()

            

            

              41
              
  ;


              41
              
//   ;

            

            

              42
              
  return tid;


              42
              
//   return tid;

            

            

              43
              
}


              43
              
// }

            

        

          44
          

          44
          

        

        

          45
          
RocketfuelTopologyReader::RocketfuelTopologyReader ()

          45
          
RocketfuelTopologyReader::RocketfuelTopologyReader ()

        

        

          46
          
{

          46
          
{

        



(-)a/src/topology-read/model/rocketfuel-topology-reader.h
      (-2 / +1 lines)




  

    

    

       Lines 21-27
       
    
  Link Here 
    

  

        

          21
          
#ifndef ROCKETFUEL_TOPOLOGY_READER_H

          21
          
#ifndef ROCKETFUEL_TOPOLOGY_READER_H

        

        

          22
          
#define ROCKETFUEL_TOPOLOGY_READER_H

          22
          
#define ROCKETFUEL_TOPOLOGY_READER_H

        

        

          23
          

          23
          

        

            

              24
              
#include "ns3/nstime.h"

              
              
            

        

          25
          
#include "topology-reader.h"

          24
          
#include "topology-reader.h"

        

        

          26
          

          25
          

        

        

          27
          
namespace ns3 {

          26
          
namespace ns3 {

        

  

    

    

       Lines 43-49
      namespace ns3 { 
    
  Link Here 
    

  

        

          43
          
class RocketfuelTopologyReader : public TopologyReader

          42
          
class RocketfuelTopologyReader : public TopologyReader

        

        

          44
          
{

          43
          
{

        

        

          45
          
public:

          44
          
public:

        

          
            

              46
              
  static TypeId GetTypeId (void);


              45
              
  // static TypeId GetTypeId (void);

            

        

          47
          

          46
          

        

        

          48
          
  RocketfuelTopologyReader ();

          47
          
  RocketfuelTopologyReader ();

        

        

          49
          
  virtual ~RocketfuelTopologyReader ();

          48
          
  virtual ~RocketfuelTopologyReader ();

        



(-)a/src/topology-read/model/topology-reader.cc
      (-10 / +9 lines)




  

    

    

       Lines 19-42
       
    
  Link Here 
    

  

        

          19
          
 * Author: Valerio Sartini (valesar@gmail.com)

          19
          
 * Author: Valerio Sartini (valesar@gmail.com)

        

        

          20
          
 */

          20
          
 */

        

        

          21
          

          21
          

        

            

              22
              
#include "ns3/log.h"

              
              
            

            

              23
              

            

        

          24
          
#include "topology-reader.h"

          22
          
#include "topology-reader.h"

        

        

          25
          

          23
          

        

            

              
              
              24
              
#include "ns3/log.h"

            

        

          26
          

          25
          

        

        

          27
          
namespace ns3 {

          26
          
namespace ns3 {

        

        

          28
          

          27
          

        

        

          29
          
NS_LOG_COMPONENT_DEFINE ("TopologyReader");

          28
          
NS_LOG_COMPONENT_DEFINE ("TopologyReader");

        

        

          30
          

          29
          

        

          
            

              31
              
NS_OBJECT_ENSURE_REGISTERED (TopologyReader);


              30
              
// NS_OBJECT_ENSURE_REGISTERED (TopologyReader);

            

        

          32
          

          31
          

        

          
            

              33
              
TypeId TopologyReader::GetTypeId (void)


              32
              
// TypeId TopologyReader::GetTypeId (void)

            

            

              34
              
{


              33
              
// {

            

            

              35
              
  static TypeId tid = TypeId ("ns3::TopologyReader")


              34
              
//   static TypeId tid = TypeId ("ns3::TopologyReader")

            

            

              36
              
    .SetParent<Object> ()


              35
              
//     .SetParent<Object> ()

            

            

              37
              
  ;


              36
              
//   ;

            

            

              38
              
  return tid;


              37
              
//   return tid;

            

            

              39
              
}


              38
              
// }

            

        

          40
          

          39
          

        

        

          41
          
TopologyReader::TopologyReader ()

          40
          
TopologyReader::TopologyReader ()

        

        

          42
          
{

          41
          
{

        



(-)a/src/topology-read/model/topology-reader.h
      (-6 / +3 lines)




  

    

    

       Lines 22-34
       
    
  Link Here 
    

  

        

          22
          
#ifndef TOPOLOGY_READER_H

          22
          
#ifndef TOPOLOGY_READER_H

        

        

          23
          
#define TOPOLOGY_READER_H

          23
          
#define TOPOLOGY_READER_H

        

        

          24
          

          24
          

        

            

              25
              
#include <string>

              
              
            

        

          26
          
#include <map>

          25
          
#include <map>

        

        

          27
          
#include <list>

          26
          
#include <list>

        

        

          28
          

          27
          

        

            

              29
              
#include "ns3/object.h"

              
              
            

        

          30
          
#include "ns3/node-container.h"

          28
          
#include "ns3/node-container.h"

        

          
            

              31
              


              29
              
#include "ns3/simple-ref-count.h"

            

        

          32
          

          30
          

        

        

          33
          
namespace ns3 {

          31
          
namespace ns3 {

        

        

          34
          

          32
          

        

  

    

    

       Lines 42-48
      class NetDevice; 
    
  Link Here 
    

  

        

          42
          
 * This interface perform the shared tasks among all possible input file readers.

          40
          
 * This interface perform the shared tasks among all possible input file readers.

        

        

          43
          
 * Each different file format is handled by its own topology reader.

          41
          
 * Each different file format is handled by its own topology reader.

        

        

          44
          
 */

          42
          
 */

        

          
            

              45
              
class TopologyReader : public Object


              43
              
class TopologyReader : public SimpleRefCount<TopologyReader>

            

        

          46
          
{

          44
          
{

        

        

          47
          

          45
          

        

        

          48
          
public:

          46
          
public:

        

  

    

    

       Lines 157-163
      private: 
    
  Link Here 
    

  

        

          157
          
   */

          155
          
   */

        

        

          158
          
  typedef std::list< Link >::const_iterator ConstLinksIterator;

          156
          
  typedef std::list< Link >::const_iterator ConstLinksIterator;

        

        

          159
          

          157
          

        

          
            

              160
              
  static TypeId GetTypeId (void);


              158
              
  // static TypeId GetTypeId (void);

            

        

          161
          

          159
          

        

        

          162
          
  TopologyReader ();

          160
          
  TopologyReader ();

        

        

          163
          
  virtual ~TopologyReader ();

          161
          
  virtual ~TopologyReader ();

        

            

              164
              
- 

              
              
            






  

  Return to bug 1413