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

s1ap: run connect in background thread to avoid blocking

This commit is contained in:
Pedro Alvarez 2022-10-05 14:38:31 +01:00 committed by Andre Puschmann
parent dc8c85f330
commit 5d79e89a3d
2 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
srsenb/hdr/stack/s1ap/s1ap.h
View File

@ -108,7 +108,7 @@ public:
// Stack interface // Stack interface
bool bool
handle_mme_rx_msg(srsran::unique_byte_buffer_t pdu, const sockaddr_in& from, const sctp_sndrcvinfo& sri, int flags); handle_mme_rx_msg(srsran::unique_byte_buffer_t pdu, const sockaddr_in& from, const sctp_sndrcvinfo& sri, int flags);
void start_pcap(srsran::s1ap_pcap* pcap_); void start_pcap(srsran::s1ap_pcap* pcap_);
private: private:
@ -263,7 +263,7 @@ private:
bool was_uectxtrelease_requested() const { return release_requested; } bool was_uectxtrelease_requested() const { return release_requested; }
void void
set_state(s1ap_proc_id_t state, const erab_id_list& erabs_updated, const erab_item_list& erabs_failed_to_update); set_state(s1ap_proc_id_t state, const erab_id_list& erabs_updated, const erab_item_list& erabs_failed_to_update);
s1ap_proc_id_t get_state() const { return current_state; } s1ap_proc_id_t get_state() const { return current_state; }
ue_ctxt_t ctxt = {}; ue_ctxt_t ctxt = {};
@ -330,10 +330,14 @@ private:
bool success = false; bool success = false;
enum class cause_t { timeout, failure } cause; enum class cause_t { timeout, failure } cause;
}; };
struct s1connectresult {
bool success = false;
};
explicit s1_setup_proc_t(s1ap* s1ap_) : s1ap_ptr(s1ap_) {} explicit s1_setup_proc_t(s1ap* s1ap_) : s1ap_ptr(s1ap_) {}
srsran::proc_outcome_t init(); srsran::proc_outcome_t init();
srsran::proc_outcome_t step() { return srsran::proc_outcome_t::yield; } srsran::proc_outcome_t step() { return srsran::proc_outcome_t::yield; }
srsran::proc_outcome_t react(const s1connectresult& event);
srsran::proc_outcome_t react(const s1setupresult& event); srsran::proc_outcome_t react(const s1setupresult& event);
void then(const srsran::proc_state_t& result); void then(const srsran::proc_state_t& result);
const char* name() const { return "MME Connection"; } const char* name() const { return "MME Connection"; }

41
srsenb/src/stack/s1ap/s1ap.cc
View File

@ -237,23 +237,40 @@ srsran::proc_outcome_t s1ap::s1_setup_proc_t::start_mme_connection()
return srsran::proc_outcome_t::success; return srsran::proc_outcome_t::success;
} }
if (not s1ap_ptr->connect_mme()) { auto connect_callback = [this]() {
procInfo("Could not connect to MME"); bool connected = s1ap_ptr->connect_mme();
return srsran::proc_outcome_t::error;
}
if (not s1ap_ptr->setup_s1()) { auto notify_result = [this, connected]() {
procError("S1 setup failed. Exiting..."); s1_setup_proc_t::s1connectresult res;
srsran::console("S1 setup failed\n"); res.success = connected;
s1ap_ptr->running = false; s1ap_ptr->s1setup_proc.trigger(res);
return srsran::proc_outcome_t::error; };
} s1ap_ptr->task_sched.notify_background_task_result(notify_result);
};
srsran::get_background_workers().push_task(connect_callback);
s1ap_ptr->s1setup_timeout.run();
procInfo("S1SetupRequest sent. Waiting for response...");
return srsran::proc_outcome_t::yield; return srsran::proc_outcome_t::yield;
} }
srsran::proc_outcome_t s1ap::s1_setup_proc_t::react(const srsenb::s1ap::s1_setup_proc_t::s1connectresult& event)
{
if (event.success) {
procInfo("Connected to MME. Sending S1 setup request.");
s1ap_ptr->s1setup_timeout.run();
if (not s1ap_ptr->setup_s1()) {
procError("S1 setup failed. Exiting...");
srsran::console("S1 setup failed\n");
s1ap_ptr->running = false;
return srsran::proc_outcome_t::error;
}
procInfo("S1 setup request sent. Waiting for response.");
return srsran::proc_outcome_t::yield;
}
procInfo("Could not connected to MME. Aborting");
return srsran::proc_outcome_t::error;
}
srsran::proc_outcome_t s1ap::s1_setup_proc_t::react(const srsenb::s1ap::s1_setup_proc_t::s1setupresult& event) srsran::proc_outcome_t s1ap::s1_setup_proc_t::react(const srsenb::s1ap::s1_setup_proc_t::s1setupresult& event)
{ {
if (s1ap_ptr->s1setup_timeout.is_running()) { if (s1ap_ptr->s1setup_timeout.is_running()) {