henry/EntityLibrary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ADD: added automatic delete of lost tracks

Browse Source
This commit is contained in:
Henry Winkel
2024-03-14 17:48:54 +01:00
parent d56df03ed4
commit 87368640e2
5 changed files with 128 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/Entities/Tracklist/Tracklist.hpp
View File

@@ -17,6 +17,7 @@
#include <string>
#include <thread>
#include <loguru.hpp>
#include <SimCore/CallBackTimer.hpp>
namespace TrackList
{
@@ -25,6 +26,10 @@ namespace TrackList
{
public:
TrackList();
~TrackList();
TrackList(const TrackList &other);
TrackList& operator=(const TrackList & oter);
void addTrack(std::shared_ptr<SimCore::SensorTrack> Track);
std::shared_ptr<SimCore::SensorTrack> getTrack(SimCore::Identifier);
@@ -36,12 +41,22 @@ namespace TrackList
void getJsonTRackList(nlohmann::json &message);
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> getTrackStore();
/**
* @brief cheks the trackstore for old tracks to delete
*
*/
void checkTrackStore();
private:
mutable std::mutex mx_;
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> TrackStore_;
/// seconds after the last updated a track gets deleted
const int trackNoUpdateTime = 10;
CallBackTimer timer_;
};

2
libs/KubeControl

Submodule libs/KubeControl updated: e38214f4d0...ada77d0e45

2
libs/OrderLibrary

Submodule libs/OrderLibrary updated: 20c1465b53...c72e6c0d8b

175
src/Entities/Tracklist/Tracklist.cpp
View File

@@ -1,4 +1,5 @@
#include <Entities/Tracklist/Tracklist.hpp>
#include <chrono>
#include "SimCore/Messages/SensorTrack.hpp"
#include "SimCore/Messages/SimTrack.hpp"
@@ -7,88 +8,126 @@
namespace TrackList
{
TrackList::TrackList()
{
TrackList::TrackList():mx_()
{
TrackStore_ = std::map<std::string, std::shared_ptr<SimCore::SensorTrack>>();
TrackStore_ = std::map<std::string, std::shared_ptr<SimCore::SensorTrack>>();
timer_.start(1000, std::bind(&TrackList::checkTrackStore,this));
}
TrackList::~TrackList()
{
if (timer_.is_running()) {
timer_.stop();
}
}
TrackList::TrackList(const TrackList &other):mx_()
{
this->TrackStore_ = other.TrackStore_;
}
TrackList& TrackList::operator=(const TrackList & other)
{
this->TrackStore_ = other.TrackStore_;
return *this;
}
void TrackList::addTrack(std::shared_ptr<SimCore::SensorTrack> Track)
{
std::lock_guard<std::mutex> lock(mx_);
auto [iterator, inserted] = TrackStore_.try_emplace(Track->getIdentifier().getUUID(),Track);
// LOG_S(INFO)<< Track->Name.getValue()<<" was: " << (inserted ? "inserted: " : "ignored: ");
if (!inserted) { TrackStore_[Track->getIdentifier().getUUID()] = Track; }
}
std::shared_ptr<SimCore::SensorTrack> TrackList::getTrack(const SimCore::Identifier ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID.getUUID());
return it->second;
}
std::shared_ptr<SimCore::SensorTrack> TrackList::getTrackBySringID(std::string ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID);
return it->second;
}
void TrackList::deleteTrack(std::string ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID);
TrackStore_.erase(it);
}
void TrackList::deleteTrack(SimCore::Identifier ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID.getUUID());
TrackStore_.erase(it);
}
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> TrackList::getTrackStore()
{
return TrackStore_;
}
void TrackList::addTrack(std::shared_ptr<SimCore::SensorTrack> Track)
void TrackList::getJsonTRackList(nlohmann::json &message)
{
std::lock_guard<std::mutex> lock(mx_);
try {
for (std::map<std::string, std::shared_ptr<SimCore::SensorTrack>>::iterator it=TrackStore_.begin(); it!=TrackStore_.end(); ++it)
{
nlohmann::json j;
j["id"] = it->first;
j["Name"] = it->second->Name.getValue();
j["Course"] = it->second->Course.getValue();
j["Speed"] = it->second->Speed.getValue();
j["External"] = false;
j["Position"] = {it->second->getPosition().getGeodesicPos()[SimCore::LATITUDE], it->second->getPosition().getGeodesicPos()[SimCore::LONGITUDE]};
j["Height"] = it->second->getPosition().getGeodesicPos()[SimCore::HEIGHT];
j["Type"] = SimCore::Kind::EntityKindMap[it->second->EntityKind.getValue()];
j["Side"] = SimCore::Side::EntitySideMap[it->second->EntitySide.getValue()];
message["Entities"].push_back(j);
}
}catch (const std::exception e) {
LOG_S(ERROR)<< e.what();
}
}
size_t TrackList::getSize()
{
std::lock_guard<std::mutex> lock(mx_);
auto [iterator, inserted] = TrackStore_.try_emplace(Track->getIdentifier().getUUID(),Track);
// LOG_S(INFO)<< Track->Name.getValue()<<" was: " << (inserted ? "inserted: " : "ignored: ");
if (!inserted) { TrackStore_[Track->getIdentifier().getUUID()] = Track; }
return TrackStore_.size();
}
std::shared_ptr<SimCore::SensorTrack> TrackList::getTrack(const SimCore::Identifier ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID.getUUID());
return it->second;
}
std::shared_ptr<SimCore::SensorTrack> TrackList::getTrackBySringID(std::string ID)
void TrackList::checkTrackStore()
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID);
return it->second;
}
void TrackList::deleteTrack(std::string ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID);
TrackStore_.erase(it);
}
void TrackList::deleteTrack(SimCore::Identifier ID)
{
std::lock_guard<std::mutex> lock(mx_);
auto it = TrackStore_.find(ID.getUUID());
TrackStore_.erase(it);
}
std::map<std::string, std::shared_ptr<SimCore::SensorTrack>> TrackList::getTrackStore()
{
return TrackStore_;
}
void TrackList::getJsonTRackList(nlohmann::json &message)
{
std::lock_guard<std::mutex> lock(mx_);
try {
for (std::map<std::string, std::shared_ptr<SimCore::SensorTrack>>::iterator it=TrackStore_.begin(); it!=TrackStore_.end(); ++it)
{
nlohmann::json j;
j["id"] = it->first;
j["Name"] = it->second->Name.getValue();
j["Course"] = it->second->Course.getValue();
j["Speed"] = it->second->Speed.getValue();
j["External"] = false;
j["Position"] = {it->second->getPosition().getGeodesicPos()[SimCore::LATITUDE], it->second->getPosition().getGeodesicPos()[SimCore::LONGITUDE]};
j["Height"] = it->second->getPosition().getGeodesicPos()[SimCore::HEIGHT];
j["Type"] = SimCore::Kind::EntityKindMap[it->second->EntityKind.getValue()];
j["Side"] = SimCore::Side::EntitySideMap[it->second->EntitySide.getValue()];
message["Entities"].push_back(j);
}
}catch (const std::exception e) {
LOG_S(ERROR)<< e.what();
for (auto [key, value] : TrackStore_)
{
// value->getSensorTrackMessage()
if(value->getLastUpdateTime() >= std::chrono::system_clock::now() + std::chrono::seconds(trackNoUpdateTime))
{
auto it = TrackStore_.find(key);
TrackStore_.erase(it);
}
}
}
size_t TrackList::getSize()
{
std::lock_guard<std::mutex> lock(mx_);
return TrackStore_.size();
}

4
tests/test_SensorManager.cpp
View File

@@ -242,7 +242,9 @@ SCENARIO("Testing the SimCore SensorManager with local sensors")
REQUIRE(SensorManager_->getTrackListUpdateRaw()->getSensors().size() == 4);
REQUIRE(SensorManager_->getTrackListUpdateRaw()->getSensors().at(0).getTracksCount() == 3);
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
std::this_thread::sleep_for(std::chrono::milliseconds(10000));
REQUIRE(SensorManager_->getTrackListUpdateRaw()->getSensors().at(0).getTracksCount() == 0);
SensorManager_->stop();