chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added guard pattern

Browse Source
This commit is contained in:
Jordan Sherer 2019-11-17 01:30:37 -05:00
parent 6d6212a8c0
commit 26f16b5a99
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mainwindow.cpp
View File

@ -1574,7 +1574,7 @@ void MainWindow::initDecoderSubprocess(){
} }
//Create .lock so jt9 will wait //Create .lock so jt9 will wait
if(JS8_DEBUG_DECODE) qDebug() << "decoder lock open"; if(JS8_DEBUG_DECODE) qDebug() << "decoder lock create";
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.open(QIODevice::ReadWrite); QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.open(QIODevice::ReadWrite);
QStringList js8_args { QStringList js8_args {
@ -3560,7 +3560,7 @@ void MainWindow::closeEvent(QCloseEvent * e)
mem_js8->detach(); mem_js8->detach();
QFile quitFile {m_config.temp_dir ().absoluteFilePath (".quit")}; QFile quitFile {m_config.temp_dir ().absoluteFilePath (".quit")};
quitFile.open(QIODevice::ReadWrite); quitFile.open(QIODevice::ReadWrite);
if(JS8_DEBUG_DECODE) qDebug() << "decoder lock close"; if(JS8_DEBUG_DECODE) qDebug() << "decoder lock remove";
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove(); // Allow jt9 to terminate QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove(); // Allow jt9 to terminate
if(!proc_js8.isNull()){ if(!proc_js8.isNull()){
bool b=proc_js8->waitForFinished(1000); bool b=proc_js8->waitForFinished(1000);
@ -4452,7 +4452,7 @@ void MainWindow::decodeStart(){
memcpy(to, from, qMin(mem_js8->size(), size)); memcpy(to, from, qMin(mem_js8->size(), size));
} }
if(JS8_DEBUG_DECODE) qDebug() << "decoder lock close"; if(JS8_DEBUG_DECODE) qDebug() << "decoder lock remove";
lock.remove(); // Allow decoder to start lock.remove(); // Allow decoder to start
} }
@ -4481,16 +4481,16 @@ void MainWindow::decodeBusy(bool b) //decodeBusy()
*/ */
void MainWindow::decodeDone () void MainWindow::decodeDone ()
{ {
if(JS8_DEBUG_DECODE) qDebug() << "decoder lock open"; if(JS8_DEBUG_DECODE) qDebug() << "decoder lock create";
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.open(QIODevice::ReadWrite); QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.open(QIODevice::ReadWrite);
dec_data.params.newdat=0; dec_data.params.newdat=0;
dec_data.params.nagain=0; dec_data.params.nagain=0;
dec_data.params.ndiskdat=0; dec_data.params.ndiskdat=0;
m_nclearave=0; m_nclearave=0;
decodeBusy(false);
m_RxLog=0; m_RxLog=0;
m_blankLine=true; m_blankLine=true;
m_messageDupeCache.clear(); m_messageDupeCache.clear();
decodeBusy(false);
} }
/** /**
@ -4530,12 +4530,15 @@ void MainWindow::decodeCheckHangingDecoder(){
return; return;
} }
if(m_decoderBusyStartTime.isValid() && m_decoderBusyStartTime.secsTo(DriftingDateTime::currentDateTimeUtc()) > 60){ if(!m_decoderBusyStartTime.isValid() || m_decoderBusyStartTime.secsTo(DriftingDateTime::currentDateTimeUtc()) < 60){
return;
}
m_decoderBusyStartTime = QDateTime(); m_decoderBusyStartTime = QDateTime();
SelfDestructMessageBox * m = new SelfDestructMessageBox(60, SelfDestructMessageBox * m = new SelfDestructMessageBox(30,
"Decoder Hang", "Decoder Restart",
"The JS8 decoder is having trouble and is now restarting.", "The JS8 decoder is restarting.",
QMessageBox::Warning, QMessageBox::Warning,
QMessageBox::Ok, QMessageBox::Ok,
QMessageBox::Ok, QMessageBox::Ok,
@ -4545,7 +4548,6 @@ void MainWindow::decodeCheckHangingDecoder(){
m->show(); m->show();
initDecoderSubprocess(); initDecoderSubprocess();
}
} }
void MainWindow::writeAllTxt(QString message, int bits) void MainWindow::writeAllTxt(QString message, int bits)