BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix to normCast repeat feature

pull/56/head
bebopagogo 2021-09-28 19:53:57 -04:00
parent 12c729aaff
commit 4f6f663671
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
examples/normCast.cpp
View File

@ -246,9 +246,7 @@ void NormCaster::Destroy()
bool NormCaster::AddTxItem(const char* path) bool NormCaster::AddTxItem(const char* path)
{ {
bool result = tx_file_list.AppendPath(path); bool result = tx_file_list.AppendPath(path);
if (!result) if (!result) perror("NormCaster::AddTxItem() error");
perror("NormCaster::AddTxItem() error");
if (!TxFilePending()) StageNextTxFile();
return result; return result;
} // end NormCaster::AddTxItem() } // end NormCaster::AddTxItem()
@ -429,6 +427,15 @@ bool NormCaster::StageNextTxFile()
// Either done or need to reset tx_file_iterator // Either done or need to reset tx_file_iterator
tx_pending_path[0] = '\0'; tx_pending_path[0] = '\0';
tx_pending_prefix_len = 0; tx_pending_prefix_len = 0;
// We have reached end of tx_file_list, so either
// we're done or we reset tx_file_iterator (when 'repeat' option (TBD) is enabled)
if (repeat_interval >= 0.0)
{
timer_start.GetCurrentTime();
timer_delay = repeat_interval;
tx_file_iterator.Reset();
}
return false; return false;
} }
} // end NormCaster::StageNextTxFile() } // end NormCaster::StageNextTxFile()
@ -444,16 +451,8 @@ void NormCaster::HandleTimeout()
// Timer has expired.(currently repeat_interval is only timeout) // Timer has expired.(currently repeat_interval is only timeout)
timer_delay = -1.0; timer_delay = -1.0;
if (StageNextTxFile()) if (StageNextTxFile())
{
SendFiles(); SendFiles();
} // else repeat timer was reset
else
{
// No new files ready yet, reset repeat timeout
timer_delay = repeat_interval;
timer_start.GetCurrentTime();
tx_file_iterator.Reset();
}
} }
else else
{ {
@ -475,16 +474,6 @@ void NormCaster::SendFiles()
// Get next file name from our "tx_file_list" // Get next file name from our "tx_file_list"
if (!StageNextTxFile()) if (!StageNextTxFile())
{ {
// We have reached end of tx_file_list, so either
// we're done or we reset tx_file_iterator (when 'repeat' option (TBD) is enabled)
if (repeat_interval >= 0.0)
{
timer_start.GetCurrentTime();
timer_delay = repeat_interval;
tx_file_iterator.Reset();
return;
}
// If we're done and requesting ACK, finish up nicely with final waterrmark // If we're done and requesting ACK, finish up nicely with final waterrmark
if (norm_acking) if (norm_acking)
{ {
@ -1244,7 +1233,16 @@ int main(int argc, char* argv[])
// TBD - set NORM session parameters // TBD - set NORM session parameters
normCast.Start(send, recv); normCast.Start(send, recv);
if (normCast.TxFilePending() || updatesOnly) normCast.SendFiles(); if (send)
{
// This initiates repeat timer when there is no current files pending
//if ((repeatInterval >= 0.0) && !normCast.TxFilePending())
normCast.StageNextTxFile();
if (normCast.TxFilePending())
normCast.SendFiles();
}
#ifdef WIN32 #ifdef WIN32
//Win32InputHandler inputHandler; //Win32InputHandler inputHandler;