|
|
|
|
@ -148,6 +148,7 @@ Host::Host(const std::string& confFile) :
|
|
|
|
|
m_dmr2OverflowCnt(0U),
|
|
|
|
|
m_p25OverflowCnt(0U),
|
|
|
|
|
m_nxdnOverflowCnt(0U),
|
|
|
|
|
m_disableWatchdogOverflow(false),
|
|
|
|
|
m_restAddress("0.0.0.0"),
|
|
|
|
|
m_restPort(REST_API_DEFAULT_PORT),
|
|
|
|
|
m_RESTAPI(nullptr),
|
|
|
|
|
@ -1721,6 +1722,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
LogError(LOG_HOST, "PANIC; DMR, slot 1 Tx frame processor hung >%us, ms = %u", host->m_dmrTx1WatchdogTimer.getTimeout(), host->m_dmrTx1LoopMS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!host->m_disableWatchdogOverflow) {
|
|
|
|
|
if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace1() && host->m_dmr->isQueueFull(1U) &&
|
|
|
|
|
!host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) {
|
|
|
|
|
if (host->m_dmr1OverflowCnt > MAX_OVERFLOW_CNT) {
|
|
|
|
|
@ -1744,6 +1746,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
} else {
|
|
|
|
|
host->m_dmr1OverflowCnt = 0U;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (host->m_dmrTx2WatchdogTimer.isRunning())
|
|
|
|
|
host->m_dmrTx2WatchdogTimer.clock(ms);
|
|
|
|
|
@ -1752,6 +1755,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
LogError(LOG_HOST, "PANIC; DMR, slot 2 Tx frame processor hung >%us, ms = %u", host->m_dmrTx2WatchdogTimer.getTimeout(), host->m_dmrTx2LoopMS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!host->m_disableWatchdogOverflow) {
|
|
|
|
|
if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace2() && host->m_dmr->isQueueFull(2U) &&
|
|
|
|
|
!host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) {
|
|
|
|
|
if (host->m_dmr2OverflowCnt > MAX_OVERFLOW_CNT) {
|
|
|
|
|
@ -1776,6 +1780,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
host->m_dmr2OverflowCnt = 0U;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Project 25 */
|
|
|
|
|
if (host->m_p25 != nullptr) {
|
|
|
|
|
@ -1786,6 +1791,8 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
LogError(LOG_HOST, "PANIC; P25, Tx frame processor hung >%us, ms = %u", host->m_p25TxWatchdogTimer.getTimeout(), host->m_p25TxLoopMS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!host->m_disableWatchdogOverflow) {
|
|
|
|
|
LogDebug(LOG_HOST, "disableWatchdogOverflow = %u", host->m_disableWatchdogOverflow);
|
|
|
|
|
if (host->m_modem->gotModemStatus() && !host->m_modem->hasP25Space(P25DEF::P25_LDU_FRAME_LENGTH_BYTES) && host->m_p25->isQueueFull() &&
|
|
|
|
|
!host->m_p25CtrlChannel && !host->m_p25BcastDurationTimer.isRunning()) {
|
|
|
|
|
if (host->m_p25OverflowCnt > MAX_OVERFLOW_CNT) {
|
|
|
|
|
@ -1810,6 +1817,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
host->m_p25OverflowCnt = 0U;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** Next Generation Digital Narrowband */
|
|
|
|
|
if (host->m_nxdn != nullptr) {
|
|
|
|
|
@ -1820,6 +1828,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
LogError(LOG_HOST, "PANIC; NXDN, Tx frame processor hung >%us, ms = %u", host->m_nxdnTxWatchdogTimer.getTimeout(), host->m_nxdnTxLoopMS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!host->m_disableWatchdogOverflow) {
|
|
|
|
|
if (host->m_modem->gotModemStatus() && !host->m_modem->hasNXDNSpace() && host->m_nxdn->isQueueFull() &&
|
|
|
|
|
!host->m_nxdnCtrlChannel && !host->m_nxdnBcastDurationTimer.isRunning()) {
|
|
|
|
|
if (host->m_nxdnOverflowCnt > MAX_OVERFLOW_CNT) {
|
|
|
|
|
@ -1845,6 +1854,7 @@ void* Host::threadWatchdog(void* arg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// scope is intentional
|
|
|
|
|
{
|
|
|
|
|
|