mirror of https://github.com/PentHertz/srsLTE.git
minor fixes to phy logging
This commit is contained in:
parent
23afd44a7d
commit
318afbd8b4
|
@ -112,9 +112,9 @@ public:
|
||||||
virtual void warning_line(std::string file, int line, std::string message, ...){error("warning_line not implemented.\n");}
|
virtual void warning_line(std::string file, int line, std::string message, ...){error("warning_line not implemented.\n");}
|
||||||
virtual void info_line(std::string file, int line, std::string message, ...){error("info_line not implemented.\n");}
|
virtual void info_line(std::string file, int line, std::string message, ...){error("info_line not implemented.\n");}
|
||||||
virtual void debug_line(std::string file, int line, std::string message, ...){error("debug_line not implemented.\n");}
|
virtual void debug_line(std::string file, int line, std::string message, ...){error("debug_line not implemented.\n");}
|
||||||
std::string get_service_name() { return service_name; }
|
|
||||||
protected:
|
|
||||||
|
|
||||||
|
protected:
|
||||||
|
std::string get_service_name() { return service_name; }
|
||||||
uint32_t tti;
|
uint32_t tti;
|
||||||
LOG_LEVEL_ENUM level;
|
LOG_LEVEL_ENUM level;
|
||||||
int hex_limit;
|
int hex_limit;
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
#include "srslte/srslte.h"
|
||||||
#include "srslte/phy/common/phy_logger.h"
|
#include "srslte/phy/common/phy_logger.h"
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
Functions for external logging
|
Functions for external logging
|
||||||
|
@ -41,6 +42,7 @@ static void *callback_ctx = NULL;
|
||||||
void srslte_phy_log_register_handler(void *ctx, phy_log_handler_t handler) {
|
void srslte_phy_log_register_handler(void *ctx, phy_log_handler_t handler) {
|
||||||
phy_log_handler = handler;
|
phy_log_handler = handler;
|
||||||
callback_ctx = ctx;
|
callback_ctx = ctx;
|
||||||
|
handler_registered++;
|
||||||
}
|
}
|
||||||
|
|
||||||
void srslte_phy_log_print(phy_logger_level_t log_level, const char *format, ...) {
|
void srslte_phy_log_print(phy_logger_level_t log_level, const char *format, ...) {
|
||||||
|
|
|
@ -174,8 +174,6 @@ void phch_worker::set_tti(uint32_t tti_, uint32_t tx_tti_)
|
||||||
tti = tti_;
|
tti = tti_;
|
||||||
tx_tti = tx_tti_;
|
tx_tti = tx_tti_;
|
||||||
log_h->step(tti);
|
log_h->step(tti);
|
||||||
printf("tti\n");
|
|
||||||
printf("out : %s", log_phy_lib_h->get_service_name());
|
|
||||||
log_phy_lib_h->step(tti);
|
log_phy_lib_h->step(tti);
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -131,8 +131,6 @@ bool phy::init(srslte::radio_multi* radio_handler, mac_interface_phy *mac, rrc_i
|
||||||
this->mac = mac;
|
this->mac = mac;
|
||||||
this->rrc = rrc;
|
this->rrc = rrc;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (!phy_args) {
|
if (!phy_args) {
|
||||||
args = &default_args;
|
args = &default_args;
|
||||||
set_default_args(args);
|
set_default_args(args);
|
||||||
|
@ -145,11 +143,9 @@ bool phy::init(srslte::radio_multi* radio_handler, mac_interface_phy *mac, rrc_i
|
||||||
}
|
}
|
||||||
|
|
||||||
nof_workers = args->nof_phy_threads;
|
nof_workers = args->nof_phy_threads;
|
||||||
|
|
||||||
this->log_phy_lib_h = (srslte::log*) log_vec[nof_workers];
|
this->log_phy_lib_h = (srslte::log*) log_vec[nof_workers];
|
||||||
srslte_phy_log_register_handler(this, srslte_phy_handler);
|
srslte_phy_log_register_handler(this, srslte_phy_handler);
|
||||||
|
|
||||||
|
|
||||||
initiated = false;
|
initiated = false;
|
||||||
start();
|
start();
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue