Attachment #1431 for bug #1454

View | Details | Raw Unified | Return to bug 1454
Collapse All | Expand All

(-)a/model/cooja-loader-factory.cc (-1 / +8 lines)

Lines 3-8	Link Here

#include "elf-cache.h"

#include "elf-cache.h"

#include "elf-dependencies.h"

#include "elf-dependencies.h"

#include "ns3/log.h"

#include "ns3/log.h"

#ifdef DCE_MPI

#include "ns3/mpi-interface.h"

#endif

#include <string.h>

#include <string.h>

#include <dlfcn.h>

#include <dlfcn.h>

#include <elf.h>

#include <elf.h>

Lines 74-80	Link Here

};

};

SharedModules::SharedModules ()

SharedModules::SharedModules ()

  : cache ("elf-cache", 0)

#ifdef DCE_MPI

: cache ("elf-cache", MpiInterface::GetSystemId ())

#else

: cache ("elf-cache", 0)

#endif

{}

{}

SharedModules::~SharedModules ()

SharedModules::~SharedModules ()

(-)a/model/copy-loader-factory.cc (+6 lines)

Lines 2-7	Link Here

#include "elf-cache.h"

#include "elf-cache.h"

#include "elf-dependencies.h"

#include "elf-dependencies.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/mpi-interface.h"

NS_LOG_COMPONENT_DEFINE ("CopyLoaderFactory");

NS_LOG_COMPONENT_DEFINE ("CopyLoaderFactory");

Lines 175-181	Link Here

175

uint32_t

176

uint32_t

176

CopyLoaderFactory::AllocateUid (void)

177

CopyLoaderFactory::AllocateUid (void)

177

178

179

#ifdef DCE_MPI

180

  // 2^16 processes maximum per different system id.

181

  static uint32_t uid = MpiInterface::GetSystemId () * ( 1 << 16 );

182

#else

178

  static uint32_t uid = 0;

183

  static uint32_t uid = 0;

184

#endif

179

  uid++;

185

  uid++;

180

  return uid;

186

  return uid;

181

187




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/internet-module.h"
#include "ns3/point-to-point-module.h"
#include "ns3/applications-module.h"
#include "ns3/dce-module.h"
#include "ns3/mpi-interface.h"

using namespace ns3;

// Run Hint :  $ mpirun -np 2 dce-mpi-udp

int 
main (int argc, char *argv[])
{
  // Distributed simulation setup
  MpiInterface::Enable (&argc, &argv);
  GlobalValue::Bind ("SimulatorImplementationType", StringValue ("ns3::DistributedSimulatorImpl"));

  uint32_t systemId = MpiInterface::GetSystemId ();
  uint32_t systemCount = MpiInterface::GetSize ();


  // Check for valid distributed parameters.
  // Must have 2 and only 2 Logical Processors (LPs)

  if (systemCount != 2)
    {
      std::cout << "This simulation requires 2 and only 2 logical processors." << std::endl;
      return 1;
    }

  //-------------------------------------------------


  CommandLine cmd;
  cmd.Parse (argc, argv);

  NodeContainer nodes;
  Ptr<Node> node1 = CreateObject<Node> (0); // <------ for MPI, it goes to run in core_1 (process 1)
  Ptr<Node> node2 = CreateObject<Node> (1); // <------ for MPI,                   "   _2          2
  nodes.Add (node1);
  nodes.Add (node2);

  InternetStackHelper stack;
  stack.Install (nodes);

  PointToPointHelper pointToPoint;
  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("100Mbps"));
  pointToPoint.SetChannelAttribute ("Delay", StringValue ("1ms"));

  NetDeviceContainer devices;
  devices = pointToPoint.Install (nodes);

  Ipv4AddressHelper address;
  address.SetBase ("10.1.1.0", "255.255.255.252");
  Ipv4InterfaceContainer interfaces = address.Assign (devices);

  // setup ip routes
  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();

  DceManagerHelper dceManager;
  dceManager.Install (nodes);

  DceApplicationHelper dce;
  ApplicationContainer apps;

  dce.SetStackSize (1<<20);

  if (0==systemId)
    {
      dce.SetBinary ("udp-server");
      dce.ResetArguments();
      apps = dce.Install (node1);
      apps.Start (Seconds (4.0));
    }

  if (1==systemId)
    {
      dce.SetBinary ("udp-client");
      dce.ResetArguments();
      dce.AddArgument ("10.1.1.1");
      apps = dce.Install (node2);
      apps.Start (Seconds (4.5));
    }


  Simulator::Stop (Seconds(1050.0));
  Simulator::Run ();
  Simulator::Destroy ();

  //-------------------------------------------------

  // Exit the MPI execution environment
  MpiInterface::Disable ();
  return 0;

}




## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-

import ns3waf
import Options

def configure(conf):
    ns3waf.check_modules(conf, ['core', 'internet', 'point-to-point', 'mpi'], mandatory = True)

def build(bld):
    if bld.env['MPI']:
         bld.build_a_script('dce', needed = ['core', 'internet', 'dce', 'point-to-point', 'mpi'],
		   		            target='bin/dce-mpi-udp',
				            source=['dce-mpi-udp.cc'],				            
				            )


(-)a/myscripts/ping/dce-ping.cc (-20 / +46 lines)

Lines 8-13	Link Here

#include "ns3/constant-position-mobility-model.h"

#include "ns3/constant-position-mobility-model.h"

#include "misc-tools.h"

#include "misc-tools.h"

#ifdef DCE_MPI

#include "ns3/mpi-interface.h"

#endif

using namespace ns3;

using namespace ns3;

// ===========================================================================

// ===========================================================================

Lines 32-37	Link Here

// ===========================================================================

// ===========================================================================

int main (int argc, char *argv[])

int main (int argc, char *argv[])

  uint32_t systemId = 0;

  uint32_t systemCount = 1;

#ifdef DCE_MPI

  // Distributed simulation setup

  MpiInterface::Enable (&argc, &argv);

  GlobalValue::Bind ("SimulatorImplementationType",

      StringValue ("ns3::DistributedSimulatorImpl"));

  systemId = MpiInterface::GetSystemId ();

  systemCount = MpiInterface::GetSize ();

#endif

  std::string animFile = "NetAnim.xml";

  std::string animFile = "NetAnim.xml";

  bool useKernel = 0;

  bool useKernel = 0;

  CommandLine cmd;

  CommandLine cmd;

Lines 39-45	Link Here

  cmd.Parse (argc, argv);

  cmd.Parse (argc, argv);

  NodeContainer nodes;

  NodeContainer nodes;

  nodes.Create (2);

  Ptr<Node> node1 = CreateObject<Node> (0 % systemCount); // Create node1 with system id 0

  Ptr<Node> node2 = CreateObject<Node> (1 % systemCount); // Create node2 with system id 1

  nodes.Add (node1);

  nodes.Add (node2);

  PointToPointHelper pointToPoint;

  PointToPointHelper pointToPoint;

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

  pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));

Lines 81-107	Link Here

  dce.SetStackSize (1<<20);

100

  dce.SetStackSize (1<<20);

101

  // Launch ping on node 0

102

  if ( systemId == node1->GetSystemId () )

  dce.SetBinary ("ping");

103

  dce.ResetArguments();

104

      // Launch ping on node 0

  dce.ResetEnvironment();

105

      dce.SetBinary ("ping");

  dce.AddArgument ("-c 10");

106

      dce.ResetArguments();

  dce.AddArgument ("-s 1000");

107

      dce.ResetEnvironment();

  dce.AddArgument ("10.1.1.2");

108

      dce.AddArgument ("-c 10");

109

      dce.AddArgument ("-s 1000");

110

      dce.AddArgument ("10.1.1.2");

111

  apps = dce.Install (nodes.Get (0));

112

      apps = dce.Install (node1);

  apps.Start (Seconds (1.0));

113

      apps.Start (Seconds (1.0));

114

115

  if ( systemId == node2->GetSystemId ())

116

117

      // Launch ping on node 1

118

      dce.SetBinary ("ping");

119

      dce.ResetArguments();

120

      dce.ResetEnvironment();

121

      dce.AddArgument ("-c 10");

122

      dce.AddArgument ("-s 1000");

123

      dce.AddArgument ("10.1.1.1");

124

  // Launch ping on node 1

125

      apps = dce.Install (node2);

  dce.SetBinary ("ping");

126

      apps.Start (Seconds (1.5));

  dce.ResetArguments();

127

  dce.ResetEnvironment();

  dce.AddArgument ("-c 10");

100

  dce.AddArgument ("-s 1000");

101

  dce.AddArgument ("10.1.1.1");

102

103

  apps = dce.Install (nodes.Get (1));

104

  apps.Start (Seconds (1.5));

105

128

106

  setPos (nodes.Get (0), 1, 10, 0);

129

  setPos (nodes.Get (0), 1, 10, 0);

107

  setPos (nodes.Get (1), 50,10, 0);

130

  setPos (nodes.Get (1), 50,10, 0);

Lines 117-122	Link Here

117

  Simulator::Destroy ();

140

  Simulator::Destroy ();

118

141

119

  anim.StopAnimation ();

142

  anim.StopAnimation ();

143

#ifdef DCE_MPI

144

  MpiInterface::Disable ();

145

#endif

120

146

121

  return 0;

147

  return 0;

122

148

(-)a/utils/clone_and_compile_ns3_dce.sh (-2 / +8 lines)

Lines 2-7	Link Here

# this script checkout NS3 and DCE sources, and build them.

# this script checkout NS3 and DCE sources, and build them.

USE_KERNEL=NO

USE_KERNEL=NO

USE_VDL=NO

USE_VDL=NO

USE_MPI=NO

WAF_VDL=

WAF_VDL=

args=("$@")

args=("$@")

NB=$#

NB=$#

Lines 15-20	Link Here

    then

    then

       USE_VDL=YES

       USE_VDL=YES

fi

fi

    if [ ${args[${i}]} = '-m' ]

    then

       USE_MPI=YES

       MPI_SWITCH=--enable-mpi

fi

done

done

for i in patch hg make $WGET tar

for i in patch hg make $WGET tar

do

do

Lines 46-52	Link Here

hg revert -a

hg revert -a

patch -p1 <../ns-3-dce/utils/packet-socket-upgrade-exp.patch

patch -p1 <../ns-3-dce/utils/packet-socket-upgrade-exp.patch

patch -p1 <../ns-3-dce/utils/remove-default-simulator-asserts.patch

patch -p1 <../ns-3-dce/utils/remove-default-simulator-asserts.patch

./waf configure --prefix=`pwd`/../build --enable-tests

./waf configure --prefix=`pwd`/../build --enable-tests $MPI_SWITCH

./waf

./waf

./waf install

./waf install

cd ..

cd ..

Lines 93-99	Link Here

then

then

    WAF_KERNEL=--enable-kernel-stack=`pwd`/../ns-3-linux

100

    WAF_KERNEL=--enable-kernel-stack=`pwd`/../ns-3-linux

fi

101

fi

./waf configure --prefix=`pwd`/../build --verbose $WAF_KERNEL $WAF_VDL

102

./waf configure --prefix=`pwd`/../build --verbose $WAF_KERNEL $WAF_VDL $MPI_SWITCH

./waf

103

./waf

./waf install

104

./waf install

export LD_LIBRARY_PATH=$SAVE_LDLP:`pwd`/build/lib:`pwd`/build/bin:`pwd`/../build/lib

105

export LD_LIBRARY_PATH=$SAVE_LDLP:`pwd`/build/lib:`pwd`/build/bin:`pwd`/../build/lib

(-)a/wscript (-1 / +10 lines)

Lines 18-24	Link Here

                   help=('Enable the build of dce-runner.'),

                   help=('Enable the build of dce-runner.'),

                   dest='enable_vdl_loader', action='store_true',

                   dest='enable_vdl_loader', action='store_true',

                   default=False)

                   default=False)

    opt.add_option('--enable-mpi',

                   help=('Enable MPI and distributed simulation support'),

                   dest='enable_mpi', action='store_true',

                   default=False)

def search_file(files):

def search_file(files):

    for f in files:

    for f in files:

        if os.path.isfile (f):

        if os.path.isfile (f):

Lines 30-35	Link Here

    ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)

    ns3waf.check_modules(conf, ['point-to-point', 'tap-bridge', 'netanim'], mandatory = False)

    ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)

    ns3waf.check_modules(conf, ['wifi', 'point-to-point', 'csma', 'mobility'], mandatory = False)

    ns3waf.check_modules(conf, ['point-to-point-layout'], mandatory = False)

    ns3waf.check_modules(conf, ['point-to-point-layout'], mandatory = False)

    ns3waf.check_modules(conf, ['mpi'], mandatory = False)

    conf.check_tool('compiler_cc')

    conf.check_tool('compiler_cc')

    conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H', mandatory=False)

    conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H', mandatory=False)

    conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H', mandatory=False)

    conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H', mandatory=False)

Lines 38-43	Link Here

    conf.check(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H', mandatory=False)

    conf.check(header_name='sys/stat.h', define_name='HAVE_SYS_STAT_H', mandatory=False)

    conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H', mandatory=False)

    conf.check(header_name='dirent.h', define_name='HAVE_DIRENT_H', mandatory=False)

    if Options.options.enable_mpi:

         conf.env.append_value ('DEFINES', 'DCE_MPI=1')

         conf.env['MPI'] = '1'

    conf.env.prepend_value('LINKFLAGS', '-Wl,--no-as-needed')

    conf.env.prepend_value('LINKFLAGS', '-Wl,--no-as-needed')

    conf.env.append_value('LINKFLAGS', '-pthread')

    conf.env.append_value('LINKFLAGS', '-pthread')

    conf.check (lib='dl', mandatory = True)

    conf.check (lib='dl', mandatory = True)

Return to bug 1454