Digital_Voice_Modem_Project
/
dvmhost
mirror of https://github.com/DVMProject/dvmhost.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add support to disable watchdog overflow checking;

Browse Source
pull/69/head
Bryan Biedenkapp 2 years ago
parent d2fcea4885
commit 0673aac088
4 changed files with 83 additions and 64 deletions
Show Stats Download Patch File Download Diff File

2
configs/config.example.yml
Unescape View File

@ -338,6 +338,8 @@ system:
idleTickDelay: 5 idleTickDelay: 5
# Sets the local time offset from GMT. # Sets the local time offset from GMT.
localTimeOffset: 0 localTimeOffset: 0
# Flag indicating the watchdog overflow check should be disabled.
disableWatchdogOverflow: false
# #
# Location Information # Location Information

5
src/host/Host.Config.cpp
Unescape View File

@ -82,6 +82,8 @@ bool Host::readParams()
int8_t lto = (int8_t)systemConf["localTimeOffset"].as<int32_t>(0); int8_t lto = (int8_t)systemConf["localTimeOffset"].as<int32_t>(0);
m_disableWatchdogOverflow = systemConf["disableWatchdogOverflow"].as<bool>(false);
LogInfo("General Parameters"); LogInfo("General Parameters");
if (!udpMasterMode) { if (!udpMasterMode) {
LogInfo(" DMR: %s", m_dmrEnabled ? "enabled" : "disabled"); LogInfo(" DMR: %s", m_dmrEnabled ? "enabled" : "disabled");
@ -100,6 +102,9 @@ bool Host::readParams()
LogInfo(" Identity: %s", m_identity.c_str()); LogInfo(" Identity: %s", m_identity.c_str());
LogInfo(" Fixed Mode: %s", m_fixedMode ? "yes" : "no"); LogInfo(" Fixed Mode: %s", m_fixedMode ? "yes" : "no");
LogInfo(" Local Time Offset: %dh", lto); LogInfo(" Local Time Offset: %dh", lto);
if (m_disableWatchdogOverflow) {
LogInfo(" Disable Watchdog Overflow Check: yes");
}
yaml::Node systemInfo = systemConf["info"]; yaml::Node systemInfo = systemConf["info"];
m_latitude = systemInfo["latitude"].as<float>(0.0F); m_latitude = systemInfo["latitude"].as<float>(0.0F);

138
src/host/Host.cpp
Unescape View File

@ -148,6 +148,7 @@ Host::Host(const std::string& confFile) :
m_dmr2OverflowCnt(0U), m_dmr2OverflowCnt(0U),
m_p25OverflowCnt(0U), m_p25OverflowCnt(0U),
m_nxdnOverflowCnt(0U), m_nxdnOverflowCnt(0U),
m_disableWatchdogOverflow(false),
m_restAddress("0.0.0.0"), m_restAddress("0.0.0.0"),
m_restPort(REST_API_DEFAULT_PORT), m_restPort(REST_API_DEFAULT_PORT),
m_RESTAPI(nullptr), m_RESTAPI(nullptr),
@ -1721,28 +1722,30 @@ 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); LogError(LOG_HOST, "PANIC; DMR, slot 1 Tx frame processor hung >%us, ms = %u", host->m_dmrTx1WatchdogTimer.getTimeout(), host->m_dmrTx1LoopMS);
} }
if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace1() && host->m_dmr->isQueueFull(1U) && if (!host->m_disableWatchdogOverflow) {
!host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) { if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace1() && host->m_dmr->isQueueFull(1U) &&
if (host->m_dmr1OverflowCnt > MAX_OVERFLOW_CNT) { !host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) {
std::lock_guard<std::mutex> lock(m_clockingMutex); if (host->m_dmr1OverflowCnt > MAX_OVERFLOW_CNT) {
std::lock_guard<std::mutex> lock(m_clockingMutex);
LogError(LOG_HOST, "PANIC; DMR, has no DMR slot 1 FIFO space, and DMR slot 1 queue is full! Resetting states."); LogError(LOG_HOST, "PANIC; DMR, has no DMR slot 1 FIFO space, and DMR slot 1 queue is full! Resetting states.");
host->setState(STATE_IDLE); host->setState(STATE_IDLE);
host->m_modem->writeDMRStart(false); host->m_modem->writeDMRStart(false);
host->m_modem->clearDMRFrame1(); host->m_modem->clearDMRFrame1();
// respect the fixed mode state // respect the fixed mode state
if (host->m_fixedMode) { if (host->m_fixedMode) {
host->setState(STATE_DMR); host->setState(STATE_DMR);
} }
host->m_dmr1OverflowCnt = 0U; host->m_dmr1OverflowCnt = 0U;
} else {
host->m_dmr1OverflowCnt++;
}
} else { } else {
host->m_dmr1OverflowCnt++; host->m_dmr1OverflowCnt = 0U;
} }
} else {
host->m_dmr1OverflowCnt = 0U;
} }
if (host->m_dmrTx2WatchdogTimer.isRunning()) if (host->m_dmrTx2WatchdogTimer.isRunning())
@ -1752,28 +1755,30 @@ 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); LogError(LOG_HOST, "PANIC; DMR, slot 2 Tx frame processor hung >%us, ms = %u", host->m_dmrTx2WatchdogTimer.getTimeout(), host->m_dmrTx2LoopMS);
} }
if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace2() && host->m_dmr->isQueueFull(2U) && if (!host->m_disableWatchdogOverflow) {
!host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) { if (host->m_modem->gotModemStatus() && !host->m_modem->hasDMRSpace2() && host->m_dmr->isQueueFull(2U) &&
if (host->m_dmr2OverflowCnt > MAX_OVERFLOW_CNT) { !host->m_dmrCtrlChannel && !host->m_dmrBeaconDurationTimer.isRunning()) {
std::lock_guard<std::mutex> lock(m_clockingMutex); if (host->m_dmr2OverflowCnt > MAX_OVERFLOW_CNT) {
std::lock_guard<std::mutex> lock(m_clockingMutex);
LogError(LOG_HOST, "PANIC; DMR, has no DMR slot 2 FIFO space, and DMR slot 2 queue is full! Resetting states."); LogError(LOG_HOST, "PANIC; DMR, has no DMR slot 2 FIFO space, and DMR slot 2 queue is full! Resetting states.");
host->setState(STATE_IDLE); host->setState(STATE_IDLE);
host->m_modem->writeDMRStart(false); host->m_modem->writeDMRStart(false);
host->m_modem->clearDMRFrame2(); host->m_modem->clearDMRFrame2();
// respect the fixed mode state // respect the fixed mode state
if (host->m_fixedMode) { if (host->m_fixedMode) {
host->setState(STATE_DMR); host->setState(STATE_DMR);
} }
host->m_dmr2OverflowCnt = 0U; host->m_dmr2OverflowCnt = 0U;
} else {
host->m_dmr2OverflowCnt++;
}
} else { } else {
host->m_dmr2OverflowCnt++; host->m_dmr2OverflowCnt = 0U;
} }
} else {
host->m_dmr2OverflowCnt = 0U;
} }
} }
@ -1786,28 +1791,31 @@ void* Host::threadWatchdog(void* arg)
LogError(LOG_HOST, "PANIC; P25, Tx frame processor hung >%us, ms = %u", host->m_p25TxWatchdogTimer.getTimeout(), host->m_p25TxLoopMS); LogError(LOG_HOST, "PANIC; P25, Tx frame processor hung >%us, ms = %u", host->m_p25TxWatchdogTimer.getTimeout(), host->m_p25TxLoopMS);
} }
if (host->m_modem->gotModemStatus() && !host->m_modem->hasP25Space(P25DEF::P25_LDU_FRAME_LENGTH_BYTES) && host->m_p25->isQueueFull() && if (!host->m_disableWatchdogOverflow) {
!host->m_p25CtrlChannel && !host->m_p25BcastDurationTimer.isRunning()) { LogDebug(LOG_HOST, "disableWatchdogOverflow = %u", host->m_disableWatchdogOverflow);
if (host->m_p25OverflowCnt > MAX_OVERFLOW_CNT) { if (host->m_modem->gotModemStatus() && !host->m_modem->hasP25Space(P25DEF::P25_LDU_FRAME_LENGTH_BYTES) && host->m_p25->isQueueFull() &&
std::lock_guard<std::mutex> lock(m_clockingMutex); !host->m_p25CtrlChannel && !host->m_p25BcastDurationTimer.isRunning()) {
if (host->m_p25OverflowCnt > MAX_OVERFLOW_CNT) {
std::lock_guard<std::mutex> lock(m_clockingMutex);
LogError(LOG_HOST, "PANIC; P25, modem has no P25 FIFO space, and internal P25 queue is full! Resetting states."); LogError(LOG_HOST, "PANIC; P25, modem has no P25 FIFO space, and internal P25 queue is full! Resetting states.");
host->setState(STATE_IDLE); host->setState(STATE_IDLE);
host->m_modem->clearP25Frame(); host->m_modem->clearP25Frame();
host->m_p25->reset(); host->m_p25->reset();
// respect the fixed mode state // respect the fixed mode state
if (host->m_fixedMode) { if (host->m_fixedMode) {
host->setState(STATE_P25); host->setState(STATE_P25);
} }
host->m_p25OverflowCnt = 0U; host->m_p25OverflowCnt = 0U;
} else {
host->m_p25OverflowCnt++;
}
} else { } else {
host->m_p25OverflowCnt++; host->m_p25OverflowCnt = 0U;
} }
} else {
host->m_p25OverflowCnt = 0U;
} }
} }
@ -1820,28 +1828,30 @@ void* Host::threadWatchdog(void* arg)
LogError(LOG_HOST, "PANIC; NXDN, Tx frame processor hung >%us, ms = %u", host->m_nxdnTxWatchdogTimer.getTimeout(), host->m_nxdnTxLoopMS); LogError(LOG_HOST, "PANIC; NXDN, Tx frame processor hung >%us, ms = %u", host->m_nxdnTxWatchdogTimer.getTimeout(), host->m_nxdnTxLoopMS);
} }
if (host->m_modem->gotModemStatus() && !host->m_modem->hasNXDNSpace() && host->m_nxdn->isQueueFull() && if (!host->m_disableWatchdogOverflow) {
!host->m_nxdnCtrlChannel && !host->m_nxdnBcastDurationTimer.isRunning()) { if (host->m_modem->gotModemStatus() && !host->m_modem->hasNXDNSpace() && host->m_nxdn->isQueueFull() &&
if (host->m_nxdnOverflowCnt > MAX_OVERFLOW_CNT) { !host->m_nxdnCtrlChannel && !host->m_nxdnBcastDurationTimer.isRunning()) {
std::lock_guard<std::mutex> lock(m_clockingMutex); if (host->m_nxdnOverflowCnt > MAX_OVERFLOW_CNT) {
std::lock_guard<std::mutex> lock(m_clockingMutex);
LogError(LOG_HOST, "PANIC; NXDN, modem has no NXDN FIFO space, and NXDN queue is full! Resetting states."); LogError(LOG_HOST, "PANIC; NXDN, modem has no NXDN FIFO space, and NXDN queue is full! Resetting states.");
host->setState(STATE_IDLE); host->setState(STATE_IDLE);
host->m_modem->clearNXDNFrame(); host->m_modem->clearNXDNFrame();
host->m_nxdn->reset(); host->m_nxdn->reset();
// respect the fixed mode state // respect the fixed mode state
if (host->m_fixedMode) { if (host->m_fixedMode) {
host->setState(STATE_NXDN); host->setState(STATE_NXDN);
} }
host->m_nxdnOverflowCnt = 0U; host->m_nxdnOverflowCnt = 0U;
} else {
host->m_nxdnOverflowCnt++;
}
} else { } else {
host->m_nxdnOverflowCnt++; host->m_nxdnOverflowCnt = 0U;
} }
} else {
host->m_nxdnOverflowCnt = 0U;
} }
} }
} }

2
src/host/Host.h
Unescape View File

@ -207,6 +207,8 @@ private:
uint32_t m_p25OverflowCnt; uint32_t m_p25OverflowCnt;
uint32_t m_nxdnOverflowCnt; uint32_t m_nxdnOverflowCnt;
bool m_disableWatchdogOverflow;
static std::mutex m_clockingMutex; static std::mutex m_clockingMutex;
static uint8_t m_activeTickDelay; static uint8_t m_activeTickDelay;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.