PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change phy_log in UE to log_filter

This commit is contained in:
Andre Puschmann 2018-03-08 17:55:48 +01:00
parent f3c04949b7
commit 9553784e2f
6 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/srslte/common/log.h
View File

@ -84,6 +84,8 @@ public:
level_text_short = true;
}
virtual ~log() {};
// This function shall be called at the start of every tti for printing tti
void step(uint32_t tti_) {
tti = tti_;

6
srsue/hdr/phy/phy.h
View File

@ -28,7 +28,7 @@
#define UEPHY_H
#include "srslte/srslte.h"
#include "srslte/common/log.h"
#include "srslte/common/log_filter.h"
#include "phy/phy_metrics.h"
#include "phy/phch_recv.h"
#include "phy/prach.h"
@ -53,7 +53,7 @@ public:
bool init(srslte::radio_multi *radio_handler,
mac_interface_phy *mac,
rrc_interface_phy *rrc,
std::vector<srslte::log*> log_vec,
std::vector<srslte::log_filter*> log_vec,
phy_args_t *args = NULL);
void stop();
@ -158,7 +158,7 @@ private:
const static int WORKERS_THREAD_PRIO = 0;
srslte::radio_multi *radio_handler;
std::vector<srslte::log*> log_vec;
std::vector<srslte::log_filter*> log_vec;
srslte::log *log_h;
srslte::log *log_phy_lib_h;
srsue::mac_interface_phy *mac;

2
srsue/hdr/ue.h
View File

@ -103,7 +103,7 @@ private:
srslte::logger *logger;
// rf_log is on ue_base
std::vector<srslte::log*> phy_log;
std::vector<srslte::log_filter*> phy_log;
srslte::log_filter mac_log;
srslte::log_filter rlc_log;
srslte::log_filter pdcp_log;

2
srsue/src/phy/phy.cc
View File

@ -120,7 +120,7 @@ bool phy::check_args(phy_args_t *args)
}
bool phy::init(srslte::radio_multi* radio_handler, mac_interface_phy *mac, rrc_interface_phy *rrc,
std::vector<srslte::log*> log_vec, phy_args_t *phy_args) {
std::vector<srslte::log_filter*> log_vec, phy_args_t *phy_args) {
mlockall(MCL_CURRENT | MCL_FUTURE);

3
srsue/src/ue.cc
View File

@ -44,6 +44,9 @@ ue::ue()
ue::~ue()
{
for (uint32_t i = 0; i < phy_log.size(); i++) {
delete(phy_log[i]);
}
}
bool ue::init(all_args_t *args_)

4
srsue/test/mac/mac_test.cc
View File

@ -451,12 +451,12 @@ int main(int argc, char *argv[])
exit(1);
}
std::vector<srslte::log*> phy_log;
std::vector<srslte::log_filter*> phy_log;
srslte::log_filter *mylog = new srslte::log_filter("PHY");
char tmp[16];
sprintf(tmp, "PHY%d",0);
phy_log.push_back((srslte::log*) mylog);
phy_log.push_back(mylog);
switch (prog_args.verbose) {
case 1: