F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpi: (fixes #607) call CommandLine correctly to generate docs

Browse Source
This commit is contained in:
Peter D. Barnes, Jr
2022-03-28 12:24:46 -07:00
committed by Tom Henderson
parent 5be17e1f21
commit e6fbf39cf5
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/mpi/examples/nms-p2p-nix-distributed.cc
View File

@@ -70,25 +70,12 @@ main (int argc, char *argv[])
typedef std::vector<NetDeviceContainer> vectorOfNetDeviceContainer; typedef std::vector<NetDeviceContainer> vectorOfNetDeviceContainer;
typedef std::vector<vectorOfNetDeviceContainer> vectorOfVectorOfNetDeviceContainer; typedef std::vector<vectorOfNetDeviceContainer> vectorOfVectorOfNetDeviceContainer;
// Enable parallel simulator with the command line arguments
MpiInterface::Enable (&argc, &argv);
SinkTracer::Init ();
SystemWallClockMs t0; // Total time SystemWallClockMs t0; // Total time
SystemWallClockMs t1; // Setup time SystemWallClockMs t1; // Setup time
SystemWallClockMs t2; // Run time/ SystemWallClockMs t2; // Run time/
t0.Start (); t0.Start ();
t1.Start (); t1.Start ();
uint32_t systemId = MpiInterface::GetSystemId ();
uint32_t systemCount = MpiInterface::GetSize ();
RANK0COUT (" ==== DARPA NMS CAMPUS NETWORK SIMULATION ====" << std::endl);
GlobalValue::Bind ("SimulatorImplementationType",
StringValue ("ns3::DistributedSimulatorImpl"));
uint32_t nCN = 2; uint32_t nCN = 2;
uint32_t nLANClients = 10; uint32_t nLANClients = 10;
bool single = 0; bool single = 0;
@@ -110,6 +97,20 @@ main (int argc, char *argv[])
cmd.Parse (argc,argv); cmd.Parse (argc,argv);
// Enable parallel simulator with the command line arguments
MpiInterface::Enable (&argc, &argv);
SinkTracer::Init ();
uint32_t systemId = MpiInterface::GetSystemId ();
uint32_t systemCount = MpiInterface::GetSize ();
RANK0COUT (" ==== DARPA NMS CAMPUS NETWORK SIMULATION ====" << std::endl);
GlobalValue::Bind ("SimulatorImplementationType",
StringValue ("ns3::DistributedSimulatorImpl"));
if (nCN < 2) if (nCN < 2)
{ {
RANK0COUT ("Number of total CNs (" << nCN << ") lower than minimum of 2" RANK0COUT ("Number of total CNs (" << nCN << ") lower than minimum of 2"

2
src/mpi/examples/simple-distributed-mpi-comm.cc
View File

@@ -127,7 +127,7 @@ main (int argc, char *argv[])
bool testing = false; bool testing = false;
// Parse command line // Parse command line
CommandLine cmd; CommandLine cmd(__FILE__);
cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix); cmd.AddValue ("nix", "Enable the use of nix-vector or global routing", nix);
cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization (instead of granted time window)", nullmsg); cmd.AddValue ("nullmsg", "Enable the use of null-message synchronization (instead of granted time window)", nullmsg);
cmd.AddValue ("tracing", "Enable pcap tracing", tracing); cmd.AddValue ("tracing", "Enable pcap tracing", tracing);