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

(-)a/src/wifi/model/edca-txop-n.cc (+9 lines)
 Lines 253-258    Link Here 
253
                     "Trace source for contention window values",
253
                     "Trace source for contention window values",
254
                     MakeTraceSourceAccessor (&EdcaTxopN::m_cwTrace),
254
                     MakeTraceSourceAccessor (&EdcaTxopN::m_cwTrace),
255
                     "ns3::TracedValue::Uint32Callback")
255
                     "ns3::TracedValue::Uint32Callback")
256
    .AddTraceSource ("TxopTrace",
257
                     "Trace source for txop start and stop times",
258
                     MakeTraceSourceAccessor (&EdcaTxopN::m_txopTrace),
259
                     "ns3::TracedValueCallback::Time")
256
  ;
260
  ;
257
  return tid;
261
  return tid;
258
}
262
}
 Lines 1240-1245    Link Here 
1240
                                                                 &tstamp);
1244
                                                                 &tstamp);
1241
  if (peekedPacket == 0)
1245
  if (peekedPacket == 0)
1242
    {
1246
    {
1247
      m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
1243
      return;
1248
      return;
1244
    }
1249
    }
1245
    
1250
    
 Lines 1273-1278    Link Here 
1273
                                                         m_currentHdr.GetAddr1 ());
1278
                                                         m_currentHdr.GetAddr1 ());
1274
      Low ()->StartTransmission (m_currentPacket, &m_currentHdr, params, m_transmissionListener);
1279
      Low ()->StartTransmission (m_currentPacket, &m_currentHdr, params, m_transmissionListener);
1275
    }
1280
    }
1281
  else
1282
    {
1283
      m_txopTrace (m_startTxop, Simulator::Now () - m_startTxop);
1284
    }
1276
}
1285
}
1277
1286
1278
Time
1287
Time
(-)a/src/wifi/model/edca-txop-n.h (+1 lines)
 Lines 590-595    Link Here 
590
  bool m_isAccessRequestedForRts;
590
  bool m_isAccessRequestedForRts;
591
  TracedValue<uint32_t> m_backoffTrace;
591
  TracedValue<uint32_t> m_backoffTrace;
592
  TracedValue<uint32_t> m_cwTrace;
592
  TracedValue<uint32_t> m_cwTrace;
593
  TracedCallback<Time, Time> m_txopTrace;
593
};
594
};
594
595
595
} //namespace ns3
596
} //namespace ns3

Return to bug 2463