Attachment #1201 for bug #1192

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




  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

(-)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/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

Return to bug 1192