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

1372 use temporary job pointer instead of modifying curr_job in exec_set_time_tic_value

Browse Source 
* add integration test sim SIM_exec_set_time_tic_value
* use temporary job pointer instead of modifying curr_job in exec_set_time_tic_value
closes #1372
This commit is contained in:
Scott Fennell 2022-10-28 17:19:54 -05:00 committed by GitHub
parent 63e9c32416
commit d0511e8fb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 52 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/trick/Executive.hh
View File

@ -207,7 +207,7 @@ namespace Trick {
/** Queue to hold unfreeze jobs.\n */
Trick::ScheduledJobQueue unfreeze_queue ; /**< trick_io(**) */
/** Queue to hold unfreeze jobs.\n */
/** Queue to hold time_tic_changed jobs.\n */
Trick::ScheduledJobQueue time_tic_changed_queue ; /**< trick_io(**) */
/** Enough threads to accomodate the number of children specified in the S_define file.\n */

4
test/SIM_exec_set_time_tic_value/RUN_test/unit_test.py Normal file
View File

@ -0,0 +1,4 @@
trick.stop(1.0);
trick.exec_set_time_tic_value(10000000)

21
test/SIM_exec_set_time_tic_value/S_define Normal file
View File

@ -0,0 +1,21 @@
/************************TRICK HEADER*************************
PURPOSE:
()
LIBRARY DEPENDENCIES:
*************************************************************/
#include "sim_objects/default_trick_sys.sm"
##include "ttvtest.h"
class TTVTestSimObject : public Trick::SimObject {
public:
TTVTest ttvtest;
TTVTestSimObject() {
(0.0078125, "scheduled") trick_ret = ttvtest.scheduled();
}
};
TTVTestSimObject ttvtestSimObject;

3
test/SIM_exec_set_time_tic_value/S_overrides.mk Normal file
View File

@ -0,0 +1,3 @@
TRICK_CFLAGS += -I./models
TRICK_CXXFLAGS += -I./models

6
test/SIM_exec_set_time_tic_value/models/ttvtest.cpp Normal file
View File

@ -0,0 +1,6 @@
#include <cstdio>
#include "ttvtest.h"
int TTVTest::scheduled() {
//message_publish(MSG_NORMAL, "Hello World!\n");
return 0;
}

12
test/SIM_exec_set_time_tic_value/models/ttvtest.h Normal file
View File

@ -0,0 +1,12 @@
/*************************************************************************
PURPOSE: (Starter class)
LIBRARY DEPENDENCY:
(
(ttvtest.cpp)
)
**************************************************************************/
class TTVTest {
public:
int scheduled();
};

1
test/makefile
View File

@ -25,6 +25,7 @@ SIMS_TO_COMPILE_ONLY = \
SIMS_TO_COMPILE_AND_RUN = \
SIM_demo_sdefine \
SIM_events \
SIM_exec_set_time_tic_value \
SIM_python_namespace \
SIM_rti \
SIM_stls \

6
trick_source/sim_services/Executive/Executive_set_time_tic_value.cpp
View File

@ -50,8 +50,10 @@ int Trick::Executive::set_time_tic_value(int in_tics) {
/* call jobs for other objects that need to know the time_tic changed. */
time_tic_changed_queue.reset_curr_index() ;
while ( (curr_job = time_tic_changed_queue.get_next_job()) != NULL ) {
ret = curr_job->call() ;
/* job pointer for each job in time_tic_changed_queue */
JobData* next_job;
while ( (next_job = time_tic_changed_queue.get_next_job()) != NULL ) {
ret = next_job->call() ;
if ( ret != 0 ) {
message_publish(MSG_ERROR, "ERROR: time_tic_changed job: %s FAILED.\n", curr_job->name.c_str()) ;
return(ret) ;