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

using an interface between the stack and lower mac to process demux pdus.

Browse Source
master
Francisco Paisana 5 years ago committed by Andre Puschmann
parent 57317fab7c
commit 946ead06e8
6 changed files with 119 additions and 142 deletions
Show Stats Download Patch File Download Diff File

7
lib/include/srslte/interfaces/ue_interfaces.h
Unescape Escape View File

@ -630,6 +630,13 @@ class gw_interface_stack : public gw_interface_nas, public gw_interface_rrc, pub
{ {
}; };
// STACK interface for MAC
class stack_interface_mac
{
public:
virtual void process_pdus() = 0;
};
// Combined interface for PHY to access stack (MAC and RRC) // Combined interface for PHY to access stack (MAC and RRC)
class stack_interface_phy_lte : public mac_interface_phy_lte, public rrc_interface_phy_lte class stack_interface_phy_lte : public mac_interface_phy_lte, public rrc_interface_phy_lte
{ {

32
srsue/hdr/stack/mac/mac.h
Unescape Escape View File

@ -51,7 +51,11 @@ class mac : public mac_interface_phy_lte,
public: public:
mac(srslte::log* log_); mac(srslte::log* log_);
~mac(); ~mac();
bool init(phy_interface_mac_lte* phy, rlc_interface_mac* rlc, rrc_interface_mac* rrc, srslte::timers* timers_); bool init(phy_interface_mac_lte* phy,
rlc_interface_mac* rlc,
rrc_interface_mac* rrc,
srslte::timers* timers_,
stack_interface_mac* stack);
void stop(); void stop();
void get_metrics(mac_metrics_t m[SRSLTE_MAX_CARRIERS]); void get_metrics(mac_metrics_t m[SRSLTE_MAX_CARRIERS]);
@ -98,6 +102,8 @@ public:
void get_rntis(ue_rnti_t* rntis); void get_rntis(ue_rnti_t* rntis);
void set_ho_rnti(uint16_t crnti, uint16_t target_pci); void set_ho_rnti(uint16_t crnti, uint16_t target_pci);
void process_pdus();
void start_pcap(srslte::mac_pcap* pcap); void start_pcap(srslte::mac_pcap* pcap);
// Timer callback interface // Timer callback interface
@ -119,9 +125,10 @@ private:
static const int MAC_PDU_THREAD_PRIO = 5; static const int MAC_PDU_THREAD_PRIO = 5;
// Interaction with PHY // Interaction with PHY
phy_interface_mac_lte *phy_h; phy_interface_mac_lte* phy_h = nullptr;
rlc_interface_mac *rlc_h; rlc_interface_mac* rlc_h = nullptr;
rrc_interface_mac *rrc_h; rrc_interface_mac* rrc_h = nullptr;
stack_interface_mac* stack_h = nullptr;
srslte::log* log_h; srslte::log* log_h;
mac_interface_phy_lte::mac_phy_cfg_mbsfn_t phy_mbsfn_cfg; mac_interface_phy_lte::mac_phy_cfg_mbsfn_t phy_mbsfn_cfg;
@ -172,23 +179,6 @@ private:
mac_metrics_t metrics[SRSLTE_MAX_CARRIERS] = {}; mac_metrics_t metrics[SRSLTE_MAX_CARRIERS] = {};
bool initialized = false; bool initialized = false;
/* Class to process MAC PDUs from DEMUX unit */
class pdu_process : public thread {
public:
explicit pdu_process(demux* demux_unit);
~pdu_process();
void notify();
void stop();
private:
void run_thread() final;
bool running = false;
bool have_data = false;
std::mutex mutex;
std::condition_variable cvar;
demux* demux_unit = nullptr;
};
pdu_process pdu_process_thread;
}; };
} // namespace srsue } // namespace srsue

6
srsue/hdr/stack/ue_stack_lte.h
Unescape Escape View File

@ -52,6 +52,7 @@ namespace srsue {
class ue_stack_lte final : public ue_stack_base, class ue_stack_lte final : public ue_stack_base,
public stack_interface_phy_lte, public stack_interface_phy_lte,
public stack_interface_gw, public stack_interface_gw,
public stack_interface_mac,
public thread public thread
{ {
public: public:
@ -111,6 +112,9 @@ public:
bool is_lcid_enabled(uint32_t lcid) final { return pdcp.is_lcid_enabled(lcid); } bool is_lcid_enabled(uint32_t lcid) final { return pdcp.is_lcid_enabled(lcid); }
// Interface to upper MAC
void process_pdus() final;
private: private:
void run_thread() final; void run_thread() final;
void run_tti_impl(uint32_t tti); void run_tti_impl(uint32_t tti);
@ -158,7 +162,7 @@ private:
void operator()() { func(this); } void operator()() { func(this); }
}; };
srslte::multiqueue_handler<task_t> pending_tasks; srslte::multiqueue_handler<task_t> pending_tasks;
int sync_queue_id = -1, ue_queue_id = -1, gw_queue_id = -1; int sync_queue_id = -1, ue_queue_id = -1, gw_queue_id = -1, mac_queue_id = -1;
}; };
} // namespace srsue } // namespace srsue

86
srsue/src/stack/mac/mac.cc
Unescape Escape View File

@ -37,13 +37,7 @@ using namespace asn1::rrc;
namespace srsue { namespace srsue {
mac::mac(srslte::log* log_) : mac::mac(srslte::log* log_) : mch_msg(10, log_), mux_unit(log_), demux_unit(log_), pcap(nullptr), log_h(log_)
pdu_process_thread(&demux_unit),
mch_msg(10, log_),
mux_unit(log_),
demux_unit(log_),
pcap(nullptr),
log_h(log_)
{ {
// Create PCell HARQ entities // Create PCell HARQ entities
auto ul = ul_harq_entity_ptr(new ul_harq_entity()); auto ul = ul_harq_entity_ptr(new ul_harq_entity());
@ -71,12 +65,17 @@ mac::~mac()
srslte_softbuffer_rx_free(&mch_softbuffer); srslte_softbuffer_rx_free(&mch_softbuffer);
} }
bool mac::init(phy_interface_mac_lte* phy, rlc_interface_mac* rlc, rrc_interface_mac* rrc, srslte::timers* timers_) bool mac::init(phy_interface_mac_lte* phy,
rlc_interface_mac* rlc,
rrc_interface_mac* rrc,
srslte::timers* timers_,
stack_interface_mac* stack_)
{ {
phy_h = phy; phy_h = phy;
rlc_h = rlc; rlc_h = rlc;
rrc_h = rrc; rrc_h = rrc;
timers = timers_; timers = timers_;
stack_h = stack_;
timer_alignment = timers->get_unique_id(); timer_alignment = timers->get_unique_id();
uint32_t contention_resolution_timer = timers->get_unique_id(); uint32_t contention_resolution_timer = timers->get_unique_id();
@ -107,7 +106,6 @@ bool mac::init(phy_interface_mac_lte* phy, rlc_interface_mac* rlc, rrc_interface
void mac::stop() void mac::stop()
{ {
if (initialized) { if (initialized) {
pdu_process_thread.stop();
run_tti(0); // make sure it's not locked after last TTI run_tti(0); // make sure it's not locked after last TTI
initialized = false; initialized = false;
} }
@ -388,7 +386,7 @@ void mac::mch_decoded(uint32_t len, bool crc)
} }
demux_unit.push_pdu_mch(mch_payload_buffer, len); demux_unit.push_pdu_mch(mch_payload_buffer, len);
pdu_process_thread.notify(); stack_h->process_pdus();
if (pcap) { if (pcap) {
pcap->write_dl_mch(mch_payload_buffer, len, true, phy_h->get_current_tti()); pcap->write_dl_mch(mch_payload_buffer, len, true, phy_h->get_current_tti());
} }
@ -415,7 +413,7 @@ void mac::tb_decoded(uint32_t cc_idx, mac_grant_dl_t grant, bool ack[SRSLTE_MAX_
} else { } else {
dl_harq.at(cc_idx)->tb_decoded(grant, ack); dl_harq.at(cc_idx)->tb_decoded(grant, ack);
pdu_process_thread.notify(); stack_h->process_pdus();
for (uint32_t tb = 0; tb < SRSLTE_MAX_CODEWORDS; tb++) { for (uint32_t tb = 0; tb < SRSLTE_MAX_CODEWORDS; tb++) {
if (grant.tb[tb].tbs) { if (grant.tb[tb].tbs) {
@ -461,6 +459,14 @@ void mac::new_grant_dl(uint32_t cc_idx,
} }
} }
void mac::process_pdus()
{
bool have_data = true;
while (initialized and have_data) {
have_data = demux_unit.process_pdus();
}
}
uint32_t mac::get_current_tti() uint32_t mac::get_current_tti()
{ {
return phy_h->get_current_tti(); return phy_h->get_current_tti();
@ -619,9 +625,7 @@ void mac::get_metrics(mac_metrics_t m[SRSLTE_MAX_CARRIERS])
int rx_brate = 0; int rx_brate = 0;
int ul_buffer = 0; int ul_buffer = 0;
float dl_avg_ret = 0; float dl_avg_ret = 0;
float ul_avg_ret = 0;
int dl_avg_ret_count = 0; int dl_avg_ret_count = 0;
int ul_avg_ret_count = 0;
for (uint32_t r = 0; r < dl_harq.size(); r++) { for (uint32_t r = 0; r < dl_harq.size(); r++) {
tx_pkts += metrics[r].tx_pkts; tx_pkts += metrics[r].tx_pkts;
@ -674,58 +678,4 @@ uint32_t mac::timer_get_unique_id()
return timers->get_unique_id(); return timers->get_unique_id();
} }
/******************************************************** } // namespace srsue
*
* Class that runs a thread to process DL MAC PDUs from
* DEMUX unit
*
*******************************************************/
mac::pdu_process::pdu_process(demux* demux_unit_) : thread("MAC_PDU_PROCESS"), demux_unit(demux_unit_)
{
running = true;
start(MAC_PDU_THREAD_PRIO);
}
mac::pdu_process::~pdu_process()
{
if (running) {
stop();
}
}
void mac::pdu_process::stop()
{
if (running) {
{
std::lock_guard<std::mutex> ul(mutex);
running = false;
cvar.notify_all();
}
wait_thread_finish();
}
}
void mac::pdu_process::notify()
{
std::unique_lock<std::mutex> ul(mutex);
have_data = true;
cvar.notify_all();
}
void mac::pdu_process::run_thread()
{
while(running) {
have_data = demux_unit->process_pdus();
if (!have_data) {
std::unique_lock<std::mutex> ul(mutex);
while(!have_data && running) {
cvar.wait(ul);
}
}
}
}
}

12
srsue/src/stack/ue_stack_lte.cc
Unescape Escape View File

@ -44,6 +44,7 @@ ue_stack_lte::ue_stack_lte() :
ue_queue_id = pending_tasks.add_queue(); ue_queue_id = pending_tasks.add_queue();
sync_queue_id = pending_tasks.add_queue(); sync_queue_id = pending_tasks.add_queue();
gw_queue_id = pending_tasks.add_queue(); gw_queue_id = pending_tasks.add_queue();
mac_queue_id = pending_tasks.add_queue();
} }
ue_stack_lte::~ue_stack_lte() ue_stack_lte::~ue_stack_lte()
@ -119,7 +120,7 @@ int ue_stack_lte::init(const stack_args_t& args_, srslte::logger* logger_)
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }
mac.init(phy, &rlc, &rrc, &timers); mac.init(phy, &rlc, &rrc, &timers, this);
rlc.init(&pdcp, &rrc, &timers, 0 /* RB_ID_SRB0 */); rlc.init(&pdcp, &rrc, &timers, 0 /* RB_ID_SRB0 */);
pdcp.init(&rlc, &rrc, gw); pdcp.init(&rlc, &rrc, gw);
nas.init(usim.get(), &rrc, gw, args.nas); nas.init(usim.get(), &rrc, gw, args.nas);
@ -269,4 +270,13 @@ void ue_stack_lte::run_tti_impl(uint32_t tti)
timers.step_all(); timers.step_all();
} }
/********************
* low MAC Interface
*******************/
void ue_stack_lte::process_pdus()
{
pending_tasks.push(mac_queue_id, task_t{[this](task_t*) { mac.process_pdus(); }});
}
} // namespace srsue } // namespace srsue

38
srsue/test/mac_test.cc
Unescape Escape View File

@ -326,6 +326,11 @@ public:
uint32_t rach_problem = 0; uint32_t rach_problem = 0;
}; };
class stack_dummy : public stack_interface_mac
{
void process_pdus() final {}
};
} // namespace srslte } // namespace srslte
int mac_unpack_test() int mac_unpack_test()
@ -361,10 +366,11 @@ int mac_unpack_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
// create dummy DL action and grant and push MAC PDU // create dummy DL action and grant and push MAC PDU
mac_interface_phy_lte::tb_action_dl_t dl_action; mac_interface_phy_lte::tb_action_dl_t dl_action;
@ -418,10 +424,11 @@ int mac_ul_sch_pdu_test1()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -486,10 +493,11 @@ int mac_ul_logical_channel_prioritization_test1()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -599,10 +607,11 @@ int mac_ul_logical_channel_prioritization_test2()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -699,10 +708,11 @@ int mac_ul_logical_channel_prioritization_test3()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -787,10 +797,11 @@ int mac_ul_sch_pdu_with_short_bsr_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -873,10 +884,11 @@ int mac_ul_sch_pdu_with_padding_bsr_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -968,10 +980,11 @@ int mac_ul_sch_pdu_one_byte_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -1028,10 +1041,11 @@ int mac_ul_sch_pdu_two_byte_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -1088,10 +1102,11 @@ int mac_ul_sch_pdu_three_byte_test()
phy_dummy phy; phy_dummy phy;
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// the actual MAC // the actual MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
const uint16_t crnti = 0x1001; const uint16_t crnti = 0x1001;
mac.set_ho_rnti(crnti, 0); mac.set_ho_rnti(crnti, 0);
@ -1331,6 +1346,7 @@ int mac_random_access_test()
phy.set_log(&phy_log); phy.set_log(&phy_log);
rlc_dummy rlc(&rlc_log); rlc_dummy rlc(&rlc_log);
rrc_dummy rrc; rrc_dummy rrc;
stack_dummy stack;
// Configure default RACH parameters // Configure default RACH parameters
asn1::rrc::rach_cfg_common_s rach_cfg = {}; asn1::rrc::rach_cfg_common_s rach_cfg = {};
@ -1344,7 +1360,7 @@ int mac_random_access_test()
// Configure MAC // Configure MAC
mac mac(&mac_log); mac mac(&mac_log);
mac.init(&phy, &rlc, &rrc, &timers); mac.init(&phy, &rlc, &rrc, &timers, &stack);
srslte::mac_cfg_t mac_cfg; srslte::mac_cfg_t mac_cfg;
set_mac_cfg_t_rach_cfg_common(&mac_cfg, rach_cfg); set_mac_cfg_t_rach_cfg_common(&mac_cfg, rach_cfg);
mac.set_config(mac_cfg); mac.set_config(mac_cfg);

Write Preview
Loading…
Cancel
Save