ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow integ_loop, logging, data_record to be reordered (#1472)

Browse Source
This commit is contained in:
Jacqueline Deans 2023-03-10 10:20:33 -06:00 committed by GitHub
parent 1f1c2484d1
commit 02a1f95121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libexec/trick/pm/parse_s_define.pm
View File

@ -20,8 +20,6 @@ use Text::Balanced qw(extract_bracketed);
use html ; use html ;
use get_paths ; use get_paths ;
no warnings ;
my ($integ_loop_def , $collect_def , $vcollect_def); my ($integ_loop_def , $collect_def , $vcollect_def);
my ($job_class_order_def ) ; my ($job_class_order_def ) ;
my ($sim_class_def , $sim_class_job_def , $instantiation_def , $create_connections_def) ; my ($sim_class_def , $sim_class_job_def , $instantiation_def , $create_connections_def) ;
@ -945,9 +943,6 @@ sub preparse_job_class_order($$) {
return ; return ;
} }
# Scheduled loop classes that should not be reordered
my @non_reorderable_classes = qw(logging data_record system_checkpoint system_advance_sim_time system_moding integ_loop);
# get a list of classes # get a list of classes
($class_text) = @{$job_class_order_structs}[0] =~ /{(.*?)}/sx ; ($class_text) = @{$job_class_order_structs}[0] =~ /{(.*?)}/sx ;
$class_text =~ s/^\s+|\s+$//gs ; $class_text =~ s/^\s+|\s+$//gs ;
@ -960,11 +955,6 @@ sub preparse_job_class_order($$) {
edit_and_exit("CP bad job class order" , "$s_define_file" , 1 ) ; edit_and_exit("CP bad job class order" , "$s_define_file" , 1 ) ;
} }
$temp_hash{$c}++ ; $temp_hash{$c}++ ;
if ($c ~~ @non_reorderable_classes) {
trick_print($$sim_ref{fh}, "\nCP ERROR:\n Job class \"$c\" cannot be reordered by job_class_order.\n" , "title_red" , $$sim_ref{args}{v} ) ;
edit_and_exit("CP bad job class order" , "$s_define_file" , 1 ) ;
}
} }
# save the new order # save the new order
@ -979,9 +969,28 @@ sub preparse_job_class_order($$) {
push @{$$sim_ref{user_class_order}} , "automatic_last" ; push @{$$sim_ref{user_class_order}} , "automatic_last" ;
} }
# Push on the rest of the non-reorderable system job classes if ( !exists $temp_hash{logging} ) {
foreach my $c ( @non_reorderable_classes ) { push @{$$sim_ref{user_class_order}} , "logging" ;
push @{$$sim_ref{user_class_order}} , $c ; }
if ( !exists $temp_hash{data_record} ) {
push @{$$sim_ref{user_class_order}} , "data_record" ;
}
if ( !exists $temp_hash{system_checkpoint} ) {
push @{$$sim_ref{user_class_order}} , "system_checkpoint" ;
}
if ( !exists $temp_hash{system_advance_sim_time} ) {
push @{$$sim_ref{user_class_order}} , "system_advance_sim_time" ;
}
if ( !exists $temp_hash{system_moding} ) {
push @{$$sim_ref{user_class_order}} , "system_moding" ;
}
if ( !exists $temp_hash{integ_loop} ) {
push @{$$sim_ref{user_class_order}} , "integ_loop" ;
} }
} }

1
test/SIM_job_class_order/S_define
View File

@ -37,6 +37,7 @@ StarterSimObject starterSimObject;
job_class_order { job_class_order {
my_class , my_class ,
integ_loop,
scheduled scheduled
}; };