Commit Graph

107 Commits

Author SHA1 Message Date
Alex Lin
2c794060f4 Merge in the er7_utils integrators
Taking in the latest er7_utils directory and adding it into Trick in the
same location it was as an external repository.  Made one change to
the files_to_ICG.hh file in the repository to remove the CheckpointHelper
header files.  Those go in the Trick files_to_ICG.hh file.

refs #180

Conflicts:
	Makefile
	autoconf/configure.ac
	configure
	include/trick/files_to_ICG.hh
	share/trick/makefiles/Makefile.common
	share/trick/makefiles/config_user.mk.in
	trick_source/sim_services/Integrator/Makefile
	trick_source/trick_swig/Makefile
2016-02-18 13:39:16 -06:00
Alex Lin
a7cf791d58 Print some timing statistics when the sim exits
I failed at the cherry-pick merge, I didn't merge in the include files correctly.

refs #183
2016-02-18 13:06:10 -06:00
Alex Lin
347e102f40 Print some timing statistics when the sim exits
Saved the timestamps on the default gettimeofday clock as close to
the beginning of the simulation, after initialization is finished and
at the end of shutdown.  Printed out the elapsed time as well as
the number of overruns counted by RealtimeSync.

refs #183

Conflicts:
	trick_source/sim_services/RealtimeSync/src/RealtimeSync.cpp
2016-02-18 12:52:29 -06:00
Alex Lin
e714aecdb8 er7_utils rkn4 directory is not compiled
Yup, it's not.  No one notices we've left it out for a couple of
years now.  I've added the directory to the list of directories to compile.

refs #173
2016-01-29 10:17:04 -06:00
Alex Lin
f02078f0b0 typedef of const structures not understood by SWIG
I kind of took the easy way out on this one, I remove any
structure definitions that matches the pattern
typedef const struct A {...} constA ; out of out of
convert_swig before they get to SWIG.

refs #169
2016-01-26 15:19:06 -06:00
Alex Lin
d1f5bea580 Sending the variable server a variable name that lists a composite type causes core dump
If a variable resolves to a class/structure type the variable server tries to free the
attributes associated with that variable name.  But the attributes usually point to
a fixed place in memory that is not allocated.  I removed the free statement.  I don't
believe this will lead to a memory leak.

refs #165
2016-01-19 15:06:32 -06:00
Alex Lin
e6ddb253fa Hole in makefile dependency list allows python files to be compiled before directory exists
Added a rule that lists the destination library directory as a dependency for all of the
linked python compiled files.

refs #164
2016-01-19 15:01:00 -06:00
Alex Lin
7fd79f9d56 Bug in pre-built library support
Moved the check to exclude directories in make_swig_makefile to after the
test to see if we should expect them.  This way we will write the code we are
expecting even though we will not be generating the code itself.

refs #163
2016-01-19 14:47:35 -06:00
Alex Lin
c14515908e data record buffering optimizations
Added a loop to set each 1024th byte in the recording array to 1 once the
memory has been allocated.  Need to test if this is good enough to get Linux
to allocate the memory.

Added a current recording buffer pointer to use instead of using array offsets.
This should be more cpu cache efficient.

Changed the memcpy calls to direct casted integer assignments based on the size of the
parameter.  If the parameter is not size 1,2,4,or 8 we fall back to a memcpy.

refs #155
2016-01-19 11:01:10 -06:00
Alex Lin
7781b0b3f3 Updating trick_ver.txt 2015-12-08 17:44:29 -06:00
Alex Lin
9af14cf45c Unit tests failing on the Mac
X library path needed to be updated when OS is 10.11 (El Capitan).

refs #144
2015-12-03 11:01:55 -06:00
Alex Lin
09c467e423 Input processor crashes if second event with same name is created
When allocating a new event, if the same name is used, no allocation is
created and NULL is returned.  We start trying to use the returned value
which seg-faulted.  I added a check to only continue if the returned value
from the allocation is not NULL.

refs #149
2015-12-03 10:10:39 -06:00
Alex Lin
c3b886c6e5 Add additional thread synchronization mechanisms
file location different in 15 than it is in 16.  Modified include
files to accomodate.

refs #148
2015-12-03 08:53:47 -06:00
Alex Lin
014d78e388 Input processor crashes if second event with same name is created
When allocating a new event, if the same name is used, no allocation is
created and NULL is returned.  We start trying to use the returned value
which seg-faulted.  I added a check to only continue if the returned value
from the allocation is not NULL.

refs #149
2015-12-02 17:09:14 -06:00
Alex Lin
03d89ef56a Add additional thread synchronization mechanisms
Created a thread trigger container class to hold all of the various thread triggering
mechanisms.  I wanted to avoid allocating/freeing trigger mechanisms.  I added
an eventfd and futex trigger types.  Updated SIM_threads_simple test sim to use
show how to set the thread trigger type.

refs #148

Conflicts:
	trick_source/sim_services/Executive/include/Threads.hh
	trick_source/sim_services/Executive/src/Executive_set_thread_rt_semaphore.cpp
	trick_source/sim_services/Executive/src/Threads.cpp
2015-12-02 17:08:39 -06:00
Dan Jordan
5011fdd1eb Added optional var=value support for trick-CP as passthroughs to the
make system.
                             ***     ***
                           **   ** **   **
                          *       *       *
                          *   MAKE_out    *
                           *             *
                            **         **
                              **     **
                                ** **
       -------------------        *        --------------------
   ../                     \..         ../                     \..
  /                           \       /                           \
 |.,       __   _..._          \     /        ....     ___         |
 /  \     /  `-'     `-------...    ..--`````'    `--'    \.    ./` \
 |   \--_-               /    o ``X'  o    \                '--/    |
 |         ( ( ( ( (    /    \   /``\   /   \  ) ) ) ) )            |
 |   /---\                   ./|`    |`\.                  ..-..    |
 |  /     \-..-........-```/`./       \..`--.........-.  ./     `-./
  `'\                      /             \.            ``       /--
      \___________________/                \___________________/
2015-12-02 16:54:07 -06:00
Alex Lin
9792288e6c Revert "Fixes #68: Changed the path where TrickDPActionController expects to find jar files"
This reverts commit 2789727fc5.
2015-10-06 15:53:07 -05:00
Alex Lin
634f25bee3 GUIs using sie file die on Windows quotation marks
We already parse the string character by character escaping newlines, tabs, and
other special characters.  In the case of these quotation marks, we replace them
with the ASCII single and double quotes.

refs #134
2015-10-06 15:20:50 -05:00
Alex Lin
01a8294dd8 Merge branch '15.1.dev' of https://github.com/nasa/trick into 15.1.dev 2015-10-06 12:46:49 -05:00
John M. Penn
2789727fc5 Fixes #68: Changed the path where TrickDPActionController expects to find jar files 2015-10-06 11:18:16 -05:00
Alex Lin
197caee379 MTV/variable server crashes if checkpoint has less malfunctions then currently running sim
Added a case statement for the bad ref type to the binary data handler.  We handle a bad
ref as an integer, because that is what the sim sends us.  This fixes MTV.

refs #117
2015-10-06 11:17:08 -05:00
John M. Penn
cbf61a105f Fix #64: Fixed the call to register_group_with_mm in DRHDF5 constructor. 2015-10-06 11:17:01 -05:00
Alex Lin
4f23b67f65 MTV/variable server crashes if checkpoint has less malfunctions then currently running sim
Did two things to stop the crash.  1.  When following an address path if we hit a NULL
address, stop processing and return the NULL.  2.  When trying to resolve addresses in
copy_sim_data, if a NULL address is returned then reset the reference to unresolved and
return a dummy value.

Need to fix MTV to handle dummy value returns.

refs #117
2015-10-06 11:16:37 -05:00
Alex Lin
8a9396e220 Include new er7_utils CheckpointHelper directory
Added the CheckpointHelper directory to the master makefile.

refs #98
2015-10-06 11:14:13 -05:00
Alex Lin
514a06a0f7 Creating changelog for release.
Creating changelog for release.

refs #56
2015-05-18 14:57:28 -05:00
John M. Penn
899b0d3efe Merge branch 'master' of https://github.com/nasa/Trick 2015-05-15 10:41:36 -05:00
John M. Penn
bc9746db6c Fix #55: Fix problem in stringstream declaration 2015-05-15 10:41:08 -05:00
Alex Lin
83e68ef26e JITEvents are not checkpointable
JITEvents all need C bindings.  They need to be extern "C"ed if they are in C++.

Refs #53
2015-05-14 13:55:09 -05:00
Alex Lin
24fe5adaec JITEvents are not checkpointable
Changed the way JITEvents are created and handled. Instead of taking a function pointer directly we save a name of a function to the JITEvent class.  The class will dynamically look up a function that matches the name both during event creation and during checkpoint restart.

Fixes #53
2015-05-14 13:41:17 -05:00
John M. Penn
eb46419951 Fix #55 : Use stringsstreams to build paths rather than a fixed size char array. 2015-05-12 18:00:49 -05:00
Derek Bankieris
08138fef87 Moved psi up in the list of units for pressure in Trick View.
refs #54
2015-05-11 15:40:12 -05:00
Derek Bankieris
f85c8e6787 Added psi to the list of units for pressure in Trick View.
fixes #54
2015-05-11 15:30:11 -05:00
John M. Penn
d8013068cc Fix #52 : Created a python script to generate the changelog 2015-05-05 11:19:48 -05:00
Alex Lin
108ec3ebf9 Add more files to exclude from release
data_products/DPX/test is not used.  We need to fix it or delete it, but for now we need to exclude it from releases.

refs #49
2015-04-30 16:50:03 -05:00
Alex Lin
2972685f71 Development flag needs to be set in configure script
The source release will need everything compiled so everyone who downloads the source needs the developer flag turned on.

refs #50
2015-04-30 16:46:46 -05:00
Alex Lin
13b2ba6446 Add .gitattributes file to exclude files from release.
refs #49
2015-04-30 14:56:40 -05:00
Alex Lin
1b5ed16686 Add batch files to start GUIs under Windows
Forgot need to keep the name of the directory that houses the
batch files bin, not bat.
2015-04-29 15:33:33 -05:00
Alex Lin
7ecfcad90a Add batch files to start GUIs under Windows
Added a couple of batch files in the java GUI area so they can be used with
Windows.  Made an addition in TrickApplication.java to add the .bat suffix
to script calls when using Windows.

Fixes #47
2015-04-29 15:01:45 -05:00
John M. Penn
6aff648c0d Change trick_ver.txt to 15.0.0 and add Change Log. Fix #46 2015-04-27 10:17:20 -05:00
John M. Penn
8608fd73fc Fix#45: removed thread_version and services issues cruft 2015-04-24 15:51:09 -05:00
John M. Penn
936bb9cce2 Fixes #42: Fixed makefile for graphics app for Satellite model. 2015-04-08 15:48:08 -05:00
Alex Lin
871c6904d5 make install incomplete
Perl scripts linked into /usr/local/bin or anyother directory needs
to use FindBin qw($RealBin) instead of just FindBin qw($Bin).  Realpath
will find the absolute path to where the script actually lives and the
pm directory that holds the perl modules.
2015-04-06 14:31:58 -05:00
Alex Lin
24a081a32b Event messages not printing
After further discussion, it was revealed that the event printouts would stop
coming out if a new event was created.  Found that the constructor of the
event was clearing out the static info_msg flag all events used to test
for printing.  Removed the assignment in the constructor and set the
initial value of the info_msg flag to false at the declaration point.

Fixes #38
2015-04-06 08:19:16 -05:00
Alex Lin
9ab5406573 Revert "Remove dependency on perl Digest::MD5"
This reverts commit be6d918053.

Undo #29.
2015-04-06 08:00:51 -05:00
Derek Bankieris
203a1bd31d Fixes #39: Added logic to restore missing strip chart properties when loaded from a TV file. 2015-04-02 14:16:13 -05:00
Derek Bankieris
df39400847 Merge branch 'master' of https://github.com/nasa/Trick 2015-04-02 14:14:16 -05:00
John M. Penn
c1619156a9 Fixed the way that Trick::MemoryManager::ref_dim() calculates the sizes of elements in an unconstrained array. Fixes #37. 2015-03-30 17:36:54 -05:00
John M. Penn
1769db5e33 A few touchups to SIM_parachute README. Fix #36 2015-03-27 16:59:30 -05:00
John M. Penn
ef5bbef665 Fix heading in SIM_parachute README. Fix #36 2015-03-27 16:35:22 -05:00
John M. Penn
68fcb0e885 Alas Github Markup doesn't appear to like MathML. Fixes #36 2015-03-27 16:26:34 -05:00