Commit Graph

754 Commits

Author SHA1 Message Date
Scott Fennell
b724f502b3
fix 32 bit test (#953)
* fix tests for 32 bit mode

* fix issues with mongoose build

* Update docker.yml
2020-02-14 10:23:19 -06:00
Scott Fennell
9864fe39f7 fix relative path from trick_algorithms Makefile to Makefile.common 2020-02-11 11:50:26 -06:00
Scott Fennell
03bcbfa119 add space for null char in buffer in ICG main 2020-02-11 10:41:09 -06:00
Scott Fennell
ea6ff1b233 fix TV bug where you could not convert multiple variables at the same time, also add set units field closes #940 2020-02-06 12:19:55 -06:00
Scott Fennell
4f5ce7e4a1
Maven, offline mode, and --enable-mongoose (#939)
closes #938 
closes #941 
closes #943
2020-02-05 14:31:58 -06:00
Alex Lin
d92acb133d Cmake using http instead of https to download java files #937
Changed http to https.
2020-01-24 08:08:25 -06:00
Scott Fennell
3415996952
iss #909 add functions to turn on/off SIGCHLD handler (#924)
closes #909
2020-01-16 10:49:36 -06:00
Scott Fennell
0a19f19c90
#858 #262 allow manual entry of conversion unit for any compatible udunit in TV (#921)
* #858 #262 allow manual entry of conversion unit for any compatible udunit in TV

* #858 #262 remove combo boxes from unit conversion for consistancy and flexability when converting units
2020-01-02 13:28:42 -06:00
Alex Lin
83338c4957 cmake scripts do not work for CentOS7 #914
Updated minimum cmake version to 3.1
Added checks in findllvm script to handle old 3.4 LLVM version
Added back include directories needed by old LLVM version in ICG.
2019-11-22 08:12:54 -06:00
Scott Fennell
f69d29b15f
Create short README for web server to help navigate to documentation 2019-11-20 15:51:32 -06:00
Scott Fennell
7c2f562e8f move web documentation to docs 2019-11-20 15:43:34 -06:00
Alex Lin
17013834c9 GSL includes required for trick_math #901 2019-11-20 07:40:40 -06:00
Penn, John M 047828115
f157b2a8ee Merge branch 'master' of https://github.com/nasa/trick 2019-11-19 14:35:53 -06:00
Penn, John M 047828115
2154c654a9 Add documentation to Web Server #910 2019-11-19 14:22:50 -06:00
Alex Lin
1cf9107f86 CMake is not Cake 2019-11-19 13:29:32 -06:00
Alex Lin
bbc79b491b Adjusting cmake rules for case where fermi-ware is not present 2019-11-19 13:22:04 -06:00
Alex Lin
7c6c833a6a Merge branch 'master' of https://github.com/nasa/trick 2019-11-19 10:59:40 -06:00
Alex Lin
60a1a0558f Oops, didn't put the #endif in the right place 2019-11-19 10:59:28 -06:00
Scott Fennell
54b52e39dc update web app, prepare for release. Rename directory 2019-11-19 10:25:38 -06:00
Alex Lin
ce0cdc9636
Cmake merge (#901)
* Merging changes from cmake branch to master

* Fixing includes for renamed header files

* still need build rule

* Adding warning for swig code for gcc8+

* Adding CMakeLists.txt for data products

* Cmake merge #901

Making adjustments to get cmake working on the Mac (Mojave)

* Cmake merge #901

Changing string append to list append
2019-11-19 09:01:16 -06:00
Scott Fennell
0d5aa45c20
Python3 exec open (#907)
* update .gitignore

* #906 change all python execfile() to exec(open().read())
2019-11-14 13:35:57 -06:00
Scott Fennell
29e047f7a7 remove dependency on JUnitXMLFormatter 2019-11-12 08:47:16 -06:00
Scott Fennell
227c733ccc
Update react-based Trick Dashboard (#900)
Fast-forwarding my app to the latest version to make it available and minimize integration problems later on. The app still requires several features to be implemented such as a Search feature for TV.

Currently, the process for using the app is as follows:

Install Node.js. https://nodejs.org/en/ or alternatively find a repository such as NodeSource
```cd trick/trick_source/web/mockup```
```npm i```
```npm run build```
Copy the contents of the build directory to your www directory for your sim
2019-11-08 10:56:56 -06:00
Penn, John M 047828115
23b5b7ac19 Use better WebSocket constructor in wsexp.html because it's an example. 2019-11-06 13:18:29 -06:00
Penn, John M 047828115
225cd9704e Add images directory and trick_icon.png needed for webserver. 2019-11-04 12:52:29 -06:00
Scott Fennell
8428c56e6a add sie and units messages to httpserver 2019-10-31 10:39:13 -05:00
Scott Fennell
2deff169e0 require c++11 for trick_source/sie 2019-10-31 09:51:24 -05:00
Scott Fennell
5ab51d42e6
Merge pull request #895 from nasa/S_sie.json
create S_sie.json
2019-10-30 16:07:32 -05:00
jmpenn
be34b89512
In WebServer class use message_publish() for messages and add debug flag. (#893) 2019-10-29 17:21:19 -05:00
jmpenn
9eed167634
Add enable flag to webserver. Default is false. Should be set to true in input file to enable. (#892) 2019-10-29 11:52:02 -05:00
jmpenn
d86a23834c
Fix a race condition between ICG and mongoose install (#891)
* Fix a race condition between ICG and mongoose install

* Update mongoose to version 6.16
2019-10-25 13:21:39 -05:00
jmpenn
95c6659733
Incorporate Webserver into Trick, so one only has to include HttpServ… (#886)
* Incorporate Webserver into Trick, so one only has to include HttpServer.sm

* Tweaks in default index.html file

* Rename HTTPServer.sm to WebServer.sm

* Rename http_server to WebServer

* Add --retry to curl invocations in HttpServer makefile.

* Fix #include in VariableServerVariable.hh

* Include cleanup and curl tweaks in the hopes of making Jenkins happy.

* Doh! problem in makefile masked by preinstalled mongoose in usr/local/lib

* DIE Make Bug DIE

* Fix include in WebServer.sm

* WebServer.sm constructor name

* Don't SWIG mongoose.h

* Compile with -std=c++11

* Attempt to fix race condition in makefile

* makefie tweek

* Fix trick library name problem for Centos and Redhat
2019-10-23 11:58:19 -05:00
Derek Bankieris
1f33406c95 Don't trace TRICK_EXT_LIB_DIRS lib deps in CP
Refs #871
2019-10-07 14:12:06 -05:00
dbankieris
5e11a40a69
Merge pull request #877 from nasa/char_sized_enums
Add support for char-sized enums
2019-10-04 12:21:31 -05:00
Scott Fennell
c8eb44e1fc get rid of dangling pointer use closes #878 2019-10-04 10:04:38 -05:00
Derek Bankieris
04d5f5dd80 Add support for char-sized enums
Fixes #876
2019-10-01 12:26:57 -05:00
sfennell
8ac5cf7a59 changes to support llvm 9.0 closes #869 2019-09-27 16:04:16 -05:00
sfennell
5004f95fdd changes to support llvm 9.0 closes #869 2019-09-27 14:58:54 -05:00
Scott Fennell
f10e4e8d93 remove deprecated std::ptr_fun and std::not1 closes #864 2019-09-23 14:25:27 -05:00
Scott Fennell
238b376b14 use almostRealPath instead of realpath closes #857 2019-09-10 11:13:57 -05:00
Scott Fennell
d978cdf4c6 move code out of conditional block to make sure slave_output_directory gets initialized fixes #848 2019-09-09 11:26:09 -05:00
Scott Fennell
994c8c0684 create S_sie.json 2019-09-09 10:56:02 -05:00
Derek Bankieris
5dd8fe4cf1 TrickView: Order enums according to S_sie.resource
Closes #860
2019-09-09 08:53:00 -05:00
Scott Fennell
e798fde189 move misplaced parentheses to include enum headers closes #856 2019-09-05 14:47:10 -05:00
Derek Bankieris
3a03f7af53 Remove to_string from JITInputFile.cpp
Follow the existing error reporting pattern
2019-09-03 11:08:38 -05:00
Dung-Ru Tsai
0dffa8096f Add debug errno in the JIT compile (#854)
Thank you for your contribution!
2019-09-03 07:21:57 -05:00
Scott Fennell
de490a5dfa
Merge pull request #853 from nasa/react-app
React App Example for Embedded Web Server
2019-08-30 13:22:54 -05:00
Scott Fennell
d8717059f5 #851 complete a basic mockup with some features of the React-based sim-control UI 2019-08-27 13:10:18 -05:00
John M. Penn
dde519f1b0 Fix warnings in unicode utils. #850 2019-08-26 15:00:23 -05:00
Penn, John M 047828115
ba4c86858a Remove unused variable definition. 2019-08-13 16:32:21 -05:00
Alex Lin
90c1564a0c Merge branch 'master' of https://github.com/nasa/trick 2019-07-19 16:06:54 -05:00
Alex Lin
4b68ed4993 Add support for Mac's removal of /usr/include #810
Found a unit test makefile that wasn't ready for Mojave.
2019-07-19 16:05:26 -05:00
Scott Fennell
3609f76474 exit on invalid input file or command line argument #840 2019-07-10 15:23:29 -05:00
Scott Fennell
1d17aa579a fix sim help message and handle bad command line args #840 2019-07-10 13:53:03 -05:00
Scott Fennell
82bae3b0d0 #836 remove all S_default.dat stuff 2019-07-09 15:58:26 -05:00
Scott Fennell
c2d2fee474 #837 default input file to first argument if RUN_ is not present 2019-07-08 09:28:53 -05:00
Scott Fennell
ca5ddb429e iss #837 make command line arguments position independent 2019-07-02 09:03:09 -05:00
dbankieris
5d0e0f65bd
Merge pull request #831 from nasa/407
Add support for -isystem
2019-06-25 07:51:28 -05:00
Derek Bankieris
40cf5c0b29 Note the process exit status of Monte Carlo runs
Closes #481
2019-06-21 14:02:03 -05:00
Derek Bankieris
d135353c90 Infer TRICK_HOME in Makefiles
Closes #358
2019-06-21 13:15:22 -05:00
Derek Bankieris
422ef225f1 Give er7_utils proper Makefiles
Closes #637
2019-06-21 12:59:00 -05:00
Derek Bankieris
67decaed24 Add support for -isystem
Closes #407
2019-06-20 10:12:33 -05:00
Scott Fennell
b23b19195b
Merge pull request #818 from nasa/786-clock-stuff
Add C call to clock_tics_per_sec and also log init job elapsed time
2019-06-18 13:38:18 -05:00
Alex Lin
453a03a809
Get configure with no java and no X to work #735 (#817)
Found if --without-x was specified, that automatically caused an
error condition in the configure script.  Fixed that and only
tested for X windows headers and libs if X is included.  Excluded
a couple of directories from compiling if X is not included.

Didn't seem to be a problem with java.
2019-06-18 11:00:42 -05:00
Alex Lin
497f11f132
Make TRICK_CXX variable to specify c++ compiler #767 (#815)
Changed all references of TRICK_CPPC to TRICK_CXX.  Added a
warning message that TRICK_CPPC has been deprecated.
2019-06-18 11:00:08 -05:00
Alex Lin
187fa37540
Remove suppression of units conversion warnings in 19 #789 (#814)
Removed checks on dead units conversion messenger.  Units conversion
messages cannot be suppressed.  Added deprecated messages to the functions
that modified the message printouts.
2019-06-18 10:59:51 -05:00
Alex Lin
5e9723c630
Add support for Mac's removal of /usr/include #810 (#811)
If we are on a Mac, use xcrun to find the standard include directories.
Some of the makefiles in data_products look for libxml2 which requires
them to get the same change as the configure script.
2019-06-18 10:59:35 -05:00
Scott Fennell
4d247c94db remove unneccessary includes 2019-06-18 10:39:03 -05:00
Scott Fennell
97941ac073 move init_log_stream to Executive.hh, move Executive::process_sim_args from "default data" to Executive::init 2019-06-18 10:34:56 -05:00
Scott Fennell
fadda55abf Log elapsed time in default_data, input_processor, and init jobs in file
init_log.csv
2019-06-17 14:40:01 -05:00
Alex Lin
78b5a0c692 Optionally use 'cio' in place of 'trick_chkpnt_io' field #749
Added an alias to use cio for trick_chkpnt_io and io for trick_io.
2019-06-14 07:43:37 -05:00
Alex Lin
04b2185c2e TPROCTE_HOME Being Used In Place Of TPRO_HOME #778
I put the include for tsync.h in the wrong place.
2019-06-12 07:17:39 -05:00
Alex Lin
a420418443 TPROCTE_HOME Being Used In Place Of TPRO_HOME #778
Changed the Tsync routing from using the old TPro API to the
new Tsync API.
2019-06-11 15:50:49 -05:00
Alex Lin
a394f0d187 TPROCTE_HOME Being Used In Place Of TPRO_HOME #778
Needed to make some more fixes to work with modern tsync driver
code.
2019-06-11 09:48:29 -05:00
Scott Fennell
b1d791dc94 #805 add C call to clock_tics_per_sec 2019-06-07 08:29:47 -05:00
Scott Fennell
9be53ebb9b #776 default restore_stls to false 2019-06-03 09:44:35 -05:00
Scott Fennell
7f7adca0ac #776 .dat files don't call restore_stls in checkpoint restore 2019-06-01 10:48:31 -05:00
dbankieris
35c2dacac5
Merge pull request #785 from nasa/746
Clean up duplication in makefiles
2019-05-30 16:27:51 -05:00
Derek Bankieris
7b0e84e58e Clean up duplication in makefiles
Normalize behavior of TRICK_VERBOSE_BUILD

Closes #746
2019-05-30 15:47:07 -05:00
dbankieris
b694d5412b
Merge pull request #765 from nasa/763
Add ability to specify MC slave output directory
2019-05-29 14:29:04 -05:00
Derek Bankieris
295b9e3285 Infer TRICK_HOME automatically
Refs #358
2019-05-23 15:09:34 -05:00
Alex Lin
7338dd32d3 Merge branch 'master' of https://github.com/nasa/trick 2019-05-14 09:09:13 -05:00
Alex Lin
fedf5bec72 Reduce number of real-time plots per page to 6 #775
Changed the hard coded 8 plots per page to a user settable number.
Defaulted the number to 6.
2019-05-14 09:08:11 -05:00
jmpenn
3f35388b49
Change std::endl to linefeed as appropriate. (#773)
* Fix endl issue in variable server JSON generation. Ref #766

* Change std::endl to line feed as appropraite. #766

* Change std::endl to line feed in MemoryManager as appropriate. #766

* Change std::endl to linefeed as appropriate. #766

* Change std::endl to line feed as appropriate in JSONVariableServer. #766

* Change std::endl to line feed as appropriate in still more files. #766
2019-05-13 16:05:01 -05:00
iamthad
3187dd9012 Replace std::endl with "\n" in SIE (#772)
std::endl flushes the output stream. The SIE functions were using it
multiple times per variable. This can have significant performance
impacts on file I/O.

In testing, the S_sie.resource file for SIM_parachute was flushed over
14000 times, each resulting in a separate write system call. With this
patch, only ~40 write calls were performed, and writing the file took
~1/3 as long.

For more information, see
https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#Rio-endl
2019-05-13 14:31:46 -05:00
Derek Bankieris
4368d412b2 Add C functions for setting MC slave output dir
Refs #763
2019-05-06 12:03:26 -05:00
Derek Bankieris
7d7b461b38 Allow specification of MC slave output directory
Refs #763
2019-05-06 11:32:12 -05:00
Scott Fennell
3364cd3836
Merge pull request #750 from nasa/fix-clean-bin
#507 clean remove 2 data products binaries from bin
2019-05-06 09:33:12 -05:00
Alex Lin
e6abfd21b8 Log frame scheduling time if not running real-time. #762
If real-time is off, we exit the rt_monitor function early.  The frame
scheduled time was calculated after the exit call.  Moved the frame
scheduled time calcuation before the exit.
2019-05-02 16:36:35 -05:00
Derek Bankieris
d5544a5991 Correct decimal formatting for ints in TrickView
3032aae added fixed-width to binary formats. Looks like I modified
TVInteger's Decimal format instead of Binary.

Refs #661
2019-04-25 07:29:58 -05:00
Penn, John M 047828115
0f037e6817 Update trickTypeCharString() for STLs, so their names can be generated. #755 2019-04-17 16:43:12 -05:00
Penn, John M 047828115
05e9535518 Add MemoryManager methods to generate JSON for allocation info. #755 2019-04-17 16:35:29 -05:00
Derek Bankieris
4611db2e92 Merge branch 'master' of https://github.com/nasa/trick 2019-04-09 13:20:01 -05:00
Derek Bankieris
f1ef983143 Change unbold ascii escape sequence from 21 to 22
21m as unbold is not well supported and sometimes causes
double-underline instead
2019-04-09 13:18:02 -05:00
Scott Fennell
49e243b54a
Merge branch 'master' into VERBOSE-synonym 2019-04-02 13:34:52 -05:00
Scott Fennell
4f9c51b2cb #507 clean remove 2 data products binaries from bin 2019-03-29 13:41:24 -05:00
Alex Lin
6a84ae548b Merge branch 'master' of https://github.com/nasa/trick 2019-03-26 17:10:16 -05:00
Alex Lin
b29a117902 ICG does not compile with LLVM 8.0 #747
getLocEnd got changed to getEndLoc.  Made a LLVM version based macro
to handle both.
2019-03-26 17:03:11 -05:00
Scott Fennell
644a9a0e00 #741 add VERBOSE synonym everywhere 2019-03-21 09:28:52 -05:00
Penn, John M 047828115
be4372a831 Change dashes in JSON identifiers to underscores. ref #678 2019-03-07 10:44:56 -06:00