ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-07 19:34:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move the loop that waits for scheduled threads to finish out of advance_sim_time #292

Browse Source 
When we moved the thread sync code, a loop to clear all job complete flags was left out
causing unit test errors.
This commit is contained in:
Alex Lin 2016-08-29 08:42:53 -05:00
parent d388b26e30
commit e3759ac594
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
trick_source/sim_services/Executive/Executive_thread_sync.cpp
View File

@ -6,7 +6,7 @@
/**
@design
-# Loop through all threads
-# Loop through all child threads
-# If the thread is asynchronous must finish and the next sync time matches the sim time
-# Wait for the thread to finish
-# Reset the thread queue of jobs
@ -16,6 +16,7 @@
by multiples of the cycle time.
-# Reset the thread queue of jobs
-# clear all job complete flags
-# Set the job complete flag for all jobs on thread 0.
*/
int Trick::Executive::thread_sync() {
@ -53,6 +54,12 @@ int Trick::Executive::thread_sync() {
}
}
/* reset the job complete flags on thread 0 (master thread) */
threads[0]->job_queue.reset_curr_index();
while ( (curr_job = threads[0]->job_queue.find_job(time_tics)) != NULL ) {
curr_job->complete = false;
}
return(0) ;
}