Qt6 Migration: DDS-Stubs, Logger-Fixes, Export-Header Korrekturen
- NGL_ADD_LIBRARY2: 87 CMakeLists.txt konvertiert für Export-Header Generierung - 44 Export-Header Include-Pfade korrigiert (_export.h) - 81 DDS-Stub-Header generiert (*_dtc.h, *_fts.h, *_dts.h, *_ftc.h) - INGLLogger: Duplikat gelöscht, m_logger Member entfernt, variadische Makros - Q_FUNC_INFO Redefinition behoben (Qt6 definiert bereits) - FATAL_LOG Makro hinzugefügt - InfrastructureManagement DDS-Stubs (ism.hpp, ism_enums.hpp, ism_ftc.h) - FilterManagement DDS-Stubs (flt_ftc.h, flt_dts.h) - AreaEffectSimulation DDS-Stubs (aes.hpp, aes_enums.hpp) - SymbolAppearance Klasse vollständig definiert mit content() Methode - BuildingComponentFilter Klasse definiert mit Copy-Konstruktor - Ftc Factory: nullptr Return (abstract class) - AesFilter Klasse in aes.hpp hinzugefügt - Dtc Klasse in ppm.hpp mit participantChanged Signal - AesType Enum: alle 15 At* Werte definiert - AesEffectState_def: EsReceived hinzugefügt - DataModification Enum: eAdded/eModified/eRemoved - function_reply_object.h → core_types.h Include-Pfad (72 Dateien) - Enum-Class-Streaming Template-Operator in INGLLogger.h - ism_mounting_point.h: QImage → QtGui/QImage, QGuiApplication/QScreen - ism_data_plugin_interface.h: QSet Include, Include-Reihenfolge - QRegExp → QRegularExpression in tpm_js_parser.cpp - .underlying() Aufrufe zu direktem Enum-Vergleich korrigiert - Include-Pfade: aes.hpp in symbol_appearance_settings_impl.h und aes_display_filter_impl.h Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
2785 files changed
+18754
-18316
No files matched your search
@@ -35,7 +35,6 @@ PrtCnvBroadcastMgr::PrtCnvBroadcastMgr()
|
||||
, m_IsFullLoad(false)
|
||||
, m_FinishedBroadcastIndex(0)
|
||||
, m_FirstBroadcastIndexOfBc1(0)
|
||||
, m_logger(getLogger("PrtCnvBroadcastMgr"))
|
||||
, m_loggerBcRequest(getLogger("PrtCnvBroadcastMgr.BcRequest"))
|
||||
{
|
||||
}
|
||||
@@ -164,7 +163,7 @@ void PrtCnvBroadcastMgr::handleNachforderungBroadcastTelegram(int identity, int
|
||||
m_claimerArray.emplace_back(identity, broadcastIndex);
|
||||
return;
|
||||
}
|
||||
WARNING_LOG(m_logger) << "NachforderungBroadcast from TNE with id=" << identity
|
||||
WARNING_LOG() << "NachforderungBroadcast from TNE with id=" << identity
|
||||
<< ": resetCounter different we have: " << int(m_DbThread->getResetCounter())
|
||||
<< "; TNE has: " << resetCounter << " => discarded";
|
||||
}
|
||||
@@ -181,7 +180,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::getNextBr
|
||||
|
||||
|
||||
|
||||
DEBUG_LOG(m_logger) << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
|
||||
DEBUG_LOG() << "getNextBroadcastTelegramToSend, startIdx: " << a_beginSearchWithBroadcastIndex;
|
||||
auto iter = m_BroadcastMap.upper_bound(0 == a_beginSearchWithBroadcastIndex ? m_FinishedBroadcastIndex : a_beginSearchWithBroadcastIndex);
|
||||
while (iter != m_BroadcastMap.end())
|
||||
{
|
||||
@@ -319,7 +318,7 @@ void PrtCnvBroadcastMgr::removeExpiredTelegrams()
|
||||
return;
|
||||
|
||||
auto radioTelegram = iter->second;
|
||||
INFO_LOG(m_logger) << "Remove expired telegram with telId=" << radioTelegram->getTelID()
|
||||
INFO_LOG() << "Remove expired telegram with telId=" << radioTelegram->getTelID()
|
||||
<< " and BC=" << radioTelegram->getBroadcastIndex() << " from BC-list";
|
||||
uint16_t wirkfeldKennung = radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
removeWirkfeldTelegrams(wirkfeldKennung);
|
||||
@@ -536,7 +535,7 @@ std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> PrtCnvBroadcastMgr::createAcc
|
||||
const int idsToSendNow = m_activatedDusMines.size();
|
||||
if (idsToSendNow > 500)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "More than 500 activated DUS mines in system - this is not allowed!";
|
||||
WARNING_LOG() << "More than 500 activated DUS mines in system - this is not allowed!";
|
||||
Q_ASSERT(false);
|
||||
return {};
|
||||
}
|
||||
@@ -670,7 +669,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
|
||||
if (!radioTelegram)
|
||||
break;
|
||||
broadcastIndex = radioTelegram->getBroadcastIndex();
|
||||
INFO_LOG(m_logger) << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
|
||||
INFO_LOG() << "Move Broadcast-telegram from DbThread>BroadcastMgr with telId="
|
||||
<< radioTelegram->getTelID() << " BC=" << broadcastIndex;
|
||||
dumpTelegram(m_logger, broadcastIndex, radioTelegram.get());
|
||||
|
||||
@@ -697,7 +696,7 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
|
||||
static int iBroadcastDumpCounter = 0;
|
||||
if ((iBroadcastDumpCounter++ % 30) == 0)
|
||||
{
|
||||
DEBUG_LOG(m_logger) << "Dumping broadcast map:";
|
||||
DEBUG_LOG() << "Dumping broadcast map:";
|
||||
for (const auto &it : m_BroadcastMap)
|
||||
dumpTelegram(m_logger, it.first, it.second.get());
|
||||
}
|
||||
@@ -718,14 +717,14 @@ void PrtCnvBroadcastMgr::getAllFinishedBroadcastsFromDb(const bool a_doRestore)
|
||||
|
||||
void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
|
||||
INFO_LOG() << "Move from radioList to bcList: BC=" << a_radioTelegram->getBroadcastIndex()
|
||||
<< " telID=" << a_radioTelegram->getTelID();
|
||||
switch (a_radioTelegram->getTelID())
|
||||
{
|
||||
|
||||
case GEF_INIT:
|
||||
case GEF_UMGEBUNGS_MELDUNG2:
|
||||
ERROR_LOG(m_logger) << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
|
||||
ERROR_LOG() << "Internal error: telegram with telId=" << a_radioTelegram->getTelID() << " should never be a normal broadcast";
|
||||
break;
|
||||
|
||||
case GEF_DATENVERKEHR_TDS_SRT:
|
||||
@@ -755,11 +754,11 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
{
|
||||
|
||||
const uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
INFO_LOG(m_logger) << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
|
||||
INFO_LOG() << "Adding to braodcast map, Telegram Id: " << a_radioTelegram->getTelID()
|
||||
<< ", kennung: " << wirkfeldKennung;
|
||||
if (isEffectSimulationIdDeactivated(wirkfeldKennung))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
|
||||
INFO_LOG() << "Got tele with tel id " << telegramId2String(a_radioTelegram->getTelID())
|
||||
<< ", wirkfeldkennung: " << wirkfeldKennung << ", bcIndex: " << a_radioTelegram->getBroadcastIndex()
|
||||
<< " but this effect simulation is already deactivated... ignoring";
|
||||
dumpTelegram(m_logger, a_radioTelegram->getBroadcastIndex(), a_radioTelegram.get());
|
||||
@@ -797,7 +796,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
else
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
|
||||
ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -806,7 +805,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
{
|
||||
auto wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
|
||||
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
|
||||
INFO_LOG(m_logger) << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
|
||||
INFO_LOG() << "addToBroadcastMap - Wirkfeld Aenderung Bezeichner for type "
|
||||
<< wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
|
||||
<< wirkfeldKennung;
|
||||
addWirkfeldTelegram(a_radioTelegram, wirkfeldKennung);
|
||||
@@ -816,7 +815,7 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
{
|
||||
auto wirkfeldTyp = static_cast<TrainingAreaBase::TetraIcd::AreaEffectSimulationType>(a_radioTelegram->getPayloadDataUInt32(5, 1));
|
||||
uint16_t wirkfeldKennung = a_radioTelegram->getPayloadDataUInt32(6, 2);
|
||||
INFO_LOG(m_logger) << "Deaktivierung Wirkfeld for type "
|
||||
INFO_LOG() << "Deaktivierung Wirkfeld for type "
|
||||
<< wirkfeldTyp2Str(wirkfeldTyp) << " - kennung: "
|
||||
<< wirkfeldKennung << ", bc: " << a_radioTelegram->getBroadcastIndex();
|
||||
switch (wirkfeldTyp)
|
||||
@@ -839,13 +838,13 @@ void PrtCnvBroadcastMgr::addToBroadcastMap(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
else
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "Internal error: Got invalid kennung: " << wirkfeldKennung;
|
||||
ERROR_LOG() << "Internal error: Got invalid kennung: " << wirkfeldKennung;
|
||||
}
|
||||
break;
|
||||
case TrainingAreaBase::TetraIcd::AreaEffectSimulationType::FunctionalArea:
|
||||
default:
|
||||
|
||||
ERROR_LOG(m_logger) << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
|
||||
ERROR_LOG() << "Internal error: WirkfeldTyp " << wirkfeldTyp2Str(wirkfeldTyp) << " in GEF_DEAKTIVIERUNG_WIRKFELD not implemented";
|
||||
}
|
||||
m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
|
||||
break;
|
||||
@@ -1000,7 +999,7 @@ int PrtCnvBroadcastMgr::getSammeltelegramIndex(const std::shared_ptr<N_CoPrtCnv:
|
||||
nbrLength = 2;
|
||||
break;
|
||||
default:
|
||||
ERROR_LOG(m_logger) << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
|
||||
ERROR_LOG() << "Unknown Sammeltelegram with telId=" << a_sammelTelegram->getTelID();
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1028,7 +1027,7 @@ void PrtCnvBroadcastMgr::deactivateSingleMine(const std::shared_ptr<N_CoPrtCnv::
|
||||
{
|
||||
removeFromActivatedDusMine(minenkennung);
|
||||
addToDeactivatedDusMine(minenkennung, a_radioTelegram->getBroadcastIndex());
|
||||
DEBUG_LOG(m_logger) << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
|
||||
DEBUG_LOG() << "Deactivating DUS-Mine: " << minenkennung << ", #deactivated mines: " << m_deactivatedBcIndex2DusMine.size();
|
||||
removeDusMineDeactivationFromBroadcastMap(minenkennung);
|
||||
m_BroadcastMap.insert(std::make_pair(a_radioTelegram->getBroadcastIndex(), a_radioTelegram));
|
||||
}
|
||||
@@ -1096,24 +1095,24 @@ bool PrtCnvBroadcastMgr::deactivateEinzelmineFromMinensperre(const uint16_t a_wi
|
||||
bool dummy;
|
||||
if (radioTelegram->mustBeSentAsBroadcast(std::numeric_limits<time_t>::max(), dummy, false))
|
||||
{
|
||||
INFO_LOG(m_logger) << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
|
||||
INFO_LOG() << "A normal broadcast-telegram WirkfeldStatusMinensperre still exists";
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
|
||||
ERROR_LOG() << "Got corrupt telegram WirkfeldstatusMinensperre with nbrOfMines=" << nbrOfMines << " and payloadSize=" << radioTelegram->getPayloadSize();
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
ERROR_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
|
||||
ERROR_LOG() << "Mine with kennung=" << a_minenKennung << " does not fit into status (nbrOfMines=" << nbrOfMines << ")";
|
||||
}
|
||||
return true;
|
||||
}
|
||||
++iter;
|
||||
}
|
||||
ERROR_LOG(m_logger) << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
|
||||
ERROR_LOG() << "Did not find the WirkfeldStatusMinensperre with kennung=" << a_wirkfeldKennung
|
||||
<< ", therefore deactivated mine with kennung=" << a_minenKennung << " could not be updated.";
|
||||
return true;
|
||||
}
|
||||
@@ -1128,7 +1127,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
|
||||
const uint32_t nbrOfMines = a_radioTelegram->getPayloadDataUInt32(5, 2);
|
||||
|
||||
DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
|
||||
DEBUG_LOG() << "Reactivating DUS-Mines, #mines: " << nbrOfMines;
|
||||
if (0 == nbrOfMines)
|
||||
{
|
||||
|
||||
@@ -1146,7 +1145,7 @@ void PrtCnvBroadcastMgr::reactivateDusMine(const std::shared_ptr<N_CoPrtCnv::CoP
|
||||
for (uint32_t i = 0; i < nbrOfMines; i++)
|
||||
{
|
||||
const int dusMineId = a_radioTelegram->getPayloadDataUInt32(7 + 2 * i, 2);
|
||||
DEBUG_LOG(m_logger) << "Reactivating DUS-Mines, mindId: " << dusMineId;
|
||||
DEBUG_LOG() << "Reactivating DUS-Mines, mindId: " << dusMineId;
|
||||
removeDusMineDeactivationFromBroadcastMap(dusMineId);
|
||||
removeFromDeactivatedDusMine(dusMineId);
|
||||
addToActivatedDusMine(dusMineId);
|
||||
@@ -1188,11 +1187,11 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
|
||||
{
|
||||
uint16_t mineIndex = radioTelegram->getPayloadDataUInt32(11, 2);
|
||||
isSameMine = mineIndex == a_minenKennung;
|
||||
INFO_LOG(m_logger) << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
|
||||
INFO_LOG() << "Mine with kennung=" << a_minenKennung << " found: " << isSameMine;
|
||||
}
|
||||
}
|
||||
else
|
||||
ERROR_LOG(m_logger) << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
|
||||
ERROR_LOG() << "Internal error: Only telegrams 'Deaktivierung_Einzelmine' must be called with a_mineKennung. I proceed without respecting mine-kennung...";
|
||||
}
|
||||
|
||||
if ((radioTelegram->getTelID() == a_radioTelegram->getTelID() || radioTelegram->getTelID() == a_telId) && isSameMine)
|
||||
@@ -1206,7 +1205,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
|
||||
}
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "Add kennung: " << a_wirkfeldKennung
|
||||
INFO_LOG() << "Add kennung: " << a_wirkfeldKennung
|
||||
<< " telId=" << a_radioTelegram->getTelID()
|
||||
<< " BC=" << a_radioTelegram->getBroadcastIndex();
|
||||
m_WirkfeldTelegramMapByKennung.insert(std::make_pair(a_wirkfeldKennung, a_radioTelegram));
|
||||
@@ -1224,7 +1223,7 @@ void PrtCnvBroadcastMgr::addWirkfeldTelegram(const std::shared_ptr<N_CoPrtCnv::C
|
||||
|
||||
void PrtCnvBroadcastMgr::removeWirkfeldTelegrams(const uint16_t a_kennung)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
|
||||
INFO_LOG() << "Removing all Wirkfeld-Telegrams with kennung=" << a_kennung;
|
||||
|
||||
auto iter = m_WirkfeldTelegramMapByKennung.find(a_kennung);
|
||||
while (iter != m_WirkfeldTelegramMapByKennung.end())
|
||||
@@ -1256,7 +1255,7 @@ void PrtCnvBroadcastMgr::removeFromFunktionsAndBroadcastMaps(const uint16_t a_fu
|
||||
auto radioTelegram = iter->second;
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
|
||||
INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
|
||||
<< " and BC=" << radioTelegram->getBroadcastIndex();
|
||||
m_FunktionsraumTelegramMap.erase(iter);
|
||||
|
||||
@@ -1282,7 +1281,7 @@ void PrtCnvBroadcastMgr::removeFromTechnikFunktionsAndBroadcastMaps(const uint16
|
||||
auto radioTelegram = iter->second;
|
||||
|
||||
|
||||
INFO_LOG(m_logger) << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
|
||||
INFO_LOG() << "Removing Funktionsraum-telegram with kennung=" << a_funktionsraumKennung
|
||||
<< " and BC=" << radioTelegram->getBroadcastIndex();
|
||||
m_TechnikFunktionsraumTelegramMap.erase(iter);
|
||||
|
||||
@@ -1306,7 +1305,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
|
||||
{
|
||||
auto radioTelegram = a_wirkfeldTelegramMapByKennungIterator->second;
|
||||
|
||||
INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
|
||||
INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
|
||||
<< ", kennung=" << a_wirkfeldTelegramMapByKennungIterator->first
|
||||
<< " and BC=" << radioTelegram->getBroadcastIndex()
|
||||
<< " from byWirkfeldKennung-map";
|
||||
@@ -1323,7 +1322,7 @@ void PrtCnvBroadcastMgr::removeFromWirkfeldAndBroadcastMaps(const std::multimap<
|
||||
{
|
||||
if (iter->second == radioTelegram)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
|
||||
INFO_LOG() << "Removing wirkfeld-telegram with telId=" << radioTelegram->getTelID()
|
||||
<< " also from byTime-map";
|
||||
m_WirkfeldTelegramMapByTime.erase(iter);
|
||||
break;
|
||||
@@ -1413,7 +1412,7 @@ void removeFromMap(T &cont, const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTeleg
|
||||
|
||||
void PrtCnvBroadcastMgr::removeFromAllMaps(const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_radioTelegram)
|
||||
{
|
||||
INFO_LOG(m_logger) << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
|
||||
INFO_LOG() << "Remove telegram with telId=" << a_radioTelegram->getTelID() << " BC=" << a_radioTelegram->getBroadcastIndex();
|
||||
|
||||
removeFromBroadcastMap(a_radioTelegram);
|
||||
|
||||
@@ -1442,7 +1441,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
|
||||
{
|
||||
auto lastRadioTelegram = iter->second;
|
||||
|
||||
INFO_LOG(m_logger) << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
|
||||
INFO_LOG() << "remove last telegram with telId=" << lastRadioTelegram->getTelID()
|
||||
<< " and BC=" << lastRadioTelegram->getBroadcastIndex();
|
||||
removeFromBroadcastMap(lastRadioTelegram);
|
||||
m_LastTelegramMap.erase(iter);
|
||||
@@ -1451,7 +1450,7 @@ void PrtCnvBroadcastMgr::replaceLastTelegramAndAddAtEnd(const std::shared_ptr<N_
|
||||
m_BroadcastMap.insert(std::make_pair(a_newRadioTelegram->getBroadcastIndex(), a_newRadioTelegram));
|
||||
|
||||
m_LastTelegramMap.insert(std::make_pair(a_newRadioTelegram->getTelID(), a_newRadioTelegram));
|
||||
INFO_LOG(m_logger) << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
|
||||
INFO_LOG() << "New last telegram with with telId=" << a_newRadioTelegram->getTelID()
|
||||
<< " and BC=" << a_newRadioTelegram->getBroadcastIndex();
|
||||
}
|
||||
|
||||
@@ -1470,7 +1469,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
|
||||
const std::shared_ptr<N_CoPrtCnv::CoPrtCnvRadioTelegram> &a_attachTelegram)
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "Move telId=" << a_radioTelegram->getTelID()
|
||||
INFO_LOG() << "Move telId=" << a_radioTelegram->getTelID()
|
||||
<< " from BC=" << a_radioTelegram->getBroadcastIndex()
|
||||
<< " to BC=" << a_newBroadcastIndex;
|
||||
removeFromBroadcastMap(a_radioTelegram);
|
||||
@@ -1480,7 +1479,7 @@ void PrtCnvBroadcastMgr::moveTelegramInBroadcastMap(const std::shared_ptr<N_CoPr
|
||||
|
||||
if (a_attachTelegram && (a_attachTelegram->getTelID() != GEF_REAKTIVIERUNG_DUS_MINE))
|
||||
{
|
||||
INFO_LOG(m_logger) << "Attach telID=" << a_attachTelegram->getTelID()
|
||||
INFO_LOG() << "Attach telID=" << a_attachTelegram->getTelID()
|
||||
<< " to telID=" << a_radioTelegram->getTelID()
|
||||
<< " BC=" << a_newBroadcastIndex;
|
||||
a_radioTelegram->setBroadcastonlyTelegram(a_attachTelegram);
|
||||
@@ -1535,7 +1534,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
|
||||
if (m_BroadcastMap.end() == iter)
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
|
||||
INFO_LOG() << "Insert telId=" << a_broadcastOnlyTelegram->getTelID()
|
||||
<< " as broadcastonly telegram with BC=" << broadcastIndex;
|
||||
a_broadcastOnlyTelegram->setBroadcastOnly();
|
||||
m_BroadcastMap.insert(std::make_pair(broadcastIndex, a_broadcastOnlyTelegram));
|
||||
@@ -1543,7 +1542,7 @@ void PrtCnvBroadcastMgr::addBroadcastOnlyTelegramToMap(const std::shared_ptr<N_C
|
||||
else
|
||||
{
|
||||
|
||||
INFO_LOG(m_logger) << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
|
||||
INFO_LOG() << "Add telId=" << a_broadcastOnlyTelegram->getTelID()
|
||||
<< " as broadcastonly telegram to telegramm with BC=" << iter->second->getBroadcastIndex();
|
||||
iter->second->setBroadcastonlyTelegram(a_broadcastOnlyTelegram);
|
||||
}
|
||||
@@ -1561,15 +1560,15 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
|
||||
{
|
||||
uint16_t broadcastIndex = a_radioTelegram->getBroadcastIndex();
|
||||
|
||||
INFO_LOG(m_logger) << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
|
||||
INFO_LOG() << "detach bconly-telegram : telId=" << a_radioTelegram->getTelID() << " BC=" << broadcastIndex;
|
||||
if (broadcastOnlyTelegram->getBroadcastIndex() != broadcastIndex)
|
||||
ERROR_LOG(m_logger) << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
|
||||
ERROR_LOG() << "Internal error: BC=" << broadcastOnlyTelegram->getBroadcastIndex() << " of attached telegram is not equal BC=" << broadcastIndex;
|
||||
auto iter = m_BroadcastMap.find(broadcastIndex);
|
||||
if (iter != m_BroadcastMap.end())
|
||||
ERROR_LOG(m_logger) << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
|
||||
ERROR_LOG() << "Internal error: m_BroadcastMap-entry with BC=" << broadcastIndex << " must not exists";
|
||||
else
|
||||
{
|
||||
INFO_LOG(m_logger) << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
|
||||
INFO_LOG() << "Insert broadcast-only BC=" << broadcastOnlyTelegram->getBroadcastIndex();
|
||||
broadcastOnlyTelegram->setBroadcastOnly();
|
||||
m_BroadcastMap.insert(std::make_pair(broadcastIndex, broadcastOnlyTelegram));
|
||||
}
|
||||
@@ -1584,7 +1583,7 @@ void PrtCnvBroadcastMgr::detachTelegram(const std::shared_ptr<N_CoPrtCnv::CoPrtC
|
||||
|
||||
void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
|
||||
{
|
||||
WARNING_LOG(m_logger) << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
|
||||
WARNING_LOG() << "Broadcast-counter reaches maximum => reduce broadcast-list and increment reset-counter";
|
||||
|
||||
|
||||
|
||||
@@ -1632,7 +1631,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
|
||||
}
|
||||
++iter;
|
||||
}
|
||||
INFO_LOG(m_logger) << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
|
||||
INFO_LOG() << "New BC-index for broadcast-telegram with telId=" << radioTelegram->getTelID() << " BC=" << newBroadcastCounter;
|
||||
newBroadcastMap.insert(std::make_pair(newBroadcastCounter, radioTelegram));
|
||||
}
|
||||
}
|
||||
@@ -1643,7 +1642,7 @@ void PrtCnvBroadcastMgr::handleOverrunOfBroadcastCounter(const bool a_doRestore)
|
||||
cleanAndInit(false);
|
||||
if (!a_doRestore) m_DbThread->setResetCounter(m_DbThread->getResetCounter() + 1);
|
||||
|
||||
WARNING_LOG(m_logger) << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
|
||||
WARNING_LOG() << "New broadcast-counter=" << newBroadcastCounter << " new reset-counter=" << (int)m_DbThread->getResetCounter();
|
||||
m_BroadcastIndex = newBroadcastCounter;
|
||||
}
|
||||
|
||||
@@ -1703,7 +1702,7 @@ void PrtCnvBroadcastMgr::incTickAndSetTrafficLoad(const bool a_isHighLoad, const
|
||||
|
||||
bool PrtCnvBroadcastMgr::isEffectSimulationIdDeactivated(const uint16_t effectsimulationId) const
|
||||
{
|
||||
INFO_LOG(m_logger) << "Checking deactivation for Id " << effectsimulationId;
|
||||
INFO_LOG() << "Checking deactivation for Id " << effectsimulationId;
|
||||
return m_deactivatedAesArea2bcIndex.contains(effectsimulationId);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user