fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:srsLTE/srsLTE

This commit is contained in:
Andre Puschmann 2018-07-16 10:12:48 +02:00
parent ac94b531ae 2d5cdc4f35
commit 10469cd3a0
6 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/include/srslte/common/buffer_pool.h
View File

@ -38,6 +38,7 @@
INCLUDES
*******************************************************************************/
#include "srslte/common/log.h"
#include "srslte/common/common.h"
namespace srslte {
@ -169,6 +170,7 @@ public:
static byte_buffer_pool* get_instance(int capacity = -1);
static void cleanup(void);
byte_buffer_pool(int capacity = -1) {
log = NULL;
pool = new buffer_pool<byte_buffer_t>(capacity);
}
~byte_buffer_pool() {
@ -177,13 +179,20 @@ public:
byte_buffer_t* allocate(const char *debug_name = NULL) {
return pool->allocate(debug_name);
}
void set_log(srslte::log *log) {
this->log = log;
}
void deallocate(byte_buffer_t *b) {
if(!b) {
return;
}
b->reset();
if (!pool->deallocate(b)) {
printf("Error deallocating PDU: Addr=0x%lx not found in pool\n", (uint64_t) b);
if (log) {
log->error("Deallocating PDU: Addr=0x%lx, name=%s not found in pool\n", (uint64_t) b, b->debug_name);
} else {
printf("Error deallocating PDU: Addr=0x%lx, name=%s not found in pool\n", (uint64_t) b, b->debug_name);
}
}
b = NULL;
}
@ -191,6 +200,7 @@ public:
pool->print_all_buffers();
}
private:
srslte::log *log;
buffer_pool<byte_buffer_t> *pool;
};

8
lib/src/upper/rlc_um.cc
View File

@ -67,6 +67,10 @@ rlc_um::~rlc_um()
{
pthread_mutex_destroy(&mutex);
pool = NULL;
if (mac_timers && reordering_timer) {
mac_timers->timer_release_id(reordering_timer_id);
reordering_timer = NULL;
}
}
void rlc_um::init(srslte::log *log_,
@ -169,10 +173,6 @@ void rlc_um::stop()
rx_window.clear();
pthread_mutex_unlock(&mutex);
if (mac_timers && reordering_timer) {
mac_timers->timer_release_id(reordering_timer_id);
reordering_timer = NULL;
}
}
rlc_mode_t rlc_um::get_mode()

1
srsenb/hdr/enb.h
View File

@ -201,6 +201,7 @@ private:
srslte::log_filter rrc_log;
srslte::log_filter gtpu_log;
srslte::log_filter s1ap_log;
srslte::log_filter pool_log;
srslte::byte_buffer_pool *pool;

4
srsenb/src/enb.cc
View File

@ -99,6 +99,10 @@ bool enb::init(all_args_t *args_)
gtpu_log.init("GTPU", logger);
s1ap_log.init("S1AP", logger);
pool_log.init("POOL", logger);
pool_log.set_level(srslte::LOG_LEVEL_ERROR);
pool->set_log(&pool_log);
// Init logs
rf_log.set_level(srslte::LOG_LEVEL_INFO);
for (int i=0;i<args->expert.phy.nof_phy_threads;i++) {

1
srsue/hdr/ue.h
View File

@ -115,6 +115,7 @@ private:
srslte::log_filter nas_log;
srslte::log_filter gw_log;
srslte::log_filter usim_log;
srslte::log_filter pool_log;
all_args_t *args;
bool started;

4
srsue/src/ue.cc
View File

@ -89,6 +89,10 @@ bool ue::init(all_args_t *args_) {
gw_log.init("GW ", logger);
usim_log.init("USIM", logger);
pool_log.init("POOL", logger);
pool_log.set_level(srslte::LOG_LEVEL_ERROR);
byte_buffer_pool::get_instance()->set_log(&pool_log);
// Init logs
rf_log.set_level(srslte::LOG_LEVEL_INFO);
rf_log.info("Starting UE\n");