ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 10:46:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/nasa/Trick

Browse Source
This commit is contained in:
John M. Penn 2015-08-04 17:14:37 -05:00
commit f5ca065756
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
trick_source/sim_services/Executive/Executive.cpp
View File

@ -272,17 +272,14 @@ void Trick::Executive::reset_job_call_times() {
unsigned int ii ;
for ( ii = 0 ; ii < all_jobs_vector.size() ; ii++ ) {
Trick::JobData * temp_job = all_jobs_vector[ii] ;
temp_job->start_tics = (long long)round((double)temp_job->start_tics / old_time_tic_value * time_tic_value) ;
temp_job->start_tics = (long long)round((double)temp_job->start_tics / old_time_tic_value * time_tic_value) + time_tics ;
if ( temp_job->disabled == false and
(!temp_job->system_job_class or !temp_job->job_class_name.compare("system_advance_sim_time")) ) {
if ( time_tics <= temp_job->start_tics ) {
if ( ! temp_job->job_class_name.compare("integ_loop")) {
temp_job->next_tics = time_tics + temp_job->cycle_tics + temp_job->start_tics ;
} else {
temp_job->next_tics = time_tics + temp_job->start_tics ;
}
if ( ! temp_job->job_class_name.compare("integ_loop")) {
temp_job->next_tics = temp_job->cycle_tics + temp_job->start_tics ;
} else {
temp_job->next_tics = time_tics + temp_job->cycle_tics ;
temp_job->next_tics = temp_job->start_tics ;
}
}
}
@ -348,9 +345,7 @@ int Trick::Executive::set_terminate_time(double in_time) {
}
int Trick::Executive::set_time(double in_time) {
sim_start = in_time ;
time_tics = (long long)(in_time * time_tic_value) ;
next_frame_check_tics = (long long)(time_tics + software_frame_tics) ;
for (unsigned int ii = 0 ; ii < threads.size() ; ii++ ) {
threads[ii]->curr_time_tics = time_tics ;
}

8
trick_source/sim_services/RealtimeSync/RealtimeSync.cpp
View File

@ -129,12 +129,14 @@ int Trick::RealtimeSync::initialize() {
start_sleep_timer();
if ( align_sim_to_wall_clock ) {
rt_clock->clock_reset(0) ;
rt_clock->sync_to_wall_clock( align_tic_mult , tics_per_sec ) ;
message_publish(MSG_INFO, "Syncing sim to %f second wall clock interval\n", align_tic_mult ) ;
rt_clock->clock_spin(0) ;
if ( exec_get_mode() == Freeze ) {
rt_clock->clock_spin(exec_get_freeze_time_tics()) ;
rt_clock->clock_reset(exec_get_freeze_time_tics()) ;
} else {
rt_clock->clock_spin(exec_get_time_tics()) ;
rt_clock->clock_reset(exec_get_time_tics()) ;
}
}
@ -203,7 +205,7 @@ int Trick::RealtimeSync::start_realtime(double in_frame_time , long long ref_tim
if ( active ) {
/* Only run in real time when sim time reaches 0.0 */
if (exec_get_time_tics() >= 0) {
if (ref_time >= 0) {
/* Reset the clock reference time to the desired reference time */
rt_clock->clock_reset(ref_time) ;