From 6037a2f2bdc5f28242744a00c392f9387f4498a0 Mon Sep 17 00:00:00 2001 From: Ismael Gomez Date: Fri, 23 Jun 2017 16:29:46 +0200 Subject: [PATCH] changed logger classes --- lib/examples/CMakeLists.txt | 2 +- lib/include/srslte/common/log_filter.h | 8 +- lib/include/srslte/common/log_stdout.h | 82 ------ lib/include/srslte/common/logger.h | 34 +-- lib/include/srslte/common/logger_file.h | 76 +++++ lib/include/srslte/common/logger_stdout.h | 51 ++++ lib/src/common/log_filter.cc | 5 + lib/src/common/log_stdout.cc | 290 ------------------- lib/src/common/{logger.cc => logger_file.cc} | 21 +- lib/test/common/log_filter_test.cc | 5 +- lib/test/common/logger_test.cc | 8 +- lib/test/upper/rlc_am_test.cc | 43 +-- lib/test/upper/rlc_um_test.cc | 10 +- srsenb/hdr/enb.h | 20 +- srsenb/test/mac/scheduler_test.cc | 4 +- srsenb/test/upper/ip_test.cc | 12 +- srsue/hdr/ue.h | 22 +- srsue/test/mac/mac_test.cc | 4 +- srsue/test/phy/ue_itf_test_prach.cc | 4 +- srsue/test/phy/ue_itf_test_sib1.cc | 4 +- srsue/test/upper/ip_test.cc | 14 +- srsue/test/upper/rrc_reconfig_test.cc | 6 +- srsue/test/upper/usim_test.cc | 4 +- 23 files changed, 235 insertions(+), 494 deletions(-) delete mode 100644 lib/include/srslte/common/log_stdout.h create mode 100644 lib/include/srslte/common/logger_file.h create mode 100644 lib/include/srslte/common/logger_stdout.h delete mode 100644 lib/src/common/log_stdout.cc rename lib/src/common/{logger.cc => logger_file.cc} (85%) diff --git a/lib/examples/CMakeLists.txt b/lib/examples/CMakeLists.txt index 652a2c195..9c6ee193e 100644 --- a/lib/examples/CMakeLists.txt +++ b/lib/examples/CMakeLists.txt @@ -65,7 +65,7 @@ if(RF_FOUND) add_executable(cell_search cell_search.c) target_link_libraries(cell_search srslte_phy srslte_rf) - add_executable(cell_measurement cell_measurement.c) + add_executable(cell_measurement cell_measurement.c ../include/srslte/common/logger_stdout.h) target_link_libraries(cell_measurement srslte_phy srslte_rf) add_executable(usrp_capture usrp_capture.c) diff --git a/lib/include/srslte/common/log_filter.h b/lib/include/srslte/common/log_filter.h index c1ed1998a..ae232f135 100644 --- a/lib/include/srslte/common/log_filter.h +++ b/lib/include/srslte/common/log_filter.h @@ -38,15 +38,19 @@ #include #include #include "srslte/common/log.h" -#include "logger.h" +#include "srslte/common/logger.h" +#include "srslte/common/logger_stdout.h" namespace srslte { +typedef std::string* str_ptr; + class log_filter : public srslte::log { public: log_filter(); + log_filter(std::string layer); log_filter(std::string layer, logger *logger_, bool tti=false); void init(std::string layer, logger *logger_, bool tti=false); @@ -71,6 +75,8 @@ private: logger *logger_h; bool do_tti; + logger_stdout def_logger_stdout; + void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg); void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg, uint8_t *hex, int size); void all_log_line(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string file, int line, char *msg); diff --git a/lib/include/srslte/common/log_stdout.h b/lib/include/srslte/common/log_stdout.h deleted file mode 100644 index df1b5b5fb..000000000 --- a/lib/include/srslte/common/log_stdout.h +++ /dev/null @@ -1,82 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2015 Software Radio Systems Limited - * - * \section LICENSE - * - * This file is part of the srsUE library. - * - * srsUE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * srsUE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * A copy of the GNU Affero General Public License can be found in - * the LICENSE file in the top-level directory of this distribution - * and at http://www.gnu.org/licenses/. - * - */ - -/****************************************************************************** - * File: log_stout.h - * - * Description: Logging service through standard output. Inherits log interface - * - * Reference: - *****************************************************************************/ - -#ifndef LOGSTDOUT_H -#define LOGSTDOUT_H - -#include -#include -#include "srslte/common/log.h" - -namespace srslte { - -class log_stdout : public log -{ -public: - - log_stdout(std::string service_name_) : log(service_name_) { } - - void console(std::string message, ...); - void error(std::string message, ...); - void warning(std::string message, ...); - void info(std::string message, ...); - void debug(std::string message, ...); - - // Same with hex dump - void error_hex(uint8_t *hex, int size, std::string message, ...); - void warning_hex(uint8_t *hex, int size, std::string message, ...); - void info_hex(uint8_t *hex, int size, std::string message, ...); - void debug_hex(uint8_t *hex, int size, std::string message, ...); - - // Same with line and file info - void error_line(std::string file, int line, std::string message, ...); - void warning_line(std::string file, int line, std::string message, ...); - void info_line(std::string file, int line, std::string message, ...); - void debug_line(std::string file, int line, std::string message, ...); - -private: - void printlog(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string file, int line, std::string message, va_list args); - void printlog(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string message, va_list args); - - void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg); - void all_log(srslte::LOG_LEVEL_ENUM level, uint32_t tti, char *msg, uint8_t *hex, int size); - void all_log_line(srslte::LOG_LEVEL_ENUM level, uint32_t tti, std::string file, int line, char *msg); - std::string now_time(); - std::string hex_string(uint8_t *hex, int size); -}; - -} - -#endif - diff --git a/lib/include/srslte/common/logger.h b/lib/include/srslte/common/logger.h index 67a897824..95e52922c 100644 --- a/lib/include/srslte/common/logger.h +++ b/lib/include/srslte/common/logger.h @@ -26,49 +26,23 @@ /****************************************************************************** * File: logger.h - * Description: Common log object. Maintains a queue of log messages - * and runs a thread to read messages and write to file. - * Multiple producers, single consumer. If full, producers - * increase queue size. If empty, consumer blocks. + * Description: Interface for logging output *****************************************************************************/ #ifndef LOGGER_H #define LOGGER_H #include -#include #include -#include "srslte/common/threads.h" namespace srslte { -typedef std::string* str_ptr; - -class logger : public thread +class logger { public: - logger(); - logger(std::string file); - ~logger(); - void init(std::string file); - void log(const char *msg); - void log(str_ptr msg); - -private: - void run_thread(); - void flush(); - - FILE* logfile; - bool inited; - bool not_done; - std::string filename; - pthread_cond_t not_empty; - pthread_cond_t not_full; - pthread_mutex_t mutex; - pthread_t thread; - std::deque buffer; + virtual void log(std::string *msg) = 0; }; -} // namespace srsue +} // namespace srslte #endif // LOGGER_H diff --git a/lib/include/srslte/common/logger_file.h b/lib/include/srslte/common/logger_file.h new file mode 100644 index 000000000..1bc41f883 --- /dev/null +++ b/lib/include/srslte/common/logger_file.h @@ -0,0 +1,76 @@ +/** + * + * \section COPYRIGHT + * + * Copyright 2013-2015 Software Radio Systems Limited + * + * \section LICENSE + * + * This file is part of the srsUE library. + * + * srsUE is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * srsUE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * A copy of the GNU Affero General Public License can be found in + * the LICENSE file in the top-level directory of this distribution + * and at http://www.gnu.org/licenses/. + * + */ + +/****************************************************************************** + * File: logger_file.h + * Description: Common log object. Maintains a queue of log messages + * and runs a thread to read messages and write to file. + * Multiple producers, single consumer. If full, producers + * increase queue size. If empty, consumer blocks. + *****************************************************************************/ + +#ifndef LOGGER_FILE_H +#define LOGGER_FILE_H + +#include +#include +#include +#include "srslte/common/logger.h" +#include "srslte/common/threads.h" + +namespace srslte { + +typedef std::string* str_ptr; + +class logger_file : public thread, public logger +{ +public: + logger_file(); + logger_file(std::string file); + ~logger_file(); + void init(std::string file); + // Implementation of log_out + void log(str_ptr msg); + void log(const char *msg); + +private: + void run_thread(); + void flush(); + + FILE* logfile; + bool inited; + bool not_done; + std::string filename; + pthread_cond_t not_empty; + pthread_cond_t not_full; + pthread_mutex_t mutex; + pthread_t thread; + std::deque buffer; +}; + +} // namespace srsue + +#endif // LOGGER_H diff --git a/lib/include/srslte/common/logger_stdout.h b/lib/include/srslte/common/logger_stdout.h new file mode 100644 index 000000000..00e4ffa7a --- /dev/null +++ b/lib/include/srslte/common/logger_stdout.h @@ -0,0 +1,51 @@ +/** + * + * \section COPYRIGHT + * + * Copyright 2013-2015 Software Radio Systems Limited + * + * \section LICENSE + * + * This file is part of the srsUE library. + * + * srsUE is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * srsUE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * A copy of the GNU Affero General Public License can be found in + * the LICENSE file in the top-level directory of this distribution + * and at http://www.gnu.org/licenses/. + * + */ + +/****************************************************************************** + * File: logger_stdout.h + * Description: Interface for logging output + *****************************************************************************/ + +#ifndef LOGGER_STDOUT_H +#define LOGGER_STDOUT_H + +#include +#include +#include "srslte/common/logger.h" + +namespace srslte { + + class logger_stdout : public logger + { + public: + void log(std::string *msg) { + fprintf(stdout, "%s", msg->c_str()); + } + }; + +} // namespace srslte + +#endif // LOGGER_H diff --git a/lib/src/common/log_filter.cc b/lib/src/common/log_filter.cc index 12f004d5e..899a224d6 100644 --- a/lib/src/common/log_filter.cc +++ b/lib/src/common/log_filter.cc @@ -40,6 +40,11 @@ log_filter::log_filter() do_tti = false; } +log_filter::log_filter(std::string layer) +{ + init(layer, &def_logger_stdout, tti); +} + log_filter::log_filter(std::string layer, logger *logger_, bool tti) { init(layer, logger_, tti); diff --git a/lib/src/common/log_stdout.cc b/lib/src/common/log_stdout.cc deleted file mode 100644 index 2e50b755e..000000000 --- a/lib/src/common/log_stdout.cc +++ /dev/null @@ -1,290 +0,0 @@ -/** - * - * \section COPYRIGHT - * - * Copyright 2013-2015 Software Radio Systems Limited - * - * \section LICENSE - * - * This file is part of the srsUE library. - * - * srsUE is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of - * the License, or (at your option) any later version. - * - * srsUE is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * A copy of the GNU Affero General Public License can be found in - * the LICENSE file in the top-level directory of this distribution - * and at http://www.gnu.org/licenses/. - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "srslte/common/log_stdout.h" - - -using namespace std; - -namespace srslte { - -void log_stdout::all_log(srslte::LOG_LEVEL_ENUM level, - uint32_t tti, - char *msg) -{ - std::stringstream ss; - - ss << now_time() << " "; - ss << "[" < 0) - printf("%s",args_msg); // Print directly to stdout - va_end(args); - free(args_msg); -} - -void log_stdout::error(std::string message, ...) { - if (level >= LOG_LEVEL_ERROR) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_ERROR, tti, args_msg); - va_end(args); - free(args_msg); - } -} -void log_stdout::warning(std::string message, ...) { - if (level >= LOG_LEVEL_WARNING) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_WARNING, tti, args_msg); - va_end(args); - free(args_msg); - } -} -void log_stdout::info(std::string message, ...) { - if (level >= LOG_LEVEL_INFO) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_INFO, tti, args_msg); - va_end(args); - free(args_msg); - } -} -void log_stdout::debug(std::string message, ...) { - if (level >= LOG_LEVEL_DEBUG) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_DEBUG, tti, args_msg); - va_end(args); - free(args_msg); - } -} - -void log_stdout::error_hex(uint8_t *hex, int size, std::string message, ...) { - if (level >= LOG_LEVEL_ERROR) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_ERROR, tti, args_msg, hex, size); - va_end(args); - free(args_msg); - } -} -void log_stdout::warning_hex(uint8_t *hex, int size, std::string message, ...) { - if (level >= LOG_LEVEL_WARNING) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_WARNING, tti, args_msg, hex, size); - va_end(args); - free(args_msg); - } -} -void log_stdout::info_hex(uint8_t *hex, int size, std::string message, ...) { - if (level >= LOG_LEVEL_INFO) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_INFO, tti, args_msg, hex, size); - va_end(args); - free(args_msg); - } -} -void log_stdout::debug_hex(uint8_t *hex, int size, std::string message, ...) { - if (level >= LOG_LEVEL_DEBUG) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log(LOG_LEVEL_DEBUG, tti, args_msg, hex, size); - va_end(args); - free(args_msg); - } -} - -void log_stdout::error_line(std::string file, int line, std::string message, ...) -{ - if (level >= LOG_LEVEL_ERROR) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log_line(LOG_LEVEL_ERROR, tti, file, line, args_msg); - va_end(args); - free(args_msg); - } -} - -void log_stdout::warning_line(std::string file, int line, std::string message, ...) -{ - if (level >= LOG_LEVEL_WARNING) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log_line(LOG_LEVEL_WARNING, tti, file, line, args_msg); - va_end(args); - free(args_msg); - } -} - -void log_stdout::info_line(std::string file, int line, std::string message, ...) -{ - if (level >= LOG_LEVEL_INFO) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log_line(LOG_LEVEL_INFO, tti, file, line, args_msg); - va_end(args); - free(args_msg); - } -} - -void log_stdout::debug_line(std::string file, int line, std::string message, ...) -{ - if (level >= LOG_LEVEL_DEBUG) { - char *args_msg; - va_list args; - va_start(args, message); - if(vasprintf(&args_msg, message.c_str(), args) > 0) - all_log_line(LOG_LEVEL_DEBUG, tti, file, line, args_msg); - va_end(args); - free(args_msg); - } -} - - - -std::string log_stdout::now_time() -{ - struct timeval rawtime; - struct tm * timeinfo; - char buffer[64]; - char us[16]; - - gettimeofday(&rawtime, NULL); - timeinfo = localtime(&rawtime.tv_sec); - - strftime(buffer,64,"%H:%M:%S",timeinfo); - strcat(buffer,"."); - snprintf(us,16,"%ld",rawtime.tv_usec); - strcat(buffer,us); - - return std::string(buffer); -} - -std::string log_stdout::hex_string(uint8_t *hex, int size) -{ - std::stringstream ss; - int c = 0; - - ss << std::hex << std::setfill('0'); - if(hex_limit >= 0) { - size = (size > hex_limit) ? hex_limit : size; - } - while(c < size) { - ss << " " << std::setw(4) << static_cast(c) << ": "; - int tmp = (size-c < 16) ? size-c : 16; - for(int i=0;i(hex[c++]) << " "; - } - ss << "\n"; - } - return ss.str(); -} - -} - - diff --git a/lib/src/common/logger.cc b/lib/src/common/logger_file.cc similarity index 85% rename from lib/src/common/logger.cc rename to lib/src/common/logger_file.cc index b48f6e1c7..94e5e8405 100644 --- a/lib/src/common/logger.cc +++ b/lib/src/common/logger_file.cc @@ -27,20 +27,20 @@ #define LOG_BUFFER_SIZE 1024*32 -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" using namespace std; namespace srslte{ -logger::logger() +logger_file::logger_file() :inited(false) ,not_done(true) {} -logger::~logger() { +logger_file::~logger_file() { not_done = false; - log("Closing log"); + log(new std::string("Closing log")); if(inited) { wait_thread_finish(); flush(); @@ -48,7 +48,7 @@ logger::~logger() { } } -void logger::init(std::string file) { +void logger_file::init(std::string file) { pthread_mutex_init(&mutex, NULL); pthread_cond_init(¬_empty, NULL); pthread_cond_init(¬_full, NULL); @@ -61,19 +61,18 @@ void logger::init(std::string file) { inited = true; } -void logger::log(const char *msg) { - str_ptr s_ptr(new std::string(msg)); - log(s_ptr); +void logger_file::log(const char *msg) { + log(new std::string(msg)); } -void logger::log(str_ptr msg) { +void logger_file::log(str_ptr msg) { pthread_mutex_lock(&mutex); buffer.push_back(msg); pthread_cond_signal(¬_empty); pthread_mutex_unlock(&mutex); } -void logger::run_thread() { +void logger_file::run_thread() { while(not_done) { pthread_mutex_lock(&mutex); while(buffer.empty()) { @@ -89,7 +88,7 @@ void logger::run_thread() { } } -void logger::flush() { +void logger_file::flush() { std::deque::iterator it; for(it=buffer.begin();it!=buffer.end();it++) { diff --git a/lib/test/common/log_filter_test.cc b/lib/test/common/log_filter_test.cc index d48821dac..350e42837 100644 --- a/lib/test/common/log_filter_test.cc +++ b/lib/test/common/log_filter_test.cc @@ -29,11 +29,12 @@ #include #include "srslte/common/log_filter.h" +#include "srslte/common/logger_file.h" using namespace srslte; typedef struct { - logger *l; + logger_file *l; int thread_id; }args_t; @@ -78,7 +79,7 @@ void* thread_loop_hex(void *a) { } void write(std::string filename) { - logger l; + logger_file l; l.init(filename); pthread_t threads[NTHREADS]; args_t args[NTHREADS]; diff --git a/lib/test/common/logger_test.cc b/lib/test/common/logger_test.cc index 1baf5260f..845d4c104 100644 --- a/lib/test/common/logger_test.cc +++ b/lib/test/common/logger_test.cc @@ -29,12 +29,12 @@ #include #include -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" using namespace srslte; typedef struct { - logger *l; + logger_file *l; int thread_id; }args_t; @@ -44,13 +44,13 @@ void* thread_loop(void *a) { for(int i=0;ithread_id, i); - args->l->log(buf); + args->l->log(new std::string(buf)); } return NULL; } void write(std::string filename) { - logger l; + logger_file l; l.init(filename); pthread_t threads[NTHREADS]; args_t args[NTHREADS]; diff --git a/lib/test/upper/rlc_am_test.cc b/lib/test/upper/rlc_am_test.cc index bacc819ec..dfe62905e 100644 --- a/lib/test/upper/rlc_am_test.cc +++ b/lib/test/upper/rlc_am_test.cc @@ -25,7 +25,8 @@ */ #include -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" +#include "srslte/common/logger_stdout.h" #include "srslte/upper/rlc_am.h" #include #define NBUFS 5 @@ -73,8 +74,8 @@ public: void basic_test() { - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -152,8 +153,8 @@ void basic_test() void concat_test() { - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -216,8 +217,8 @@ void concat_test() void segment_test() { - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -298,8 +299,8 @@ void segment_test() void retx_test() { - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -394,8 +395,8 @@ void resegment_test_1() // PDUs: | 10 | 10 | 10 | 10 | 10 | // Retx PDU segments: | 5 | 5| - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -503,8 +504,8 @@ void resegment_test_2() // PDUs: | 5 | 10 | 20 | 10 | 5 | // Retx PDU segments: | 10 | 10 | - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -609,8 +610,8 @@ void resegment_test_3() // PDUs: | 5 | 5| 20 | 10 | 10 | // Retx PDU segments: | 10 | 10 | - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -711,8 +712,8 @@ void resegment_test_4() // PDUs: | 5 | 5| 30 | 5 | 5| // Retx PDU segments: | 15 | 15 | - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -813,8 +814,8 @@ void resegment_test_5() // PDUs: |2|3| 40 |3|2| // Retx PDU segments: | 20 | 20 | - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -914,8 +915,8 @@ void resegment_test_6() // PDUs: |10|10|10| 270 | 54 | // Retx PDU segments: | 120 | 150 | - srslte::log_stdout log1("RLC_AM_1"); - srslte::log_stdout log2("RLC_AM_2"); + srslte::log_filter log1("RLC_AM_1"); + srslte::log_filter log2("RLC_AM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); diff --git a/lib/test/upper/rlc_um_test.cc b/lib/test/upper/rlc_um_test.cc index dfc2883d8..491d816cc 100644 --- a/lib/test/upper/rlc_um_test.cc +++ b/lib/test/upper/rlc_um_test.cc @@ -25,7 +25,7 @@ */ #include -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "srslte/upper/rlc_um.h" #include @@ -78,8 +78,8 @@ public: void basic_test() { - srslte::log_stdout log1("RLC_UM_1"); - srslte::log_stdout log2("RLC_UM_2"); + srslte::log_filter log1("RLC_UM_1"); + srslte::log_filter log2("RLC_UM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -146,8 +146,8 @@ void basic_test() void loss_test() { - srslte::log_stdout log1("RLC_UM_1"); - srslte::log_stdout log2("RLC_UM_2"); + srslte::log_filter log1("RLC_UM_1"); + srslte::log_filter log2("RLC_UM_2"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log2.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); diff --git a/srsenb/hdr/enb.h b/srsenb/hdr/enb.h index 8db5c85b6..b28d12ab4 100644 --- a/srsenb/hdr/enb.h +++ b/srsenb/hdr/enb.h @@ -50,7 +50,7 @@ #include "srslte/common/bcd_helpers.h" #include "srslte/common/buffer_pool.h" #include "srslte/interfaces/ue_interfaces.h" -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" #include "srslte/common/log_filter.h" #include "srslte/common/mac_pcap.h" #include "srslte/interfaces/sched_interface.h" @@ -173,15 +173,15 @@ private: srsenb::gtpu gtpu; srsenb::s1ap s1ap; - srslte::logger logger; - srslte::log_filter rf_log; - std::vector phy_log; - srslte::log_filter mac_log; - srslte::log_filter rlc_log; - srslte::log_filter pdcp_log; - srslte::log_filter rrc_log; - srslte::log_filter gtpu_log; - srslte::log_filter s1ap_log; + srslte::logger_file logger; + srslte::log_filter rf_log; + std::vector phy_log; + srslte::log_filter mac_log; + srslte::log_filter rlc_log; + srslte::log_filter pdcp_log; + srslte::log_filter rrc_log; + srslte::log_filter gtpu_log; + srslte::log_filter s1ap_log; srslte::byte_buffer_pool *pool; diff --git a/srsenb/test/mac/scheduler_test.cc b/srsenb/test/mac/scheduler_test.cc index 53bb28e18..e9afd61cb 100644 --- a/srsenb/test/mac/scheduler_test.cc +++ b/srsenb/test/mac/scheduler_test.cc @@ -6,7 +6,7 @@ #include "srslte/interfaces/enb_interfaces.h" #include "srslte/interfaces/sched_interface.h" -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "srslte/radio/radio.h" #include "srslte/phy/utils/debug.h" @@ -62,7 +62,7 @@ private: // Create classes -srslte::log_stdout log_out("ALL"); +srslte::log_filter log_out("ALL"); srsenb::sched my_sched; srsenb::dl_metric_rr dl_metric; srsenb::ul_metric_rr ul_metric; diff --git a/srsenb/test/upper/ip_test.cc b/srsenb/test/upper/ip_test.cc index f2ec84f64..41c430f29 100644 --- a/srsenb/test/upper/ip_test.cc +++ b/srsenb/test/upper/ip_test.cc @@ -16,7 +16,7 @@ #include "srslte/interfaces/enb_interfaces.h" #include "srslte/common/common.h" #include "srslte/common/buffer_pool.h" -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" #include "srslte/common/log_filter.h" #include "srslte/upper/rlc.h" #include "srslte/radio/radio.h" @@ -320,11 +320,11 @@ private: // Create classes -srslte::logger logger; -srslte::log_filter log_phy; -srslte::log_filter log_mac; -srslte::log_filter log_rlc; -srslte::log_filter log_tester; +srslte::logger_file logger; +srslte::log_filter log_phy; +srslte::log_filter log_mac; +srslte::log_filter log_rlc; +srslte::log_filter log_tester; srsenb::phy my_phy; srsenb::mac my_mac; srslte::rlc my_rlc; diff --git a/srsue/hdr/ue.h b/srsue/hdr/ue.h index f401697e9..6fb593d55 100644 --- a/srsue/hdr/ue.h +++ b/srsue/hdr/ue.h @@ -49,7 +49,7 @@ #include "srslte/common/buffer_pool.h" #include "srslte/interfaces/ue_interfaces.h" -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" #include "srslte/common/log_filter.h" #include "ue_metrics_interface.h" @@ -173,16 +173,16 @@ private: srslte::gw gw; srsue::usim usim; - srslte::logger logger; - srslte::log_filter rf_log; - srslte::log_filter phy_log; - srslte::log_filter mac_log; - srslte::log_filter rlc_log; - srslte::log_filter pdcp_log; - srslte::log_filter rrc_log; - srslte::log_filter nas_log; - srslte::log_filter gw_log; - srslte::log_filter usim_log; + srslte::logger_file logger; + srslte::log_filter rf_log; + srslte::log_filter phy_log; + srslte::log_filter mac_log; + srslte::log_filter rlc_log; + srslte::log_filter pdcp_log; + srslte::log_filter rrc_log; + srslte::log_filter nas_log; + srslte::log_filter gw_log; + srslte::log_filter usim_log; srslte::byte_buffer_pool *pool; diff --git a/srsue/test/mac/mac_test.cc b/srsue/test/mac/mac_test.cc index 7c7e19cf0..cb2ad2945 100644 --- a/srsue/test/mac/mac_test.cc +++ b/srsue/test/mac/mac_test.cc @@ -32,7 +32,7 @@ #include "srslte/radio/radio_multi.h" #include "phy/phy.h" #include "srslte/interfaces/ue_interfaces.h" -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "mac/mac.h" #include "srslte/common/mac_pcap.h" @@ -427,7 +427,7 @@ private: int main(int argc, char *argv[]) { - srslte::log_stdout mac_log("MAC"), phy_log("PHY"); + srslte::log_filter mac_log("MAC"), phy_log("PHY"); rlctest my_rlc; parse_args(&prog_args, argc, argv); diff --git a/srsue/test/phy/ue_itf_test_prach.cc b/srsue/test/phy/ue_itf_test_prach.cc index 91df6a2fc..76adcacdf 100644 --- a/srsue/test/phy/ue_itf_test_prach.cc +++ b/srsue/test/phy/ue_itf_test_prach.cc @@ -29,7 +29,7 @@ #include "srslte/phy/utils/debug.h" #include "phy/phy.h" #include "srslte/interfaces/ue_interfaces.h" -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "srslte/radio/radio_multi.h" /********************************************************************** @@ -330,7 +330,7 @@ srslte::radio_multi radio; int main(int argc, char *argv[]) { - srslte::log_stdout log("PHY"); + srslte::log_filter log("PHY"); parse_args(&prog_args, argc, argv); diff --git a/srsue/test/phy/ue_itf_test_sib1.cc b/srsue/test/phy/ue_itf_test_sib1.cc index 08116b22c..10e78b23a 100644 --- a/srsue/test/phy/ue_itf_test_sib1.cc +++ b/srsue/test/phy/ue_itf_test_sib1.cc @@ -28,7 +28,7 @@ #include "srslte/phy/utils/debug.h" #include "phy/phy.h" -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "srslte/interfaces/ue_interfaces.h" #include "srslte/radio/radio_multi.h" @@ -153,7 +153,7 @@ srslte::radio_multi radio; int main(int argc, char *argv[]) { - srslte::log_stdout log("PHY"); + srslte::log_filter log("PHY"); parse_args(&prog_args, argc, argv); diff --git a/srsue/test/upper/ip_test.cc b/srsue/test/upper/ip_test.cc index a26f273a8..93021cd2b 100644 --- a/srsue/test/upper/ip_test.cc +++ b/srsue/test/upper/ip_test.cc @@ -21,7 +21,7 @@ #include "srslte/common/threads.h" #include "srslte/common/common.h" #include "srslte/common/buffer_pool.h" -#include "srslte/common/logger.h" +#include "srslte/common/logger_file.h" #include "srslte/common/log_filter.h" #include "srslte/upper/rlc.h" #include "upper/rrc.h" @@ -464,12 +464,12 @@ private: // Create classes -srslte::logger logger; -srslte::log_filter log_phy; -srslte::log_filter log_mac; -srslte::log_filter log_rlc; -srslte::log_filter log_tester; -srslte::mac_pcap mac_pcap; +srslte::logger_file logger; +srslte::log_filter log_phy; +srslte::log_filter log_mac; +srslte::log_filter log_rlc; +srslte::log_filter log_tester; +srslte::mac_pcap mac_pcap; srsue::phy my_phy; srsue::mac my_mac; srslte::rlc rlc; diff --git a/srsue/test/upper/rrc_reconfig_test.cc b/srsue/test/upper/rrc_reconfig_test.cc index 25629bcd7..c9df04e32 100644 --- a/srsue/test/upper/rrc_reconfig_test.cc +++ b/srsue/test/upper/rrc_reconfig_test.cc @@ -26,12 +26,12 @@ #include #include -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include "srslte/asn1/liblte_rrc.h" #include "srslte/asn1/liblte_mme.h" void nas_test() { - srslte::log_stdout log1("NAS"); + srslte::log_filter log1("NAS"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); @@ -91,7 +91,7 @@ void nas_test() { } void basic_test() { - srslte::log_stdout log1("RRC"); + srslte::log_filter log1("RRC"); log1.set_level(srslte::LOG_LEVEL_DEBUG); log1.set_hex_limit(-1); diff --git a/srsue/test/upper/usim_test.cc b/srsue/test/upper/usim_test.cc index 8e7d53bfe..c8a248184 100644 --- a/srsue/test/upper/usim_test.cc +++ b/srsue/test/upper/usim_test.cc @@ -26,7 +26,7 @@ #include #include "upper/usim.h" -#include "srslte/common/log_stdout.h" +#include "srslte/common/log_filter.h" #include using namespace srsue; @@ -67,7 +67,7 @@ uint16 mnc = 93; int main(int argc, char **argv) { - srslte::log_stdout usim_log("USIM"); + srslte::log_filter usim_log("USIM"); bool net_valid; uint8_t res[16];