OLD | NEW |
1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC) | 3 * Copyright (c) 2012 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC) |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 | 185 |
186 void· | 186 void· |
187 RadioBearerStatsConnector::NotifyConnectionReconfigurationUe (RadioBearerStatsCo
nnector* c, std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) | 187 RadioBearerStatsConnector::NotifyConnectionReconfigurationUe (RadioBearerStatsCo
nnector* c, std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) |
188 { | 188 { |
189 c->ConnectTracesUeIfFirstTime (context, imsi, cellId, rnti); | 189 c->ConnectTracesUeIfFirstTime (context, imsi, cellId, rnti); |
190 } | 190 } |
191 | 191 |
192 void· | 192 void· |
193 RadioBearerStatsConnector::NotifyHandoverStartUe (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti, uint16_t tar
getCellId) | 193 RadioBearerStatsConnector::NotifyHandoverStartUe (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti, uint16_t tar
getCellId) |
194 { | 194 { |
| 195 NS_UNUSED(targetCellId); |
195 c->DisconnectTracesUe (context, imsi, cellId, rnti); | 196 c->DisconnectTracesUe (context, imsi, cellId, rnti); |
196 } | 197 } |
197 | 198 |
198 void· | 199 void· |
199 RadioBearerStatsConnector::NotifyHandoverEndOkUe (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) | 200 RadioBearerStatsConnector::NotifyHandoverEndOkUe (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) |
200 { | 201 { |
201 c->ConnectTracesUe (context, imsi, cellId, rnti); | 202 c->ConnectTracesUe (context, imsi, cellId, rnti); |
202 } | 203 } |
203 | 204 |
204 void· | 205 void· |
205 RadioBearerStatsConnector::NotifyNewUeContextEnb (RadioBearerStatsConnector* c,
std::string context, uint16_t cellId, uint16_t rnti) | 206 RadioBearerStatsConnector::NotifyNewUeContextEnb (RadioBearerStatsConnector* c,
std::string context, uint16_t cellId, uint16_t rnti) |
206 { | 207 { |
207 c->StoreUeManagerPath (context, cellId, rnti); | 208 c->StoreUeManagerPath (context, cellId, rnti); |
208 } | 209 } |
209 | 210 |
210 void· | 211 void· |
211 RadioBearerStatsConnector::NotifyConnectionReconfigurationEnb (RadioBearerStatsC
onnector* c, std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) | 212 RadioBearerStatsConnector::NotifyConnectionReconfigurationEnb (RadioBearerStatsC
onnector* c, std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) |
212 { | 213 { |
213 c->ConnectTracesEnbIfFirstTime (context, imsi, cellId, rnti); | 214 c->ConnectTracesEnbIfFirstTime (context, imsi, cellId, rnti); |
214 } | 215 } |
215 | 216 |
216 void· | 217 void· |
217 RadioBearerStatsConnector::NotifyHandoverStartEnb (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti, uint16_t ta
rgetCellId) | 218 RadioBearerStatsConnector::NotifyHandoverStartEnb (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti, uint16_t ta
rgetCellId) |
218 { | 219 { |
| 220 NS_UNUSED(targetCellId); |
219 c->DisconnectTracesEnb (context, imsi, cellId, rnti); | 221 c->DisconnectTracesEnb (context, imsi, cellId, rnti); |
220 } | 222 } |
221 | 223 |
222 void· | 224 void· |
223 RadioBearerStatsConnector::NotifyHandoverEndOkEnb (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) | 225 RadioBearerStatsConnector::NotifyHandoverEndOkEnb (RadioBearerStatsConnector* c,
std::string context, uint64_t imsi, uint16_t cellId, uint16_t rnti) |
224 { | 226 { |
225 c->ConnectTracesEnb (context, imsi, cellId, rnti); | 227 c->ConnectTracesEnb (context, imsi, cellId, rnti); |
226 } | 228 } |
227 | 229 |
228 void· | 230 void· |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 if (m_imsiSeenEnb.find (imsi) == m_imsiSeenEnb.end ()) | 347 if (m_imsiSeenEnb.find (imsi) == m_imsiSeenEnb.end ()) |
346 { | 348 { |
347 m_imsiSeenEnb.insert (imsi); | 349 m_imsiSeenEnb.insert (imsi); |
348 ConnectTracesEnb (context, imsi, cellId, rnti); | 350 ConnectTracesEnb (context, imsi, cellId, rnti); |
349 } | 351 } |
350 } | 352 } |
351 | 353 |
352 void· | 354 void· |
353 RadioBearerStatsConnector::ConnectTracesUe (std::string context, uint64_t imsi,
uint16_t cellId, uint16_t rnti) | 355 RadioBearerStatsConnector::ConnectTracesUe (std::string context, uint64_t imsi,
uint16_t cellId, uint16_t rnti) |
354 { | 356 { |
| 357 NS_UNUSED(rnti); |
355 NS_LOG_FUNCTION (this << context); | 358 NS_LOG_FUNCTION (this << context); |
356 NS_LOG_LOGIC (this << "expected context should match /NodeList/*/DeviceList/*/
LteUeRrc/"); | 359 NS_LOG_LOGIC (this << "expected context should match /NodeList/*/DeviceList/*/
LteUeRrc/"); |
357 std::string basePath = context.substr (0, context.rfind ("/")); | 360 std::string basePath = context.substr (0, context.rfind ("/")); |
358 if (m_rlcStats) | 361 if (m_rlcStats) |
359 { | 362 { |
360 Ptr<BoundCallbackArgument> arg = Create<BoundCallbackArgument> (); | 363 Ptr<BoundCallbackArgument> arg = Create<BoundCallbackArgument> (); |
361 arg->imsi = imsi; | 364 arg->imsi = imsi; |
362 arg->cellId = cellId;· | 365 arg->cellId = cellId;· |
363 arg->stats = m_rlcStats; | 366 arg->stats = m_rlcStats; |
364 Config::Connect (basePath + "/DataRadioBearerMap/*/LteRlc/TxPDU", | 367 Config::Connect (basePath + "/DataRadioBearerMap/*/LteRlc/TxPDU", |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 MakeBoundCallback (&DlTxPduCallback, arg)); | 431 MakeBoundCallback (&DlTxPduCallback, arg)); |
429 Config::Connect (basePath.str () + "/Srb1/LtePdcp/RxPDU", | 432 Config::Connect (basePath.str () + "/Srb1/LtePdcp/RxPDU", |
430 MakeBoundCallback (&UlRxPduCallback, arg)); | 433 MakeBoundCallback (&UlRxPduCallback, arg)); |
431 } | 434 } |
432 } | 435 } |
433 | 436 |
434 void· | 437 void· |
435 RadioBearerStatsConnector::DisconnectTracesUe (std::string context, uint64_t ims
i, uint16_t cellId, uint16_t rnti) | 438 RadioBearerStatsConnector::DisconnectTracesUe (std::string context, uint64_t ims
i, uint16_t cellId, uint16_t rnti) |
436 { | 439 { |
437 NS_LOG_FUNCTION (this); | 440 NS_LOG_FUNCTION (this); |
| 441 NS_UNUSED(imsi); |
| 442 NS_UNUSED(cellId); |
| 443 NS_UNUSED(rnti);·· |
438 } | 444 } |
439 | 445 |
440 | 446 |
441 void· | 447 void· |
442 RadioBearerStatsConnector::DisconnectTracesEnb (std::string context, uint64_t im
si, uint16_t cellId, uint16_t rnti) | 448 RadioBearerStatsConnector::DisconnectTracesEnb (std::string context, uint64_t im
si, uint16_t cellId, uint16_t rnti) |
443 { | 449 { |
444 NS_LOG_FUNCTION (this); | 450 NS_LOG_FUNCTION (this); |
| 451 NS_UNUSED(imsi); |
| 452 NS_UNUSED(cellId); |
| 453 NS_UNUSED(rnti);·· |
445 } | 454 } |
446 | 455 |
447 | 456 |
448 | 457 |
449 } // namespace ns3 | 458 } // namespace ns3 |
OLD | NEW |