5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CSV metrics per carrier. Add options to flush file earlier and append to file

Browse Source
master
Ismael Gomez 5 years ago committed by Andre Puschmann
parent e832769ae6
commit 23cc42ce9f
4 changed files with 78 additions and 64 deletions
Show Stats Download Patch File Download Diff File

10
srsue/hdr/metrics_csv.h
Unescape Escape View File

@ -41,21 +41,23 @@ namespace srsue {
class metrics_csv : public srslte::metrics_listener<ue_metrics_t> class metrics_csv : public srslte::metrics_listener<ue_metrics_t>
{ {
public: public:
metrics_csv(std::string filename); metrics_csv(std::string filename, bool append);
~metrics_csv(); ~metrics_csv();
void set_metrics(const ue_metrics_t& m, const uint32_t period_usec); void set_metrics(const ue_metrics_t& m, const uint32_t period_usec);
void set_ue_handle(ue_metrics_interface* ue_); void set_ue_handle(ue_metrics_interface* ue_);
void set_flush_period(const uint32_t flush_period_sec);
void stop(); void stop();
private: private:
std::string float_to_string(float f, int digits, bool add_semicolon = true); std::string float_to_string(float f, int digits, bool add_semicolon = true);
float metrics_report_period; float metrics_report_period = 0.0f;
std::ofstream file; std::ofstream file;
ue_metrics_interface* ue; ue_metrics_interface* ue = nullptr;
uint32_t n_reports; uint32_t n_reports = 0;
pthread_mutex_t mutex; pthread_mutex_t mutex;
uint32_t flush_period_sec = 0;
}; };
} // namespace srsue } // namespace srsue

2
srsue/hdr/ue.h
Unescape Escape View File

@ -68,6 +68,8 @@ typedef struct {
typedef struct { typedef struct {
float metrics_period_secs; float metrics_period_secs;
bool metrics_csv_enable; bool metrics_csv_enable;
bool metrics_csv_append;
int metrics_csv_flush_period_sec;
std::string metrics_csv_filename; std::string metrics_csv_filename;
} general_args_t; } general_args_t;

13
srsue/src/main.cc
Unescape Escape View File

@ -397,6 +397,14 @@ static int parse_args(all_args_t* args, int argc, char* argv[])
bpo::value<string>(&args->general.metrics_csv_filename)->default_value("/tmp/ue_metrics.csv"), bpo::value<string>(&args->general.metrics_csv_filename)->default_value("/tmp/ue_metrics.csv"),
"Metrics CSV filename") "Metrics CSV filename")
("general.metrics_csv_append",
bpo::value<bool>(&args->general.metrics_csv_append)->default_value(false),
"Set to true to append new output to existing CSV file")
("general.metrics_csv_flush_period_sec",
bpo::value<int>(&args->general.metrics_csv_flush_period_sec)->default_value(-1),
"Periodicity in ms to flush CSV file to disk (-1 for auto)")
("stack.have_tti_time_stats", ("stack.have_tti_time_stats",
bpo::value<bool>(&args->stack.have_tti_time_stats)->default_value(true), bpo::value<bool>(&args->stack.have_tti_time_stats)->default_value(true),
"Calculate TTI execution statistics"); "Calculate TTI execution statistics");
@ -630,10 +638,13 @@ int main(int argc, char* argv[])
metricshub.add_listener(metrics_screen); metricshub.add_listener(metrics_screen);
metrics_screen->set_ue_handle(&ue); metrics_screen->set_ue_handle(&ue);
metrics_csv metrics_file(args.general.metrics_csv_filename); metrics_csv metrics_file(args.general.metrics_csv_filename, args.general.metrics_csv_append);
if (args.general.metrics_csv_enable) { if (args.general.metrics_csv_enable) {
metricshub.add_listener(&metrics_file); metricshub.add_listener(&metrics_file);
metrics_file.set_ue_handle(&ue); metrics_file.set_ue_handle(&ue);
if (args.general.metrics_csv_flush_period_sec > 0) {
metrics_file.set_flush_period((uint32_t)args.general.metrics_csv_flush_period_sec);
}
} }
pthread_t input; pthread_t input;

117
srsue/src/metrics_csv.cc
Unescape Escape View File

@ -35,9 +35,13 @@ using namespace std;
namespace srsue { namespace srsue {
metrics_csv::metrics_csv(std::string filename) : n_reports(0), metrics_report_period(1.0), ue(NULL) metrics_csv::metrics_csv(std::string filename, bool append) : n_reports(0), metrics_report_period(1.0), ue(NULL)
{ {
file.open(filename.c_str(), std::ios_base::out); std::ios_base::openmode flags = std::ios_base::out;
if (append) {
flags |= std::ios_base::app;
}
file.open(filename.c_str(), flags);
pthread_mutex_init(&mutex, NULL); pthread_mutex_init(&mutex, NULL);
} }
@ -52,6 +56,11 @@ void metrics_csv::set_ue_handle(ue_metrics_interface* ue_)
ue = ue_; ue = ue_;
} }
void metrics_csv::set_flush_period(const uint32_t flush_period_sec_)
{
flush_period_sec = flush_period_sec_;
}
void metrics_csv::stop() void metrics_csv::stop()
{ {
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
@ -68,71 +77,61 @@ void metrics_csv::set_metrics(const ue_metrics_t& metrics, const uint32_t period
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
if (file.is_open() && ue != NULL) { if (file.is_open() && ue != NULL) {
if (n_reports == 0) { if (n_reports == 0) {
file << "time;rsrp;pl;cfo;dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;ul_ta;ul_mcs;ul_buff;ul_brate;ul_bler;rf_o;rf_" file << "time;cc;pci;rsrp;pl;cfo;dl_mcs;dl_snr;dl_turbo;dl_brate;dl_bler;ul_ta;ul_mcs;ul_buff;ul_brate;ul_bler;"
"rf_o;rf_"
"u;rf_l;is_attached\n"; "u;rf_l;is_attached\n";
} }
file << (metrics_report_period * n_reports) << ";";
// Print PHY metrics for first CC
file << float_to_string(metrics.phy.dl[0].rsrp, 2);
file << float_to_string(metrics.phy.dl[0].pathloss, 2);
file << float_to_string(metrics.phy.sync[0].cfo, 2);
file << float_to_string(metrics.phy.dl[0].mcs, 2);
file << float_to_string(metrics.phy.dl[0].sinr, 2);
file << float_to_string(metrics.phy.dl[0].turbo_iters, 2);
// Sum DL rate for all CCs
float rx_brate = 0;
for (uint32_t r = 0; r < metrics.phy.nof_active_cc; r++) {
rx_brate += metrics.stack.mac[r].rx_brate;
}
file << float_to_string(rx_brate / period_usec * 1e6, 2);
// Sum BLER for all CCs
int rx_pkts = 0;
int rx_errors = 0;
for (uint32_t r = 0; r < metrics.phy.nof_active_cc; r++) { for (uint32_t r = 0; r < metrics.phy.nof_active_cc; r++) {
rx_pkts += metrics.stack.mac[r].rx_pkts; file << (metrics_report_period * n_reports) << ";";
rx_errors += metrics.stack.mac[r].rx_errors;
} // Print PHY metrics for first CC
if (rx_pkts > 0) { file << float_to_string(metrics.phy.dl[r].rsrp, 2);
file << float_to_string((float)100 * rx_errors / rx_pkts, 1); file << float_to_string(metrics.phy.dl[r].pathloss, 2);
} else { file << float_to_string(metrics.phy.sync[r].cfo, 2);
file << float_to_string(0, 2); file << float_to_string(metrics.phy.dl[r].mcs, 2);
file << float_to_string(metrics.phy.dl[r].sinr, 2);
file << float_to_string(metrics.phy.dl[r].turbo_iters, 2);
file << float_to_string(metrics.stack.mac[r].rx_brate / period_usec * 1e6, 2);
int rx_pkts = metrics.stack.mac[r].rx_pkts;
int rx_errors = metrics.stack.mac[r].rx_errors;
if (rx_pkts > 0) {
file << float_to_string((float)100 * rx_errors / rx_pkts, 1);
} else {
file << float_to_string(0, 2);
}
file << float_to_string(metrics.phy.sync[r].ta_us, 2);
file << float_to_string(metrics.phy.ul[r].mcs, 2);
file << float_to_string((float)metrics.stack.mac[r].ul_buffer, 2);
file << float_to_string(metrics.stack.mac[r].tx_brate / period_usec * 1e6, 2);
// Sum UL BLER for all CCs
int tx_pkts = metrics.stack.mac[r].tx_pkts;
int tx_errors = metrics.stack.mac[r].tx_errors;
if (tx_pkts > 0) {
file << float_to_string((float)100 * tx_errors / tx_pkts, 1);
} else {
file << float_to_string(0, 2);
}
file << float_to_string(metrics.rf.rf_o, 2);
file << float_to_string(metrics.rf.rf_u, 2);
file << float_to_string(metrics.rf.rf_l, 2);
file << (metrics.stack.rrc.state == RRC_STATE_CONNECTED ? "1.0" : "0.0");
file << "\n";
} }
file << float_to_string(metrics.phy.sync[0].ta_us, 2); n_reports++;
file << float_to_string(metrics.phy.ul[0].mcs, 2);
file << float_to_string((float)metrics.stack.mac[0].ul_buffer, 2);
// Sum UL rate for all CCs
float tx_brate = 0;
for (uint32_t r = 0; r < metrics.phy.nof_active_cc; r++) {
tx_brate += metrics.stack.mac[r].tx_brate;
}
file << float_to_string(tx_brate / period_usec * 1e6, 2);
// Sum UL BLER for all CCs if (flush_period_sec > 0) {
int tx_pkts = 0; if ((n_reports % flush_period_sec * 1000) == 0) {
int tx_errors = 0; file.flush();
for (uint32_t r = 0; r < metrics.phy.nof_active_cc; r++) { }
tx_pkts += metrics.stack.mac[r].tx_pkts;
tx_errors += metrics.stack.mac[r].tx_errors;
} }
if (tx_pkts > 0) {
file << float_to_string((float)100 * tx_errors / tx_pkts, 1);
} else {
file << float_to_string(0, 2);
}
file << float_to_string(metrics.rf.rf_o, 2);
file << float_to_string(metrics.rf.rf_u, 2);
file << float_to_string(metrics.rf.rf_l, 2);
file << (metrics.stack.rrc.state == RRC_STATE_CONNECTED ? "1.0" : "0.0");
file << "\n";
n_reports++;
} else { } else {
std::cout << "couldn't write CSV file." << std::endl; std::cout << "couldn't write CSV file." << std::endl;
} }

Write Preview
Loading…
Cancel
Save