ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-21 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #444 from nasa/revert-442-DefaultPortFlagMC

Browse Source 
Revert "Removed default_port_flag and socket_init. "
This commit is contained in:
Christopher LaChance 2017-06-20 14:38:31 -05:00 committed by GitHub
commit 7171288aa8
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/trick/MonteCarlo.hh
View File

@ -324,6 +324,9 @@ 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(--) */
@ -737,6 +740,13 @@ 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,6 +11,7 @@ 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),
@ -28,8 +29,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 = 0; listen_device.port = 7200;
connection_device.port = 0; connection_device.port = 7200;
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;

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

@ -300,6 +300,14 @@ 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.
@ -521,12 +529,14 @@ void Trick::MonteCarlo::set_current_run(int run_num) {
void Trick::MonteCarlo::set_listen_device_port(int port_number) { void Trick::MonteCarlo::set_listen_device_port(int port_number) {
listen_device.port = port_number ; listen_device.port = port_number ;
default_port_flag = false ;
} }
void Trick::MonteCarlo::set_connection_device_port(int port_number) { void Trick::MonteCarlo::set_connection_device_port(int port_number) {
// This port is passed to slave as an argument, do not override // This port is passed to slave as an argument, do not override
if (is_master()) { if (is_master()) {
connection_device.port = port_number ; connection_device.port = port_number ;
default_port_flag = false ;
} }
} }