rrc: include pci when logging serving cell measurement

this should facilitate easier log parsing and plotting
if the cell measurements _always_ include the PCI, even
in the case of the serving cell

15:49:11.357447 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.52 dBm, cfo=+0.1 Hz
15:49:11.391610 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.52 dBm, cfo=-0.4 Hz
15:49:11.427325 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.52 dBm, cfo=-0.6 Hz
15:49:11.463101 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.52 dBm, cfo=-0.7 Hz
15:49:11.499817 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.51 dBm, cfo=+0.1 Hz
15:49:11.499828 [RRC ] [I] MEAS:  New measurement neighbour cell: earfcn=2850, pci=0, rsrp=-12.16 dBm, cfo=-0.8 Hz
15:49:11.535027 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.46 dBm, cfo=-0.8 Hz
15:49:11.571707 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.46 dBm, cfo=-0.9 Hz
15:49:11.607932 [RRC ] [I] MEAS:  New measurement serving cell: earfcn=0, pci=1, rsrp=-11.52 dBm, cfo=-0.8 Hz
master
Andre Puschmann 4 years ago
parent 6e0abd30dd
commit 0ef8e1fdac

@ -66,7 +66,6 @@ using srslte::byte_buffer_t;
namespace srsue { namespace srsue {
class phy_controller; class phy_controller;
class rrc : public rrc_interface_nas, class rrc : public rrc_interface_nas,

@ -181,10 +181,10 @@ const cell_t* meas_cell_list::get_neighbour_cell_handle(uint32_t earfcn, uint32_
// If only neighbour PCI is provided, copy full cell from serving cell // If only neighbour PCI is provided, copy full cell from serving cell
bool meas_cell_list::add_meas_cell(const rrc_interface_phy_lte::phy_meas_t& meas) bool meas_cell_list::add_meas_cell(const rrc_interface_phy_lte::phy_meas_t& meas)
{ {
phy_cell_t phy_cell = {}; phy_cell_t phy_cell = {};
phy_cell.earfcn = meas.earfcn; phy_cell.earfcn = meas.earfcn;
phy_cell.pci = meas.pci; phy_cell.pci = meas.pci;
unique_cell_t c = unique_cell_t(new cell_t(phy_cell)); unique_cell_t c = unique_cell_t(new cell_t(phy_cell));
c.get()->set_rsrp(meas.rsrp); c.get()->set_rsrp(meas.rsrp);
c.get()->set_rsrq(meas.rsrq); c.get()->set_rsrq(meas.rsrq);
c.get()->set_cfo(meas.cfo_hz); c.get()->set_cfo(meas.cfo_hz);
@ -403,15 +403,12 @@ bool meas_cell_list::process_new_cell_meas(const std::vector<phy_meas_t>&
neighbour_added |= add_meas_cell(m); neighbour_added |= add_meas_cell(m);
} }
if (is_serving_cell) { log_h->info("MEAS: New measurement %s cell: earfcn=%d, pci=%d, rsrp=%.2f dBm, cfo=%+.1f Hz\n",
log_h->info("MEAS: New measurement serving cell: rsrp=%.2f dBm.\n", m.rsrp); is_serving_cell ? "serving" : "neighbour",
} else { m.earfcn,
log_h->info("MEAS: New measurement neighbour cell: earfcn=%d, pci=%d, rsrp=%.2f dBm, cfo=%+.1f Hz\n", m.pci,
m.earfcn, m.rsrp,
m.pci, m.cfo_hz);
m.rsrp,
m.cfo_hz);
}
} }
return neighbour_added; return neighbour_added;
} }

Loading…
Cancel
Save