Attachment #1217 for bug #1192

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




    // Ping loopback test case
    AddTestCase (new LoopbackTestCase ());
  }
  
  virtual void DoSetup (void)
  {
    TestSuite::DoSetup();
    
    // Set a reproducible random seed
    SeedManager::SetSeed(12345);
  }
} g_aodvRegressionTestSuite;
 


void
ChainRegressionTest::DoRun ()
{
  SeedManager::SetSeed (12345);
  Config::SetDefault ("ns3::ArpCache::AliveTimeout", TimeValue (m_arpAliveTimeout));

  CreateNodes ();

(-)a/src/aodv/test/bug-772.cc (+1 lines)

Lines 74-79	Link Here

Bug772ChainTest::DoRun ()

Bug772ChainTest::DoRun ()

  SeedManager::SetSeed (12345);

  SeedManager::SetSeed (12345);

  Config::SetDefault ("ns3::ArpCache::AliveTimeout", TimeValue (Seconds (1)));

  CreateNodes ();

  CreateNodes ();

  CreateDevices ();

  CreateDevices ();

(-)a/src/core/model/config.cc (+5 lines)

Lines 603-608	Link Here

603

604

  return GlobalValue::BindFailSafe (name, value);

604

  return GlobalValue::BindFailSafe (name, value);

605

606

void Reset ()

607

608

  AttributeList::GetGlobal ()->Reset ();

609

  GlobalValue::ResetAll ();

610

606

void ConnectWithoutContext (std::string path, const CallbackBase &cb)

611

void ConnectWithoutContext (std::string path, const CallbackBase &cb)

607

612

608

  Singleton<ConfigImpl>::Get ()->ConnectWithoutContext (path, cb);

613

  Singleton<ConfigImpl>::Get ()->ConnectWithoutContext (path, cb);

(-)a/src/core/model/config.h (+5 lines)

Lines 110-115	Link Here

110

 * This function undoes the work of Config::ConnectWithContext.

110

 * This function undoes the work of Config::ConnectWithContext.

111

*/

111

*/

112

void Disconnect (std::string path, const CallbackBase &cb);

112

void Disconnect (std::string path, const CallbackBase &cb);

113

/**

114

 * This method resets the effect of all SetDefault, SetDefaultFailSafe,

115

 * SetGlobal, and SetGlobalFailSafe calls.

116

*/

117

void Reset ();

113

118

114

/**

119

/**

115

 * \brief hold a set of objects which match a specific search string.

120

 * \brief hold a set of objects which match a specific search string.




void
GlobalValue::InitializeFromEnv (void)
{
  m_value = m_initialValue->Copy ();
#ifdef HAVE_GETENV
  char *envVar = getenv ("NS_GLOBAL_VALUE");
  if (envVar == 0)

  return m_help;
}
void
GlobalValue::ResetValue (void)
{
  InitializeFromEnv ();
}
void
GlobalValue::ResetAll (void)
{
  for (Iterator i = Begin (); i != End (); i++)
    {
      (*i)->ResetValue ();
    }
}
void
GlobalValue::GetValue (AttributeValue &value) const
{
  bool ok = m_checker->Copy (*m_value, value);
  if (ok)
    {
      return;

    {
      NS_FATAL_ERROR ("GlobalValue name="<<m_name<<": input value is not a string");
    }
  str->Set (m_value->SerializeToString (m_checker));
}
Ptr<const AttributeChecker> 
GlobalValue::GetChecker (void) const

{
  if (m_checker->Check (value))
    {
      m_value = value.Copy ();
      return true;
    }
  // attempt to convert to string.

    {
      return false;
    }
  m_checker->Copy (*v, *PeekPointer (m_value));
  return true;
}


(-)a/src/core/model/global-value.h (+10 lines)

Lines 84-89	Link Here

   * \param value the new value to set in this GlobalValue.

   * \param value the new value to set in this GlobalValue.

*/

*/

  bool SetValue (const AttributeValue &value);

  bool SetValue (const AttributeValue &value);

/**

   * Reset the global value to its default/initial value.

*/

  void ResetValue ();

/**

/**

   * \param name the name of the global value

   * \param name the name of the global value

Lines 136-141	Link Here

136

140

137

*/

141

*/

138

  static void GetValueByName (std::string name, AttributeValue &value);

142

  static void GetValueByName (std::string name, AttributeValue &value);

143

144

/**

145

   * Resets all GlobalValue s to their defaults.

146

*/

147

  static void ResetAll ();

139

148

140

149

141

private:

150

private:

Lines 145-150	Link Here

145

  void InitializeFromEnv (void);

154

  void InitializeFromEnv (void);

146

  std::string m_name;

155

  std::string m_name;

147

  std::string m_help;

156

  std::string m_help;

157

  Ptr<AttributeValue> m_value;

148

  Ptr<AttributeValue> m_initialValue;

158

  Ptr<AttributeValue> m_initialValue;

149

  Ptr<const AttributeChecker> m_checker;

159

  Ptr<const AttributeChecker> m_checker;

150

};

160

};

(-)a/src/core/model/random-variable.cc (+5 lines)

Lines 64-69	Link Here

void SeedManager::SetSeed (uint32_t seed)

void SeedManager::SetSeed (uint32_t seed)

  Config::SetGlobal ("RngSeed", IntegerValue (seed));

  Config::SetGlobal ("RngSeed", IntegerValue (seed));

  // A call to SeedManager::SetSeed is an explicit request for a reproducible

  // state. RngStream does not re-initialize itself after setting the global

  // value above, unless we explicitly call SetPackageSeed.

  RngStream::SetPackageSeed(seed);

void SeedManager::SetRun (uint32_t run)

void SeedManager::SetRun (uint32_t run)




RngStream::EnsureGlobalInitialized (void)
{
  static bool initialized = false;
  uint32_t run = 0;
  
  IntegerValue value;
  g_rngRun.GetValue (value);
  run = value.Get ();
  
  if (!initialized)
    {
      initialized = true;

      IntegerValue value;
      g_rngSeed.GetValue (value);
      seed = value.Get ();
      g_rngRun.GetValue (value);
      run = value.Get ();
      SetPackageSeed (seed);
    }
    
  return run;
}


(-)a/src/core/model/test.cc (+42 lines)

Lines 21-26	Link Here

#include "abort.h"

#include "abort.h"

#include <math.h>

#include <math.h>

#include "ns3/simulator.h"

#include "ns3/config.h"

// Set to true to enable a segmentation fault upon a test case macro test

// Set to true to enable a segmentation fault upon a test case macro test

// failing (for debugging purposes)

// failing (for debugging purposes)

bool gBreakOnFailure = false;

bool gBreakOnFailure = false;

Lines 395-405	Link Here

395

void

398

void

396

TestCase::DoSetup (void)

399

TestCase::DoSetup (void)

397

400

401

/*

402

   * Ensure a clean execution environment

403

*/

404

  Simulator::Destroy();

398

405

399

406

400

void

407

void

401

TestCase::DoTeardown (void)

408

TestCase::DoTeardown (void)

402

409

410

/*

411

   *   Most tests will destroy their simulators when successful,

412

   * but on failure, they tend to leave the simulator alive.

413

   *   This can be a problem for subsequent test runs, so we

414

   * must destroy the simulator on TestCase teardown just in case.

415

*/

416

  Simulator::Destroy();

417

418

/**

419

   *   Some tests will change default configuration settings. In

420

   * those cases, a full configuration reset is the only way to get

421

   * back to a reproducible state.

422

*/

423

  Config::Reset ();

403

424

404

425

405

TestSuite::TestSuite (std::string name, TestType type)

426

TestSuite::TestSuite (std::string name, TestType type)

Lines 659-664	Link Here

659

void

680

void

660

TestSuite::DoSetup (void)

681

TestSuite::DoSetup (void)

661

682

683

/*

684

   * Ensure repeatable state, reset all configuration settings to their defaults

685

*/

686

  Config::Reset ();

687

688

/*

689

   * Preserve global RNG state (RngStream contains process-wide side effects)

690

*/

691

  m_rngRunBackup = SeedManager::GetRun();

692

  m_rngSeedBackup = SeedManager::GetSeed();

693

694

/*

695

   * Reset RNG state (in case the testing framework changed it somehow between runs)

696

*/

697

  SeedManager::SetRun(m_rngRunBackup);

698

  SeedManager::SetSeed(m_rngSeedBackup);

662

699

663

700

664

void

701

void

Lines 697-702	Link Here

697

void

734

void

698

TestSuite::DoTeardown (void)

735

TestSuite::DoTeardown (void)

699

736

737

/*

738

   * Restore global RNG state

739

*/

740

  SeedManager::SetRun(m_rngRunBackup);

741

  SeedManager::SetSeed(m_rngSeedBackup);

700

742

701

743

702

class TestRunnerImpl

744

class TestRunnerImpl




#include <stdint.h>

#include "ns3/system-wall-clock-ms.h"
#include "ns3/random-variable.h"

extern bool gBreakOnFailure;


          actualStream << actual;                                                                          \
          std::ostringstream limitStream;                                                                  \
          limitStream << limit;                                                                            \
          ReportTestFailure (std::string (# actual) + " (actual) > " + std::string (# limit) + " (limit)",   \
                             actualStream.str (), limitStream.str (), msgStream.str (), file, line);           \
        }                                                                                                  \
    } while (false)

  bool m_error;
  TestType m_type;

  // Backup of process-wide RNG state
  // FIXME: This *should* be done per-testcase, but current test cases
  //    depend have cases where they depend on RNG state resulting from
  //    previous runs within a TestSuite (like routing-aodv-regression),
  //    so in order not to break them, we do not reset RNG state between
  //    test cases, only between tests suites.
  uint32_t m_rngSeedBackup;
  uint32_t m_rngRunBackup;

  typedef std::vector<TestCase *> TestCaseVector_t;
  TestCaseVector_t m_tests;
};




BasicAddTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

StringContextAddTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

FullyQualifiedAddTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

RelativeAddTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

BasicRenameTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

StringContextRenameTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

FullyQualifiedRenameTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

RelativeRenameTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

FindPathTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

BasicFindTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

StringContextFindTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

FullyQualifiedFindTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

RelativeFindTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

AlternateFindTestCase::DoTeardown (void)
{
  Names::Clear ();
  TestCase::DoTeardown ();
}

void

(-)a/src/core/test/time-test-suite.cc (+1 lines)

Lines 76-81	Link Here

TimeSimpleTestCase::DoTeardown (void)

TimeSimpleTestCase::DoTeardown (void)

  Time::SetResolution (m_originalResolution);

  Time::SetResolution (m_originalResolution);

  TestCase::DoTeardown ();

static class TimeTestSuite : public TestSuite

static class TimeTestSuite : public TestSuite

(-)a/src/core/test/timer-test-suite.cc (+1 lines)

Lines 215-220	Link Here

215

216

  Simulator::Run ();

216

  Simulator::Run ();

217

  Simulator::Destroy ();

217

  Simulator::Destroy ();

218

  TestCase::DoTeardown ();

218

219

220

static class TimerTestSuite : public TestSuite

221

static class TimerTestSuite : public TestSuite





private:
  void DoRun (void);
  void DoSetup (void);

  /**
   * Callback invoked when energy is drained from source.

  double m_simTimeS;        // maximum simulation time, in seconds
  double m_timeStepS;       // simulation time step size, in seconds
  double m_updateIntervalS; // update interval of each device model
  std::string m_phyMode;

};

BasicEnergyDepletionTest::BasicEnergyDepletionTest ()
  : TestCase ("Basic energy model energy depletion test case")
  , m_phyMode ("DsssRate1Mbps")
{
  m_numOfNodes = 10;
  m_callbackCount = 0;

}

void
BasicEnergyDepletionTest::DoSetup (void)
{
  TestCase::DoSetup ();

  // disable fragmentation for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
                      StringValue ("2200"));
  // turn off RTS/CTS for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("2200"));
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
                      StringValue (m_phyMode));
}

void
BasicEnergyDepletionTest::DoRun (void)
{
  /*

  NodeContainer c;
  c.Create (m_numOfNodes);

  std::string phyMode ("DsssRate1Mbps");

  // disable fragmentation for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
                      StringValue ("2200"));
  // turn off RTS/CTS for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("2200"));
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
                      StringValue (phyMode));

  // install YansWifiPhy
  WifiHelper wifi;
  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);

  // Add a non-QoS upper MAC, and disable rate control
  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                "DataMode", StringValue (m_phyMode),
                                "ControlMode", StringValue (m_phyMode));
  // Set it to ad-hoc mode
  wifiMac.SetType ("ns3::AdhocWifiMac");
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c);




  void CreateLoadProfiles (void);

  /**
   * \returns False if no error occurs.
   *
   * Runs test.
   */
  void DoRun (void);

  /**
   * Sets up test configuration
   */
  void DoSetup (void);

  /**
   * \param load Load value, in Amperes (A).
   * \param expLifetime Expected lifetime.
   * \return False if no error occurs.

  std::vector<LoadProfile> m_loadProfiles;
  double m_alpha;
  double m_beta;
  std::string m_phyMode;
};

BatteryLifetimeTest::BatteryLifetimeTest ()
  : TestCase ("RV battery model battery lifetime test case.")
  , m_phyMode ("DsssRate1Mbps")
{
  // Itsy battery
  m_alpha = 35220;
  m_beta = 0.637;
  
  // create load profiles for variable load test
  CreateLoadProfiles ();
}

BatteryLifetimeTest::~BatteryLifetimeTest ()

}

void
BatteryLifetimeTest::DoSetup (void)
{
  TestCase::DoSetup ();

  // disable fragmentation for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
                      StringValue ("2200"));
  // turn off RTS/CTS for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("2200"));
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
                      StringValue (m_phyMode));
}

void
BatteryLifetimeTest::DoRun (void)
{
  NS_LOG_DEBUG ("Constant load run.");

  // set constant load test parameters
  m_alpha = 35220;
  m_beta = 0.637;

  // 640mA
  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.640, Seconds (2844.0)), false,  "Problems with constant load test (640mA).");
  // 320mA

  // 32mA
  NS_TEST_ASSERT_MSG_EQ (ConstantLoadTest (0.032, Seconds (65580.0)), false,  "Problems with constant load test (32).");

  // create load profiles for variable load test
  CreateLoadProfiles ();

  // variable load with Itsy battery
  NS_LOG_DEBUG ("\n\nItsy");
  m_alpha = 35220;

  NodeContainer c;
  c.Create (1);

  std::string phyMode ("DsssRate1Mbps");

  // disable fragmentation for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
                      StringValue ("2200"));
  // turn off RTS/CTS for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("2200"));
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
                      StringValue (phyMode));

  // install YansWifiPhy
  WifiHelper wifi;
  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);

  // Add a non-QoS upper MAC, and disable rate control
  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                "DataMode", StringValue (m_phyMode),
                                "ControlMode", StringValue (m_phyMode));
  // Set it to ad-hoc mode
  wifiMac.SetType ("ns3::AdhocWifiMac");
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c);


  NS_LOG_DEBUG ("Expected lifetime = " << expLifetime.GetSeconds () << "s");
  NS_LOG_DEBUG ("Actual lifetime = " << actualLifetime.GetSeconds () << "s");
  
  NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (actualLifetime, expLifetime, "Incorrect lifetime!");
  /*
  NS_TEST_ASSERT_MSG_EQ_TOL_RETURNS_BOOL (actualLifetime.GetSeconds () / 60,

  NodeContainer c;
  c.Create (1);

  std::string phyMode ("DsssRate1Mbps");

  // disable fragmentation for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold",
                      StringValue ("2200"));
  // turn off RTS/CTS for frames below 2200 bytes
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("2200"));
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",
                      StringValue (phyMode));

  // install YansWifiPhy
  WifiHelper wifi;
  wifi.SetStandard (WIFI_PHY_STANDARD_80211b);

  // Add a non-QoS upper MAC, and disable rate control
  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                "DataMode", StringValue (m_phyMode),
                                "ControlMode", StringValue (m_phyMode));
  // Set it to ad-hoc mode
  wifiMac.SetType ("ns3::AdhocWifiMac");
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c);




NetworkNumberAllocatorTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}
void
NetworkNumberAllocatorTestCase::DoRun (void)

AddressAllocatorTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}



NetworkAndAddressTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}

void

ExampleAddressGeneratorTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}

void

AddressCollisionTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}
void
AddressCollisionTestCase::DoRun (void)




NetworkAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}
void
NetworkAllocatorHelperTestCase::DoRun (void)

AddressAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}

void

ResetAllocatorHelperTestCase::DoTeardown (void)
{
  Ipv4AddressGenerator::Reset ();
  TestCase::DoTeardown ();
}

static class Ipv4AddressHelperTestSuite : public TestSuite

(-)a/src/internet/test/tcp-test.cc (-1 / +1 lines)

Lines 160-166	Link Here

160

  delete [] m_sourceTxPayload;

160

  delete [] m_sourceTxPayload;

161

  delete [] m_sourceRxPayload;

161

  delete [] m_sourceRxPayload;

162

  delete [] m_serverRxPayload;

162

  delete [] m_serverRxPayload;

163

  Simulator::Destroy ();

163

  TestCase::DoTeardown ();

164

165

166

void

166

void

(-)a/src/mobility/test/ns2-mobility-helper-test-suite.cc (-1 / +2 lines)

Lines 204-209	Link Here

204

205

  void DoSetup ()

205

  void DoSetup ()

206

207

    Simulator::Destroy();

207

    CreateNodes ();

208

    CreateNodes ();

208

209

210

Lines 211-217	Link Here

211

212

    Names::Clear ();

213

    Names::Clear ();

213

    std::remove (m_traceFile.c_str ());

214

    std::remove (m_traceFile.c_str ());

214

    Simulator::Destroy ();

215

    TestCase::DoTeardown ();

215

216

217

  /// Go

218

  /// Go

(-)a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc (+1 lines)

Lines 47-52	Link Here

SteadyStateRandomWaypointTest::DoTeardown (void)

SteadyStateRandomWaypointTest::DoTeardown (void)

  mobilityStack.clear();

  mobilityStack.clear();

  TestCase::DoTeardown();

void

void

(-)a/src/mobility/test/waypoint-mobility-model-test.cc (+1 lines)

Lines 57-62	Link Here

  mobilityStack.clear();

  mobilityStack.clear();

  waypoints.clear();

  waypoints.clear();

  TestCase::DoTeardown();

void

void




  m_enableChecking = true;
}

void 
PacketMetadata::Disable (void)
{
  NS_ASSERT_MSG (!m_metadataSkipped,
                 "Error: attempting to enable the packet metadata "
                 "subsystem too late in the simulation, which is not allowed.\n"
                 "A common cause for this problem is to enable ASCII tracing "
                 "after sending any packets.  One way to fix this problem is "
                 "to call ns3::PacketMetadata::Enable () near the beginning of"
                 " the program, before any packets are sent.");
  m_enable = false;
}

void 
PacketMetadata::DisableChecking (void)
{
  Disable ();
  m_enableChecking = false;
}

void
PacketMetadata::ReserveCopy (uint32_t size)
{

(-)a/src/network/model/packet-metadata.h (+3 lines)

Lines 127-132	Link Here

127

  static void Enable (void);

127

  static void Enable (void);

128

  static void EnableChecking (void);

128

  static void EnableChecking (void);

129

130

  static void Disable (void);

131

  static void DisableChecking (void);

132

130

  inline PacketMetadata (uint64_t uid, uint32_t size);

133

  inline PacketMetadata (uint64_t uid, uint32_t size);

131

  inline PacketMetadata (PacketMetadata const &o);

134

  inline PacketMetadata (PacketMetadata const &o);

132

  inline PacketMetadata &operator = (PacketMetadata const& o);

135

  inline PacketMetadata &operator = (PacketMetadata const& o);




  PacketMetadata::EnableChecking ();
}

void
Packet::DisablePrinting (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  PacketMetadata::Disable ();
}

void
Packet::DisableChecking (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  PacketMetadata::DisableChecking ();
}

uint32_t Packet::GetSerializedSize (void) const
{
  uint32_t size = 0;

(-)a/src/network/model/packet.h (+8 lines)

Lines 429-434	Link Here

429

   * errors will be detected and will abort the program.

429

   * errors will be detected and will abort the program.

430

*/

430

*/

431

  static void EnableChecking (void);

431

  static void EnableChecking (void);

432

/**

433

   * \sa EnablePrinting

434

*/

435

  static void DisablePrinting (void);

436

/**

437

   * \sa EnableChecking

438

*/

439

  static void DisableChecking (void);

432

440

433

/**

441

/**

434

   * For packet serializtion, the total size is checked

442

   * For packet serializtion, the total size is checked




WriteModeCreateTestCase::DoTeardown (void)
{
  remove (m_testFilename.c_str ());
  TestCase::DoTeardown ();
}

void

ReadModeCreateTestCase::DoTeardown (void)
{
  remove (m_testFilename.c_str ());
  TestCase::DoTeardown ();
}

void

AppendModeCreateTestCase::DoTeardown (void)
{
  remove (m_testFilename.c_str ());
  TestCase::DoTeardown ();
}

void

FileHeaderTestCase::DoTeardown (void)
{
  remove (m_testFilename.c_str ());
  TestCase::DoTeardown ();
}

void

RecordHeaderTestCase::DoTeardown (void)
{
  remove (m_testFilename.c_str ());
  TestCase::DoTeardown ();
}

void

void
ReadFileTestCase::DoTeardown (void)
{
  TestCase::DoTeardown ();
}

const uint32_t N_KNOWN_PACKETS = 6;

(-)a/src/network/utils/mac48-address.cc (-1 / +15 lines)

Lines 20-29	Link Here

#include "mac48-address.h"

#include "mac48-address.h"

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "ns3/uinteger.h"

#include "ns3/global-value.h"

#include <iomanip>

#include <iomanip>

#include <iostream>

#include <iostream>

#include <string.h>

#include <string.h>

static ns3::GlobalValue g_Mac48Origin ("Mac48Origin",

                                   "The initial value the Mac48Address::Allocate helper will use.",

                                   ns3::UintegerValue (0),

                                   ns3::MakeUintegerChecker<uint64_t> ());

namespace ns3 {

namespace ns3 {

ATTRIBUTE_HELPER_CPP (Mac48Address);

ATTRIBUTE_HELPER_CPP (Mac48Address);

Lines 118-124	Link Here

118

Mac48Address

125

Mac48Address

119

Mac48Address::Allocate (void)

126

Mac48Address::Allocate (void)

120

127

121

  static uint64_t id = 0;

128

  UintegerValue value;

129

  g_Mac48Origin.GetValue (value);

130

  uint64_t id = value.Get();

131

122

  id++;

132

  id++;

123

  Mac48Address address;

133

  Mac48Address address;

124

  address.m_address[0] = (id >> 40) & 0xff;

134

  address.m_address[0] = (id >> 40) & 0xff;

Lines 127-132	Link Here

127

  address.m_address[3] = (id >> 16) & 0xff;

137

  address.m_address[3] = (id >> 16) & 0xff;

128

  address.m_address[4] = (id >> 8) & 0xff;

138

  address.m_address[4] = (id >> 8) & 0xff;

129

  address.m_address[5] = (id >> 0) & 0xff;

139

  address.m_address[5] = (id >> 0) & 0xff;

140

141

  value.Set(id);

142

  g_Mac48Origin.SetValue (value);

143

130

  return address;

144

  return address;

131

145

132

uint8_t

146

uint8_t




}

void
Bug780Test::DoSetup ()
{
  TestCase::DoSetup ();

  //sending one packets per sec
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("400"));
}

void
Bug780Test::DoRun ()
{
  SeedManager::SetSeed (123);

  double SimTime = 200.0;
  std::string phyMode ("DsssRate1Mbps");

  //sending one packets per sec
  // Fix non-unicast data rate to be the same as that of unicast
  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold",
                      StringValue ("400"));

  NodeContainer adhocNodes;
  adhocNodes.Create (nWifis);


(-)a/src/olsr/test/bug780-test.h (+1 lines)

Lines 43-48	Link Here

  void CheckResults ();

  void CheckResults ();

  /// Go

  /// Go

  void DoRun ();

  void DoRun ();

  void DoSetup ();

};

};

(-)a/src/propagation/test/propagation-loss-model-test-suite.cc (-4 / +37 lines)

Lines 42-47	Link Here

private:

private:

  virtual void DoRun (void);

  virtual void DoRun (void);

  virtual void DoSetup (void);

  typedef struct {

  typedef struct {

    Vector m_position;

    Vector m_position;

Lines 63-76	Link Here

void

void

FriisPropagationLossModelTestCase::DoRun (void)

FriisPropagationLossModelTestCase::DoSetup (void)

  TestCase::DoSetup ();

  // The ns-3 testing manual gives more background on the values selected

  // The ns-3 testing manual gives more background on the values selected

  // for this test.  First, set a few defaults.

  // for this test.  First, set a few defaults.

  // wavelength at 2.4 GHz is 0.125m

  // wavelength at 2.4 GHz is 0.125m

  Config::SetDefault ("ns3::FriisPropagationLossModel::Lambda", DoubleValue (0.125));

  Config::SetDefault ("ns3::FriisPropagationLossModel::Lambda", DoubleValue (0.125));

  Config::SetDefault ("ns3::FriisPropagationLossModel::SystemLoss", DoubleValue (1.0));

  Config::SetDefault ("ns3::FriisPropagationLossModel::SystemLoss", DoubleValue (1.0));

void

FriisPropagationLossModelTestCase::DoRun (void)

  // The ns-3 testing manual gives more background on the values selected

  // for this test.

  // Select a reference transmit power

  // Select a reference transmit power

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

Lines 139-144	Link Here

139

149

140

private:

150

private:

141

  virtual void DoRun (void);

151

  virtual void DoRun (void);

152

  virtual void DoSetup (void);

142

153

143

  typedef struct

154

  typedef struct

144

155

Lines 162-176	Link Here

162

173

163

174

164

void

175

void

165

TwoRayGroundPropagationLossModelTestCase::DoRun (void)

176

TwoRayGroundPropagationLossModelTestCase::DoSetup (void)

166

177

178

  TestCase::DoSetup ();

179

167

  // wavelength at 2.4 GHz is 0.125m

180

  // wavelength at 2.4 GHz is 0.125m

168

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::Lambda", DoubleValue (0.125));

181

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::Lambda", DoubleValue (0.125));

169

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::SystemLoss", DoubleValue (1.0));

182

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::SystemLoss", DoubleValue (1.0));

170

183

171

  // set antenna height to 1.5m above z coordinate

184

  // set antenna height to 1.5m above z coordinate

172

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::HeightAboveZ", DoubleValue (1.5));

185

  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::HeightAboveZ", DoubleValue (1.5));

186

173

187

188

void

189

TwoRayGroundPropagationLossModelTestCase::DoRun (void)

190

174

  // Select a reference transmit power of 17.0206 dBm

191

  // Select a reference transmit power of 17.0206 dBm

175

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

192

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

176

  double txPowerW = 0.05035702;

193

  double txPowerW = 0.05035702;

Lines 267-272	Link Here

267

284

268

private:

285

private:

269

  virtual void DoRun (void);

286

  virtual void DoRun (void);

287

  virtual void DoSetup (void);

270

288

271

  typedef struct {

289

  typedef struct {

272

    Vector m_position;

290

    Vector m_position;

Lines 288-299	Link Here

288

306

289

307

290

void

308

void

291

LogDistancePropagationLossModelTestCase::DoRun (void)

309

LogDistancePropagationLossModelTestCase::DoSetup (void)

292

310

311

  TestCase::DoSetup ();

312

293

  // reference loss at 2.4 GHz is 40.045997

313

  // reference loss at 2.4 GHz is 40.045997

294

  Config::SetDefault ("ns3::LogDistancePropagationLossModel::ReferenceLoss", DoubleValue (40.045997));

314

  Config::SetDefault ("ns3::LogDistancePropagationLossModel::ReferenceLoss", DoubleValue (40.045997));

295

  Config::SetDefault ("ns3::LogDistancePropagationLossModel::Exponent", DoubleValue (3));

315

  Config::SetDefault ("ns3::LogDistancePropagationLossModel::Exponent", DoubleValue (3));

316

296

317

318

void

319

LogDistancePropagationLossModelTestCase::DoRun (void)

320

297

  // Select a reference transmit power

321

  // Select a reference transmit power

298

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

322

  // Pt = 10^(17.0206/10)/10^3 = .05035702 W

299

  double txPowerW = 0.05035702;

323

  double txPowerW = 0.05035702;

Lines 402-407	Link Here

402

426

403

private:

427

private:

404

  virtual void DoRun (void);

428

  virtual void DoRun (void);

429

  virtual void DoSetup (void);

405

};

430

};

406

431

407

RangePropagationLossModelTestCase::RangePropagationLossModelTestCase ()

432

RangePropagationLossModelTestCase::RangePropagationLossModelTestCase ()

Lines 414-422	Link Here

414

439

415

440

416

void

441

void

442

RangePropagationLossModelTestCase::DoSetup (void)

443

444

  TestCase::DoSetup ();

445

446

  // Set testcase parameters

447

  Config::SetDefault ("ns3::RangePropagationLossModel::MaxRange", DoubleValue (127.2));

448

449

450

void

417

RangePropagationLossModelTestCase::DoRun (void)

451

RangePropagationLossModelTestCase::DoRun (void)

418

452

419

  Config::SetDefault ("ns3::RangePropagationLossModel::MaxRange", DoubleValue (127.2));

420

  Ptr<MobilityModel> a = CreateObject<ConstantPositionMobilityModel> ();

453

  Ptr<MobilityModel> a = CreateObject<ConstantPositionMobilityModel> ();

421

  a->SetPosition (Vector (0,0,0));

454

  a->SetPosition (Vector (0,0,0));

422

  Ptr<MobilityModel> b = CreateObject<ConstantPositionMobilityModel> ();

455

  Ptr<MobilityModel> b = CreateObject<ConstantPositionMobilityModel> ();

(-)a/src/test/csma-system-test-suite.cc (-6 / +15 lines)

Lines 165-170	Link Here

165

166

private:

166

private:

167

  virtual void DoRun (void);

167

  virtual void DoRun (void);

168

  virtual void DoSetup (void);

169

168

  void SinkRxNode1 (Ptr<const Packet> p, const Address &ad);

170

  void SinkRxNode1 (Ptr<const Packet> p, const Address &ad);

169

  void SinkRxNode2 (Ptr<const Packet> p, const Address &ad);

171

  void SinkRxNode2 (Ptr<const Packet> p, const Address &ad);

170

  void DropEvent (Ptr<const Packet> p);

172

  void DropEvent (Ptr<const Packet> p);

Lines 201-206	Link Here

201

  m_drops++;

203

  m_drops++;

202

204

203

205

206

207

void

208

CsmaBroadcastTestCase::DoSetup ()

209

210

  TestCase::DoSetup();

211

212

//

213

  // Set up default values for the simulation.

214

//

215

  // Select DIX/Ethernet II-style encapsulation (no LLC/Snap header)

216

  Config::SetDefault ("ns3::CsmaNetDevice::EncapsulationMode", StringValue ("Dix"));

217

218

204

//

219

//

205

// Example of the sending of a datagram to a broadcast address

220

// Example of the sending of a datagram to a broadcast address

206

//

221

//

Lines 333-344	Link Here

333

void

348

void

334

CsmaMulticastTestCase::DoRun (void)

349

CsmaMulticastTestCase::DoRun (void)

335

350

336

//

337

  // Set up default values for the simulation.

338

//

339

  // Select DIX/Ethernet II-style encapsulation (no LLC/Snap header)

340

  Config::SetDefault ("ns3::CsmaNetDevice::EncapsulationMode", StringValue ("Dix"));

341

342

  NodeContainer c;

351

  NodeContainer c;

343

  c.Create (5);

352

  c.Create (5);

344

  // We will later want two subcontainers of these nodes, for the two LANs

353

  // We will later want two subcontainers of these nodes, for the two LANs

(-)a/src/test/error-model-test-suite.cc (+3 lines)

Lines 81-86	Link Here

  // Set some arbitrary deterministic values

  // Set some arbitrary deterministic values

  SeedManager::SetSeed (7);

  SeedManager::SetSeed (7);

  SeedManager::SetRun (5);

  SeedManager::SetRun (5);

  m_count = 0;

  m_drops = 0;

  Ptr<Node> a = CreateObject<Node> ();

  Ptr<Node> a = CreateObject<Node> ();

  Ptr<Node> b = CreateObject<Node> ();

  Ptr<Node> b = CreateObject<Node> ();

(-)a/src/test/global-routing-test-suite.cc (-4 / +13 lines)

Lines 55-61	Link Here

private:

private:

  void SinkRx (std::string path, Ptr<const Packet> p, const Address &address);

  void SinkRx (std::string path, Ptr<const Packet> p, const Address &address);

  void HandleRead (Ptr<Socket>);

  void HandleRead (Ptr<Socket>);

  virtual void DoRun (void);

  virtual void DoRun (void);

  virtual void DoSetup (void);

  int m_count;

  int m_count;

  std::vector<uint8_t> m_firstInterface;

  std::vector<uint8_t> m_firstInterface;

  std::vector<uint8_t> m_secondInterface;

  std::vector<uint8_t> m_secondInterface;

Lines 118-123	Link Here

118

121

119

122

120

123

124

void

125

DynamicGlobalRoutingTestCase::DoSetup ()

126

127

  TestCase::DoSetup();

128

129

  // The below value configures the default behavior of global routing.

130

  // By default, it is disabled.  To respond to interface events, set to true

131

  Config::SetDefault ("ns3::Ipv4GlobalRouting::RespondToInterfaceEvents", BooleanValue (true));

132

133

121

// Test derived from examples/routing/dynamic-global-routing.cc

134

// Test derived from examples/routing/dynamic-global-routing.cc

122

//

135

//

123

// Network topology

136

// Network topology

Lines 140-149	Link Here

140

void

153

void

141

DynamicGlobalRoutingTestCase::DoRun (void)

154

DynamicGlobalRoutingTestCase::DoRun (void)

142

155

143

  // The below value configures the default behavior of global routing.

144

  // By default, it is disabled.  To respond to interface events, set to true

145

  Config::SetDefault ("ns3::Ipv4GlobalRouting::RespondToInterfaceEvents", BooleanValue (true));

146

147

  NodeContainer c;

156

  NodeContainer c;

148

  c.Create (7);

157

  c.Create (7);

149

  NodeContainer n0n2 = NodeContainer (c.Get (0), c.Get (2));

158

  NodeContainer n0n2 = NodeContainer (c.Get (0), c.Get (2));

(-)a/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc (-3 / +11 lines)

Lines 384-389	Link Here

384

385

private:

385

private:

386

  virtual void DoRun (void);

386

  virtual void DoRun (void);

387

  virtual void DoSetup (void);

388

387

  bool m_writeResults;

389

  bool m_writeResults;

388

390

389

  class CwndEvent {

391

  class CwndEvent {

Lines 419-429	Link Here

419

421

420

422

421

void

423

void

424

Ns3TcpCwndTestCase2::DoSetup (void)

425

426

  TestCase::DoSetup ();

427

428

  // Set up some default values for the simulation.

429

  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", UintegerValue (4));

430

431

432

void

422

Ns3TcpCwndTestCase2::DoRun (void)

433

Ns3TcpCwndTestCase2::DoRun (void)

423

434

424

  // Set up some default values for the simulation.

425

  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", UintegerValue (4));

426

427

  NodeContainer n0n1;

435

  NodeContainer n0n1;

428

  n0n1.Create (2);

436

  n0n1.Create (2);

429

437

(-)a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc (+1 lines)

Lines 128-133	Link Here

128

Ns3TcpInteroperabilityTestCase::DoTeardown (void)

128

Ns3TcpInteroperabilityTestCase::DoTeardown (void)

129

130

  m_pcapFile.Close ();

130

  m_pcapFile.Close ();

131

  TestCase::DoTeardown ();

131

132

133

void

134

void

(-)a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc (-37 / +68 lines)

Lines 115-120	Link Here

115

void

115

void

116

Ns3TcpLossTestCase::DoSetup (void)

116

Ns3TcpLossTestCase::DoSetup (void)

117

118

  Simulator::Destroy();

119

120

  // Enable packet metadata

121

  Packet::EnablePrinting ();

122

118

//

123

//

119

  // We expect there to be a file called ns3tcp-state-response-vectors.pcap in

124

  // We expect there to be a file called ns3tcp-state-response-vectors.pcap in

120

  // response-vectors/ of this directory

125

  // response-vectors/ of this directory

Lines 133-144	Link Here

133

      m_pcapFile.Open (m_pcapFilename, std::ios::in|std::ios::binary);

138

      m_pcapFile.Open (m_pcapFilename, std::ios::in|std::ios::binary);

134

      NS_ABORT_MSG_UNLESS (m_pcapFile.GetDataLinkType () == PCAP_LINK_TYPE, "Wrong response vectors in directory");

139

      NS_ABORT_MSG_UNLESS (m_pcapFile.GetDataLinkType () == PCAP_LINK_TYPE, "Wrong response vectors in directory");

135

140

141

142

  // Config

143

  std::ostringstream tcpModel;

144

  tcpModel << "ns3::Tcp" << m_tcpModel;

145

  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue (tcpModel.str ()));

146

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

147

  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));

148

149

  // Logging

150

  if (m_writeLogging)

151

152

      LogComponentEnableAll (LOG_PREFIX_FUNC);

153

      LogComponentEnable ("TcpLossResponse", LOG_LEVEL_ALL);

154

      LogComponentEnable ("ErrorModel", LOG_LEVEL_DEBUG);

155

      LogComponentEnable ("TcpLossResponse", LOG_LEVEL_ALL);

156

      LogComponentEnable ("TcpNewReno", LOG_LEVEL_INFO);

157

      LogComponentEnable ("TcpReno", LOG_LEVEL_INFO);

158

      LogComponentEnable ("TcpTahoe", LOG_LEVEL_INFO);

159

      LogComponentEnable ("TcpSocketBase", LOG_LEVEL_INFO);

160

161

136

162

137

163

138

void

164

void

139

Ns3TcpLossTestCase::DoTeardown (void)

165

Ns3TcpLossTestCase::DoTeardown (void)

140

166

167

  // Restore Logging

168

  if (m_writeLogging)

169

170

      LogComponentDisableAll (LOG_PREFIX_FUNC);

171

      LogComponentDisable ("TcpLossResponse", LOG_LEVEL_ALL);

172

      LogComponentDisable ("ErrorModel", LOG_LEVEL_DEBUG);

173

      LogComponentDisable ("TcpLossResponse", LOG_LEVEL_ALL);

174

      LogComponentDisable ("TcpNewReno", LOG_LEVEL_INFO);

175

      LogComponentDisable ("TcpReno", LOG_LEVEL_INFO);

176

      LogComponentDisable ("TcpTahoe", LOG_LEVEL_INFO);

177

      LogComponentDisable ("TcpSocketBase", LOG_LEVEL_INFO);

178

179

141

  m_pcapFile.Close ();

180

  m_pcapFile.Close ();

181

182

  // Enable packet metadata

183

  Packet::DisablePrinting ();

184

185

  TestCase::DoTeardown ();

142

186

143

187

144

void

188

void

Lines 182-203	Link Here

182

      // file and see if it still does the right thing.

226

      // file and see if it still does the right thing.

183

//

227

//

184

      uint8_t expected[PCAP_SNAPLEN];

228

      uint8_t expected[PCAP_SNAPLEN];

185

      uint32_t tsSec, tsUsec, inclLen, origLen, readLen;

229

      uint32_t tsSec=0, tsUsec=0, inclLen=0, origLen=0, readLen=0;

186

      m_pcapFile.Read (expected, sizeof(expected), tsSec, tsUsec, inclLen, origLen, readLen);

230

      m_pcapFile.Read (expected, sizeof(expected), tsSec, tsUsec, inclLen, origLen, readLen);

187

231

188

      uint8_t *actual = new uint8_t[readLen];

232

      if (readLen != 0 && origLen != 0)

189

      p->CopyData (actual, readLen);

233

234

          uint8_t *actual = new uint8_t[readLen];

235

          p->CopyData (actual, readLen);

190

236

191

      uint32_t result = memcmp (actual, expected, readLen);

237

          uint32_t result = memcmp (actual, expected, readLen);

192

238

193

      delete [] actual;

239

          delete [] actual;

194

240

195

//

241

//

196

      // Avoid streams of errors -- only report the first.

242

          // Avoid streams of errors -- only report the first.

197

//

243

//

198

      if (GetErrorStatus () == false)

244

          if (GetErrorStatus () == false)

245

246

              NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error");

247

248

249

      else if (GetErrorStatus () == false)

199

250

200

          NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error");

251

          NS_TEST_EXPECT_MSG_GT (readLen, 0, "Unexpected packet error");

201

252

202

253

203

254

Lines 282-306	Link Here

282

  // Example corresponding to simulations in the paper "Simulation-based

333

  // Example corresponding to simulations in the paper "Simulation-based

283

  // Comparisons of Tahoe, Reno, and SACK TCP

334

  // Comparisons of Tahoe, Reno, and SACK TCP

284

335

285

  std::ostringstream tcpModel;

286

  tcpModel << "ns3::Tcp" << m_tcpModel;

287

  Config::SetDefault ("ns3::TcpL4Protocol::SocketType",

288

                      StringValue (tcpModel.str ()));

289

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

290

  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));

291

292

  if (m_writeLogging)

293

294

      LogComponentEnableAll (LOG_PREFIX_FUNC);

295

      LogComponentEnable ("TcpLossResponse", LOG_LEVEL_ALL);

296

      LogComponentEnable ("ErrorModel", LOG_LEVEL_DEBUG);

297

      LogComponentEnable ("TcpLossResponse", LOG_LEVEL_ALL);

298

      LogComponentEnable ("TcpNewReno", LOG_LEVEL_INFO);

299

      LogComponentEnable ("TcpReno", LOG_LEVEL_INFO);

300

      LogComponentEnable ("TcpTahoe", LOG_LEVEL_INFO);

301

      LogComponentEnable ("TcpSocketBase", LOG_LEVEL_INFO);

302

303

304

  ////////////////////////////////////////////////////////

336

  ////////////////////////////////////////////////////////

305

  // Topology construction

337

  // Topology construction

306

//

338

//

Lines 359-371	Link Here

359

                          ipInterfs.GetAddress (1),

391

                          ipInterfs.GetAddress (1),

360

                          servPort);

392

                          servPort);

361

393

362

  Config::Connect ("/NodeList/0/$ns3::Ipv4L3Protocol/Tx",

363

                   MakeCallback (&Ns3TcpLossTestCase::Ipv4L3Tx, this));

364

365

  Config::ConnectWithoutContext

366

    ("/NodeList/0/$ns3::TcpL4Protocol/SocketList/0/CongestionWindow",

367

    MakeCallback (&Ns3TcpLossTestCase::CwndTracer, this));

368

369

  ////////////////////////////////////////////////////////

394

  ////////////////////////////////////////////////////////

370

  // Set up loss model at node k1

395

  // Set up loss model at node k1

371

//

396

//

Lines 403-408	Link Here

403

  pem->SetList (sampleList);

428

  pem->SetList (sampleList);

404

  dev1.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

429

  dev1.Get (1)->SetAttribute ("ReceiveErrorModel", PointerValue (pem));

405

430

431

  Config::Connect ("/NodeList/0/$ns3::Ipv4L3Protocol/Tx",

432

                   MakeCallback (&Ns3TcpLossTestCase::Ipv4L3Tx, this));

433

434

  Config::ConnectWithoutContext

435

    ("/NodeList/0/$ns3::TcpL4Protocol/SocketList/0/CongestionWindow",

436

    MakeCallback (&Ns3TcpLossTestCase::CwndTracer, this));

437

406

  // One can toggle the comment for the following line on or off to see the

438

  // One can toggle the comment for the following line on or off to see the

407

  // effects of finite send buffer modelling.  One can also change the size of

439

  // effects of finite send buffer modelling.  One can also change the size of

408

  // that buffer.

440

  // that buffer.

Lines 442-448	Link Here

442

Ns3TcpLossTestSuite::Ns3TcpLossTestSuite ()

474

Ns3TcpLossTestSuite::Ns3TcpLossTestSuite ()

443

  : TestSuite ("ns3-tcp-loss", SYSTEM)

475

  : TestSuite ("ns3-tcp-loss", SYSTEM)

444

476

445

  Packet::EnablePrinting ();  // Enable packet metadata for all test cases

446

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0));

477

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 0));

447

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1));

478

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 1));

448

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2));

479

  AddTestCase (new Ns3TcpLossTestCase ("Tahoe", 2));

(-)a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc (-2 / +9 lines)

Lines 158-163	Link Here

158

159

private:

159

private:

160

  virtual void DoRun (void);

160

  virtual void DoRun (void);

161

  virtual void DoSetup (void);

162

161

  bool m_writeResults;

163

  bool m_writeResults;

162

164

163

  void SinkRx (std::string path, Ptr<const Packet> p, const Address &address);

165

  void SinkRx (std::string path, Ptr<const Packet> p, const Address &address);

Lines 179-184	Link Here

179

181

180

182

181

void

183

void

184

Ns3TcpSocketTestCase2::DoSetup (void)

185

186

  TestCase::DoSetup ();

187

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

188

189

190

void

182

Ns3TcpSocketTestCase2::DoRun (void)

191

Ns3TcpSocketTestCase2::DoRun (void)

183

192

184

  uint16_t sinkPort = 50000;

193

  uint16_t sinkPort = 50000;

Lines 189-196	Link Here

189

  Time writerStopTimeObj = Seconds (writerStopTime);

198

  Time writerStopTimeObj = Seconds (writerStopTime);

190

  Time simStopTimeObj= Seconds (simStopTime);

199

  Time simStopTimeObj= Seconds (simStopTime);

191

200

192

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

193

194

  NodeContainer nodes;

201

  NodeContainer nodes;

195

  nodes.Create (2);

202

  nodes.Create (2);

196

  Ptr<Node> n0 = nodes.Get (0);

203

  Ptr<Node> n0 = nodes.Get (0);

(-)a/src/test/ns3tcp/ns3tcp-state-test-suite.cc (-37 / +65 lines)

Lines 110-115	Link Here

110

void

110

void

111

Ns3TcpStateTestCase::DoSetup (void)

111

Ns3TcpStateTestCase::DoSetup (void)

112

113

  Simulator::Destroy();

114

115

  // Enable packet metadata

116

  Packet::EnablePrinting ();

117

113

//

118

//

114

  // We expect there to be a file called ns3tcp-state-response-vectors.pcap in

119

  // We expect there to be a file called ns3tcp-state-response-vectors.pcap in

115

  // response-vectors/ of this directory

120

  // response-vectors/ of this directory

Lines 128-139	Link Here

128

      m_pcapFile.Open (m_pcapFilename, std::ios::in|std::ios::binary);

133

      m_pcapFile.Open (m_pcapFilename, std::ios::in|std::ios::binary);

129

      NS_ABORT_MSG_UNLESS (m_pcapFile.GetDataLinkType () == PCAP_LINK_TYPE, "Wrong response vectors in directory");

134

      NS_ABORT_MSG_UNLESS (m_pcapFile.GetDataLinkType () == PCAP_LINK_TYPE, "Wrong response vectors in directory");

130

135

136

137

  // Config

138

  std::string tcpModel ("ns3::TcpNewReno");

139

  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue (tcpModel));

140

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

141

  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));

142

  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", UintegerValue (20));

143

144

  // Logging

145

  if (m_writeLogging)

146

147

      LogComponentEnableAll (LOG_PREFIX_FUNC);

148

      LogComponentEnable ("TcpTestCases", LOG_LEVEL_ALL);

149

      LogComponentEnable ("ErrorModel", LOG_LEVEL_DEBUG);

150

      LogComponentEnable ("TcpTestCases", LOG_LEVEL_ALL);

151

      LogComponentEnable ("TcpNewReno", LOG_LEVEL_INFO);

152

      LogComponentEnable ("TcpReno", LOG_LEVEL_INFO);

153

      LogComponentEnable ("TcpTahoe", LOG_LEVEL_INFO);

154

      LogComponentEnable ("TcpSocketBase", LOG_LEVEL_INFO);

155

131

156

132

157

133

void

158

void

134

Ns3TcpStateTestCase::DoTeardown (void)

159

Ns3TcpStateTestCase::DoTeardown (void)

135

160

161

  // Restore Logging

162

  if (m_writeLogging)

163

164

      LogComponentDisableAll (LOG_PREFIX_FUNC);

165

      LogComponentDisable ("TcpTestCases", LOG_LEVEL_ALL);

166

      LogComponentDisable ("ErrorModel", LOG_LEVEL_DEBUG);

167

      LogComponentDisable ("TcpTestCases", LOG_LEVEL_ALL);

168

      LogComponentDisable ("TcpNewReno", LOG_LEVEL_INFO);

169

      LogComponentDisable ("TcpReno", LOG_LEVEL_INFO);

170

      LogComponentDisable ("TcpTahoe", LOG_LEVEL_INFO);

171

      LogComponentDisable ("TcpSocketBase", LOG_LEVEL_INFO);

172

173

136

  m_pcapFile.Close ();

174

  m_pcapFile.Close ();

175

176

  // Enable packet metadata

177

  Packet::DisablePrinting ();

178

179

  TestCase::DoTeardown ();

137

180

138

181

139

void

182

void

Lines 177-198	Link Here

177

      // file and see if it still does the right thing.

220

      // file and see if it still does the right thing.

178

//

221

//

179

      uint8_t expected[PCAP_SNAPLEN];

222

      uint8_t expected[PCAP_SNAPLEN];

180

      uint32_t tsSec, tsUsec, inclLen, origLen, readLen;

223

      uint32_t tsSec=0, tsUsec=0, inclLen=0, origLen=0, readLen=0;

181

      m_pcapFile.Read (expected, sizeof(expected), tsSec, tsUsec, inclLen, origLen, readLen);

224

      m_pcapFile.Read (expected, sizeof(expected), tsSec, tsUsec, inclLen, origLen, readLen);

225

226

      if (readLen != 0 && origLen != 0)

227

228

          uint8_t *actual = new uint8_t[readLen];

229

          p->CopyData (actual, readLen);

182

230

183

      uint8_t *actual = new uint8_t[readLen];

231

          uint32_t result = memcmp (actual, expected, readLen);

184

      p->CopyData (actual, readLen);

185

232

186

      uint32_t result = memcmp (actual, expected, readLen);

233

          delete [] actual;

187

234

188

      delete [] actual;

235

//

189

236

          // Avoid streams of errors -- only report the first.

190

//

237

//

191

      // Avoid streams of errors -- only report the first.

238

          if (GetErrorStatus () == false)

192

//

239

193

      if (GetErrorStatus () == false)

240

              NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error");

241

242

243

      else if (GetErrorStatus () == false)

194

244

195

          NS_TEST_EXPECT_MSG_EQ (result, 0, "Expected data comparison error");

245

          NS_TEST_EXPECT_MSG_GT (readLen, 0, "Unexpected packet error");

196

246

197

247

198

248

Lines 266-294	Link Here

266

  //           10Mb/s, 0.1ms      10Mb/s, 0.1ms

316

  //           10Mb/s, 0.1ms      10Mb/s, 0.1ms

267

  //       n0-----------------n1-----------------n2

317

  //       n0-----------------n1-----------------n2

268

318

269

  std::string tcpModel ("ns3::TcpNewReno");

270

271

  Config::SetDefault ("ns3::TcpL4Protocol::SocketType", StringValue (tcpModel));

272

  Config::SetDefault ("ns3::TcpSocket::SegmentSize", UintegerValue (1000));

273

  Config::SetDefault ("ns3::TcpSocket::DelAckCount", UintegerValue (1));

274

  Config::SetDefault ("ns3::DropTailQueue::MaxPackets", UintegerValue (20));

275

276

  if (m_writeLogging)

277

278

      LogComponentEnableAll (LOG_PREFIX_FUNC);

279

      LogComponentEnable ("TcpTestCases", LOG_LEVEL_ALL);

280

      LogComponentEnable ("ErrorModel", LOG_LEVEL_DEBUG);

281

      LogComponentEnable ("TcpTestCases", LOG_LEVEL_ALL);

282

      LogComponentEnable ("TcpNewReno", LOG_LEVEL_INFO);

283

      LogComponentEnable ("TcpReno", LOG_LEVEL_INFO);

284

      LogComponentEnable ("TcpTahoe", LOG_LEVEL_INFO);

285

      LogComponentEnable ("TcpSocketBase", LOG_LEVEL_INFO);

286

287

288

  ////////////////////////////////////////////////////////

319

  ////////////////////////////////////////////////////////

289

  // Topology construction

320

  // Topology construction

290

//

321

//

291

322

292

  // Create three nodes

323

  // Create three nodes

293

  NodeContainer n0n1;

324

  NodeContainer n0n1;

294

  n0n1.Create (2);

325

  n0n1.Create (2);

Lines 338-346	Link Here

338

  Simulator::ScheduleNow (&Ns3TcpStateTestCase::StartFlow, this,

369

  Simulator::ScheduleNow (&Ns3TcpStateTestCase::StartFlow, this,

339

                          localSocket, ipInterfs.GetAddress (1), servPort);

370

                          localSocket, ipInterfs.GetAddress (1), servPort);

340

371

341

  Config::Connect ("/NodeList/0/$ns3::Ipv4L3Protocol/Tx",

342

                   MakeCallback (&Ns3TcpStateTestCase::Ipv4L3Tx, this));

343

344

  ////////////////////////////////////////////////////////

372

  ////////////////////////////////////////////////////////

345

  // Set up different test cases: Lost model at node n1, different file size

373

  // Set up different test cases: Lost model at node n1, different file size

346

//

374

//

Lines 411-416	Link Here

411

  errN1->SetList (dropListN1);

439

  errN1->SetList (dropListN1);

412

  dev1.Get (0)->SetAttribute ("ReceiveErrorModel", PointerValue (errN1));

440

  dev1.Get (0)->SetAttribute ("ReceiveErrorModel", PointerValue (errN1));

413

441

442

  Config::Connect ("/NodeList/0/$ns3::Ipv4L3Protocol/Tx",

443

                   MakeCallback (&Ns3TcpStateTestCase::Ipv4L3Tx, this));

444

414

  std::ostringstream oss;

445

  std::ostringstream oss;

415

  oss << "tcp-state" << m_testCase << "-test-case";

446

  oss << "tcp-state" << m_testCase << "-test-case";

416

  if (m_writeResults)

447

  if (m_writeResults)

Lines 434-441	Link Here

434

  Simulator::Stop (Seconds (1000));

465

  Simulator::Stop (Seconds (1000));

435

  Simulator::Run ();

466

  Simulator::Run ();

436

  Simulator::Destroy ();

467

  Simulator::Destroy ();

437

438

439

468

440

469

441

class Ns3TcpStateTestSuite : public TestSuite

470

class Ns3TcpStateTestSuite : public TestSuite

Lines 447-453	Link Here

447

Ns3TcpStateTestSuite::Ns3TcpStateTestSuite ()

476

Ns3TcpStateTestSuite::Ns3TcpStateTestSuite ()

448

  : TestSuite ("ns3-tcp-state", SYSTEM)

477

  : TestSuite ("ns3-tcp-state", SYSTEM)

449

478

450

  Packet::EnablePrinting ();  // Enable packet metadata for all test cases

451

  AddTestCase (new Ns3TcpStateTestCase (0));

479

  AddTestCase (new Ns3TcpStateTestCase (0));

452

  AddTestCase (new Ns3TcpStateTestCase (1));

480

  AddTestCase (new Ns3TcpStateTestCase (1));

453

  AddTestCase (new Ns3TcpStateTestCase (2));

481

  AddTestCase (new Ns3TcpStateTestCase (2));

(-)a/src/test/ns3wifi/wifi-interference-test-suite.cc (-13 / +21 lines)

Lines 57-62	Link Here

private:

private:

  virtual void DoRun (void);

  virtual void DoRun (void);

  virtual void DoSetup (void);

  void ReceivePacket (Ptr<Socket> socket);

  void ReceivePacket (Ptr<Socket> socket);

  static void GenerateTraffic (Ptr<Socket> socket, uint32_t pktSize, uint32_t pktCount, Time pktInterval);

  static void GenerateTraffic (Ptr<Socket> socket, uint32_t pktSize, uint32_t pktCount, Time pktInterval);

  void PrintEndSync (std::string context, uint32_t dataRate, double snr, double per);

  void PrintEndSync (std::string context, uint32_t dataRate, double snr, double per);

Lines 65-75	Link Here

  double m_PER;

  double m_PER;

  double m_SNR;

  double m_SNR;

  uint32_t m_DataRate;

  uint32_t m_DataRate;

  std::string m_phyMode;

};

};

// Add some help text to this case to describe what it is intended to test

// Add some help text to this case to describe what it is intended to test

WifiInterferenceTestCase::WifiInterferenceTestCase  ()

WifiInterferenceTestCase::WifiInterferenceTestCase  ()

  : TestCase ("Test interference calculation when interfering frame exactly overlaps intended frame")

  : TestCase ("Test interference calculation when interfering frame exactly overlaps intended frame")

  , m_phyMode ("DsssRate1Mbps")

Lines 77-82	Link Here

void

WifiInterferenceTestCase::DoSetup ()

  TestCase::DoSetup ();

  // disable fragmentation for frames below 2200 bytes

  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200"));

  // turn off RTS/CTS for frames below 2200 bytes

  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200"));

  // Fix non-unicast data rate to be the same as that of unicast

  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode", StringValue (m_phyMode));

void

void

WifiInterferenceTestCase::ReceivePacket (Ptr<Socket> socket)

WifiInterferenceTestCase::ReceivePacket (Ptr<Socket> socket)

100

Lines 131-144	Link Here

131

  // Convert to time object

149

  // Convert to time object

132

  Time interPacketInterval = Seconds (interval);

150

  Time interPacketInterval = Seconds (interval);

133

151

134

  // disable fragmentation for frames below 2200 bytes

135

  Config::SetDefault ("ns3::WifiRemoteStationManager::FragmentationThreshold", StringValue ("2200"));

136

  // turn off RTS/CTS for frames below 2200 bytes

137

  Config::SetDefault ("ns3::WifiRemoteStationManager::RtsCtsThreshold", StringValue ("2200"));

138

  // Fix non-unicast data rate to be the same as that of unicast

139

  Config::SetDefault ("ns3::WifiRemoteStationManager::NonUnicastMode",

140

                      StringValue (phyMode));

141

142

  NodeContainer c;

152

  NodeContainer c;

143

  c.Create (3);

153

  c.Create (3);

144

154

Lines 232-239	Link Here

232

void

242

void

233

WifiInterferenceTestCase::DoRun (void)

243

WifiInterferenceTestCase::DoRun (void)

234

244

235

236

  std::string phyMode ("DsssRate1Mbps");

237

  double Prss = -90;  // -dBm

245

  double Prss = -90;  // -dBm

238

  double Irss = -90;  // -dBm

246

  double Irss = -90;  // -dBm

239

  double delta = 0;  // microseconds

247

  double delta = 0;  // microseconds

Lines 246-262	Link Here

246

  // Compute the packet error rate (PER) when delta=0 microseconds.  This

254

  // Compute the packet error rate (PER) when delta=0 microseconds.  This

247

  // means that the interferer arrives at exactly the same time as the

255

  // means that the interferer arrives at exactly the same time as the

248

  // intended packet

256

  // intended packet

249

  PER = WifiSimpleInterference (phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

257

  PER = WifiSimpleInterference (m_phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

250

258

251

  // Now rerun this test case and compute the PER when the delta time between

259

  // Now rerun this test case and compute the PER when the delta time between

252

  // arrival of the intended frame and interferer is 1 microsecond.

260

  // arrival of the intended frame and interferer is 1 microsecond.

253

  delta = 1;

261

  delta = 1;

254

  PER1 = WifiSimpleInterference (phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

262

  PER1 = WifiSimpleInterference (m_phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

255

263

256

  // Now rerun this test case and compute the PER when the delta time between

264

  // Now rerun this test case and compute the PER when the delta time between

257

  // arrival of the intended frame and interferer is 2 microseconds.

265

  // arrival of the intended frame and interferer is 2 microseconds.

258

  delta = 2;

266

  delta = 2;

259

  PER2 = WifiSimpleInterference (phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

267

  PER2 = WifiSimpleInterference (m_phyMode,Prss,Irss,delta,PpacketSize,IpacketSize,verbose,internet);

260

268

261

  double PERDiff1 = PER - PER1;

269

  double PERDiff1 = PER - PER1;

262

270

Return to bug 1192