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

(-)a/src/core/model/attribute-helper.h (-1 / +1 lines)
 Lines 55-61    Link Here 
55 
 * Because these macros generate class and function definitions, it's
 55 
 * Because these macros generate class and function definitions, it's
56 
 * difficult to document the results directly.  Instead, we use a
 56 
 * difficult to document the results directly.  Instead, we use a
57 
 * set of functions in print-introspected-doxygen.cc to generate
 57 
 * set of functions in print-introspected-doxygen.cc to generate
58 
 * most of the APi documentation.  When using these macros,
 58 
 * most of the API documentation.  When using these macros,
59 
 * please add the required function calls to print-introspected-doxygen.cc
 59 
 * please add the required function calls to print-introspected-doxygen.cc
60 
 * so your new API is documented.
 60 
 * so your new API is documented.
61 
 */
 61 
 */
(-)a/src/core/model/type-id.cc (+6 lines)
 Lines 610-615    Link Here 
610 
{
 610 
{
611 
  NS_LOG_FUNCTION (this << uid << name << help << flags << initialValue << accessor << checker);
 611 
  NS_LOG_FUNCTION (this << uid << name << help << flags << initialValue << accessor << checker);
612 
  struct IidInformation *information = LookupInformation (uid);
 612 
  struct IidInformation *information = LookupInformation (uid);
613 
  if (name.find (' ') != std::string::npos)
614 
    {
615 
      NS_FATAL_ERROR ("Attribute name \"" << name << "\" may not contain spaces ' ', "
616 
                      << "encountered when registering TypeId \""
617 
                      << information->name << "\"");
618 
    }
613 
  if (HasAttribute (uid, name))
 619 
  if (HasAttribute (uid, name))
614 
    {
 620 
    {
615 
      NS_FATAL_ERROR ("Attribute \"" << name << "\" already registered on tid=\"" <<
621 
      NS_FATAL_ERROR ("Attribute \"" << name << "\" already registered on tid=\"" <<
(-)a/src/internet/model/ipv6-extension.cc (-1 / +1 lines)
 Lines 832-838    Link Here 
832 
  static TypeId tid = TypeId ("ns3::Ipv6ExtensionRoutingDemux")
 832 
  static TypeId tid = TypeId ("ns3::Ipv6ExtensionRoutingDemux")
833 
    .SetParent<Object> ()
 833 
    .SetParent<Object> ()
834 
    .SetGroupName ("Internet")
 834 
    .SetGroupName ("Internet")
835 
    .AddAttribute ("Routing Extensions", "The set of IPv6 Routing extensions registered with this demux.",
 835 
    .AddAttribute ("RoutingExtensions", "The set of IPv6 Routing extensions registered with this demux.",
836 
                   ObjectVectorValue (),
 836 
                   ObjectVectorValue (),
837 
                   MakeObjectVectorAccessor (&Ipv6ExtensionRoutingDemux::m_extensionsRouting),
 837 
                   MakeObjectVectorAccessor (&Ipv6ExtensionRoutingDemux::m_extensionsRouting),
838 
                   MakeObjectVectorChecker<Ipv6ExtensionRouting> ())
 838 
                   MakeObjectVectorChecker<Ipv6ExtensionRouting> ())
(-)a/src/traffic-control/model/fq-codel-queue-disc.cc (-1 / +1 lines)
 Lines 105-111    Link Here 
105 
                   StringValue ("5ms"),
 105 
                   StringValue ("5ms"),
106 
                   MakeStringAccessor (&FqCoDelQueueDisc::m_target),
 106 
                   MakeStringAccessor (&FqCoDelQueueDisc::m_target),
107 
                   MakeStringChecker ())
 107 
                   MakeStringChecker ())
108 
    .AddAttribute ("Packet limit",
 108 
    .AddAttribute ("PacketLimit",
109 
                   "The hard limit on the real queue size, measured in packets",
 109 
                   "The hard limit on the real queue size, measured in packets",
110 
                   UintegerValue (10 * 1024),
 110 
                   UintegerValue (10 * 1024),
111 
                   MakeUintegerAccessor (&FqCoDelQueueDisc::m_limit),
 111 
                   MakeUintegerAccessor (&FqCoDelQueueDisc::m_limit),
(-)a/src/wifi/model/ampdu-tag.cc (-1 / +1 lines)
 Lines 34-40    Link Here 
34 
    .SetParent<Tag> ()
 34 
    .SetParent<Tag> ()
35 
    .SetGroupName ("Wifi")
 35 
    .SetGroupName ("Wifi")
36 
    .AddConstructor<AmpduTag> ()
 36 
    .AddConstructor<AmpduTag> ()
37 
    .AddAttribute ("Ampdu Exists", "The value that indicates that the packet contains an AMPDU",
 37 
    .AddAttribute ("AmpduExists", "The value that indicates that the packet contains an AMPDU",
38 
                   UintegerValue (false),
 38 
                   UintegerValue (false),
39 
                   MakeUintegerAccessor (&AmpduTag::GetAmpdu),
 39 
                   MakeUintegerAccessor (&AmpduTag::GetAmpdu),
40 
                   MakeUintegerChecker<uint8_t> ())
 40 
                   MakeUintegerChecker<uint8_t> ())
(-)a/src/wifi/model/aparf-wifi-manager.cc (-6 / +6 lines)
 Lines 62-73    Link Here 
62 
    .SetParent<WifiRemoteStationManager> ()
 62 
    .SetParent<WifiRemoteStationManager> ()
63 
    .SetGroupName ("Wifi")
 63 
    .SetGroupName ("Wifi")
64 
    .AddConstructor<AparfWifiManager> ()
 64 
    .AddConstructor<AparfWifiManager> ()
65 
    .AddAttribute ("SuccessThreshold 1",
 65 
    .AddAttribute ("SuccessThreshold1",
66 
                   "The minimum number of successful transmissions in \"High\" state to try a new power or rate.",
 66 
                   "The minimum number of successful transmissions in \"High\" state to try a new power or rate.",
67 
                   UintegerValue (3),
 67 
                   UintegerValue (3),
68 
                   MakeUintegerAccessor (&AparfWifiManager::m_succesMax1),
 68 
                   MakeUintegerAccessor (&AparfWifiManager::m_succesMax1),
69 
                   MakeUintegerChecker<uint32_t> ())
 69 
                   MakeUintegerChecker<uint32_t> ())
70 
    .AddAttribute ("SuccessThreshold 2",
 70 
    .AddAttribute ("SuccessThreshold2",
71 
                   "The minimum number of successful transmissions in \"Low\" state to try a new power or rate.",
 71 
                   "The minimum number of successful transmissions in \"Low\" state to try a new power or rate.",
72 
                   UintegerValue (10),
 72 
                   UintegerValue (10),
73 
                   MakeUintegerAccessor (&AparfWifiManager::m_succesMax2),
 73 
                   MakeUintegerAccessor (&AparfWifiManager::m_succesMax2),
 Lines 82-103    Link Here 
82 
                   UintegerValue (10),
 82 
                   UintegerValue (10),
83 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerMax),
 83 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerMax),
84 
                   MakeUintegerChecker<uint32_t> ())
 84 
                   MakeUintegerChecker<uint32_t> ())
85 
    .AddAttribute ("Power decrement step",
 85 
    .AddAttribute ("PowerDecrementStep",
86 
                   "Step size for decrement the power.",
 86 
                   "Step size for decrement the power.",
87 
                   UintegerValue (1),
 87 
                   UintegerValue (1),
88 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerDec),
 88 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerDec),
89 
                   MakeUintegerChecker<uint32_t> ())
 89 
                   MakeUintegerChecker<uint32_t> ())
90 
    .AddAttribute ("Power increment step",
 90 
    .AddAttribute ("PowerIncrementStep",
91 
                   "Step size for increment the power.",
 91 
                   "Step size for increment the power.",
92 
                   UintegerValue (1),
 92 
                   UintegerValue (1),
93 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerInc),
 93 
                   MakeUintegerAccessor (&AparfWifiManager::m_powerInc),
94 
                   MakeUintegerChecker<uint32_t> ())
 94 
                   MakeUintegerChecker<uint32_t> ())
95 
    .AddAttribute ("Rate decrement step",
 95 
    .AddAttribute ("RateDecrementStep",
96 
                   "Step size for decrement the rate.",
 96 
                   "Step size for decrement the rate.",
97 
                   UintegerValue (1),
 97 
                   UintegerValue (1),
98 
                   MakeUintegerAccessor (&AparfWifiManager::m_rateDec),
 98 
                   MakeUintegerAccessor (&AparfWifiManager::m_rateDec),
99 
                   MakeUintegerChecker<uint32_t> ())
 99 
                   MakeUintegerChecker<uint32_t> ())
100 
    .AddAttribute ("Rate increment step",
 100 
    .AddAttribute ("RateIncrementStep",
101 
                   "Step size for increment the rate.",
 101 
                   "Step size for increment the rate.",
102 
                   UintegerValue (1),
 102 
                   UintegerValue (1),
103 
                   MakeUintegerAccessor (&AparfWifiManager::m_rateInc),
 103 
                   MakeUintegerAccessor (&AparfWifiManager::m_rateInc),
(-)a/src/wifi/test/power-rate-adaptation-test.cc (-2 / +2 lines)
 Lines 348-355    Link Here 
348 
  /*
 348 
  /*
349 
   * Configure thresholds for rate and power control.
 349 
   * Configure thresholds for rate and power control.
350 
   */
 350 
   */
351 
  manager->SetAttribute ("SuccessThreshold 1",UintegerValue (3));
 351 
  manager->SetAttribute ("SuccessThreshold1",UintegerValue (3));
352 
  manager->SetAttribute ("SuccessThreshold 2",UintegerValue (10));
 352 
  manager->SetAttribute ("SuccessThreshold2",UintegerValue (10));
353 
  manager->SetAttribute ("FailThreshold",UintegerValue (1));
 353 
  manager->SetAttribute ("FailThreshold",UintegerValue (1));
354 
  manager->SetAttribute ("PowerThreshold",UintegerValue (10));
 354 
  manager->SetAttribute ("PowerThreshold",UintegerValue (10));
355 

          355
          

        






  

  Return to bug 2344