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

Readded the reverted changes.

Browse Source 
The situation required rebasing the branch from master and re-adding the changes that were reverted.
This commit is contained in:
Christopher LaChance 2017-06-21 09:22:10 -05:00
commit 129fb89fb4
3 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/trick/MonteCarlo.hh
View File

@ -324,9 +324,6 @@ namespace Trick {
/** Highest level of messages to report. */ /** Highest level of messages to report. */
Verbosity verbosity; /**< \n trick_units(--) */ Verbosity verbosity; /**< \n trick_units(--) */
/** Default to false and randomly find port numbers. True, use the user provided port numbers. */
bool default_port_flag; /**< \n trick_units(--) */
/** Device over which connections are accepted. */ /** Device over which connections are accepted. */
TCDevice listen_device; /**< \n trick_units(--) */ TCDevice listen_device; /**< \n trick_units(--) */
@ -740,13 +737,6 @@ namespace Trick {
#endif #endif
protected: protected:
/**
* Initializes sockets.
*
* @return 0 on success
*/
int socket_init(TCDevice *listen_device);
/** /**
* Initializes the master. * Initializes the master.
* *

5
trick_source/sim_services/MonteCarlo/MonteCarlo.cpp
View File

@ -11,7 +11,6 @@ Trick::MonteCarlo::MonteCarlo() :
timeout(120), timeout(120),
max_tries(2), max_tries(2),
verbosity(INFORMATIONAL), verbosity(INFORMATIONAL),
default_port_flag(1),
num_runs(0), num_runs(0),
actual_num_runs(0), actual_num_runs(0),
num_results(0), num_results(0),
@ -29,8 +28,8 @@ Trick::MonteCarlo::MonteCarlo() :
memset(&listen_device, 0, sizeof(TCDevice)) ; memset(&listen_device, 0, sizeof(TCDevice)) ;
memset(&connection_device, 0, sizeof(TCDevice)) ; memset(&connection_device, 0, sizeof(TCDevice)) ;
listen_device.port = 7200; listen_device.port = 0;
connection_device.port = 7200; connection_device.port = 0;
listen_device.disable_handshaking = TC_COMM_TRUE; listen_device.disable_handshaking = TC_COMM_TRUE;
connection_device.disable_handshaking = TC_COMM_TRUE; connection_device.disable_handshaking = TC_COMM_TRUE;

8
trick_source/sim_services/MonteCarlo/MonteCarlo_funcs.cpp
View File

@ -300,14 +300,6 @@ int Trick::MonteCarlo::shutdown() {
return 0; return 0;
} }
/** @par Detailed Design: */
int Trick::MonteCarlo::socket_init(TCDevice *in_listen_device) {
if (default_port_flag) {
in_listen_device->port = 0;
}
return tc_init(in_listen_device);
}
void Trick::MonteCarlo::handle_retry(MonteSlave& slave, MonteRun::ExitStatus exit_status) { void Trick::MonteCarlo::handle_retry(MonteSlave& slave, MonteRun::ExitStatus exit_status) {
if (max_tries <= 0 || slave.current_run->num_tries < max_tries) { if (max_tries <= 0 || slave.current_run->num_tries < max_tries) {
// Add the run to the retry queue. // Add the run to the retry queue.