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

metrics_hub: protect access to vector of metrics_listener 

prevent potential race between metrics hub thread trying
to access the metrics vector and another thread
adding another element to it
This commit is contained in:
Andre Puschmann 2020-10-07 09:50:08 +02:00
parent b43e724b4c
commit 30b8848ea9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/include/srslte/common/metrics_hub.h
View File

@ -31,6 +31,8 @@
#include "srslte/common/threads.h" #include "srslte/common/threads.h"
#include "srslte/srslte.h" #include "srslte/srslte.h"
#include <chrono> #include <chrono>
#include <mutex>
#include <thread>
#include <vector> #include <vector>
namespace srslte { namespace srslte {
@ -54,7 +56,7 @@ template <typename metrics_t>
class metrics_hub : public periodic_thread class metrics_hub : public periodic_thread
{ {
public: public:
metrics_hub() : m(nullptr), sleep_start(std::chrono::steady_clock::now()), periodic_thread("METRICS_HUB") {} metrics_hub() : sleep_start(std::chrono::steady_clock::now()), periodic_thread("METRICS_HUB") {}
bool init(metrics_interface<metrics_t>* m_, float report_period_secs_ = 1.0) bool init(metrics_interface<metrics_t>* m_, float report_period_secs_ = 1.0)
{ {
m = m_; m = m_;
@ -73,11 +75,17 @@ public:
wait_thread_finish(); wait_thread_finish();
} }
void add_listener(metrics_listener<metrics_t>* listener) { listeners.push_back(listener); } void add_listener(metrics_listener<metrics_t>* listener)
{
std::unique_lock<std::mutex> lock(mutex);
listeners.push_back(listener);
}
private: private:
void run_period() void run_period()
{ {
std::unique_lock<std::mutex> lock(mutex);
// get current time and check how long we slept // get current time and check how long we slept
auto period_usec = auto period_usec =
std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - sleep_start); std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - sleep_start);
@ -92,9 +100,10 @@ private:
// store start of sleep period // store start of sleep period
sleep_start = std::chrono::steady_clock::now(); sleep_start = std::chrono::steady_clock::now();
} }
metrics_interface<metrics_t>* m; metrics_interface<metrics_t>* m = nullptr;
std::vector<metrics_listener<metrics_t>*> listeners; std::vector<metrics_listener<metrics_t>*> listeners;
std::chrono::steady_clock::time_point sleep_start; std::chrono::steady_clock::time_point sleep_start;
std::mutex mutex;
}; };
} // namespace srslte } // namespace srslte