Attachment #741 for bug #720

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




                        self.bld.env, proc_env, force_no_valgrind=True)

def check_shell(bld):
    if ('NS3_MODULE_PATH' not in os.environ) or ('NS3_EXECUTABLE_PATH' not in os.environ):
        return
    env = bld.env
    correct_modpath = os.pathsep.join(env['NS3_MODULE_PATH'])
    found_modpath = os.environ['NS3_MODULE_PATH']
    correct_execpath = os.pathsep.join(env['NS3_EXECUTABLE_PATH'])
    found_execpath = os.environ['NS3_EXECUTABLE_PATH']
    if (found_modpath != correct_modpath) or (correct_execpath != found_execpath):
        msg = ("Detected shell (./waf shell) with incorrect configuration\n"
               "=========================================================\n"
               "Possible reasons for this problem:\n"

        shell = os.environ.get("SHELL", "/bin/sh")

    env = wutils.bld.env
    os_env = {'NS3_MODULE_PATH': os.pathsep.join(env['NS3_MODULE_PATH']), 'NS3_EXECUTABLE_PATH': os.pathsep.join(env['NS3_EXECUTABLE_PATH'])}
    wutils.run_argv([shell], env, os_env)

def _doxygen(bld):
    env = wutils.bld.env

(-)a/wutils.py (+5 lines)

Lines 112-117	Link Here

112

    else:

112

    else:

113

        proc_env['PYTHONPATH'] = pymoddir

113

        proc_env['PYTHONPATH'] = pymoddir

114

115

    if 'PATH' in proc_env:

116

        proc_env['PATH'] = os.pathsep.join(list(env['NS3_EXECUTABLE_PATH']) + [proc_env['PATH']])

117

    else:

118

        proc_env['PATH'] = os.pathsep.join(list(env['NS3_EXECUTABLE_PATH']))

119

115

    return proc_env

120

    return proc_env

116

121

117

def run_argv(argv, env, os_env=None, cwd=None, force_no_valgrind=False):

122

def run_argv(argv, env, os_env=None, cwd=None, force_no_valgrind=False):




      //
      // Execute the socket creation process image.
      //
      status = ::execlp ("emu-sock-creator", 
                        "emu-sock-creator",                             // argv[0] (filename)
                        oss.str ().c_str (),                            // argv[1] (-p<path?
                        (char *)NULL);

      //
      // If the execlp successfully completes, it never returns.  If it returns it failed or the OS is
      // broken.  In either case, we bail.
      //
      NS_FATAL_ERROR ("EmuNetDevice::CreateSocket(): Back from execlp(), errno = " << ::strerror (errno));
    }
  else
    {

    }
}

std::string
EmuNetDevice::FindCreator (std::string creatorName)
{
  NS_LOG_FUNCTION (creatorName);

  std::list<std::string> locations;

  // The path to the bits if we're sitting there with them
  locations.push_back ("./");
  locations.push_back ("./");

  // The path to the bits if we're sitting in the root of the repo
  locations.push_back ("./build/optimized/src/devices/emu/");
  locations.push_back ("./build/debug/src/devices/emu/");

  // if at the level of src (or build)
  locations.push_back ("../build/optimized/src/devices/emu/");
  locations.push_back ("../build/debug/src/devices/emu/");

  // src/devices (or build/debug)
  locations.push_back ("../../build/optimized/src/devices/emu/");
  locations.push_back ("../../build/debug/src/devices/emu/");

  // src/devices/emu (or build/debug/examples)
  locations.push_back ("../../../build/optimized/src/devices/emu/");
  locations.push_back ("../../../build/debug/src/devices/emu/");

  // src/devices/emu (or build/debug/examples/emulation)
  locations.push_back ("../../../../build/optimized/src/devices/emu/");
  locations.push_back ("../../../../build/debug/src/devices/emu/");

  for (std::list<std::string>::const_iterator i = locations.begin (); i != locations.end (); ++i)
    {
      struct stat st;

      if (::stat ((*i + creatorName).c_str (), &st) == 0)
	{
          NS_LOG_INFO ("Found Creator " << *i + creatorName);                  
	  return *i + creatorName;
	}
    }

  NS_FATAL_ERROR ("EmuNetDevice::FindCreator(): Couldn't find creator");
  return ""; // quiet compiler
}

void
EmuNetDevice::StopDevice (void)
{

(-)a/src/devices/emu/emu-net-device.h (-5 lines)

Lines 214-224	Link Here

214

  void CreateSocket (void);

214

  void CreateSocket (void);

215

216

/**

216

/**

217

   * Figure out where the raw socket creation process lives on the system.

218

*/

219

  std::string FindCreator (std::string creatorName);

220

221

/**

222

   * Get a copy of the attached Queue.

217

   * Get a copy of the attached Queue.

223

218

224

   * This method is provided for any derived class that may need to get

219

   * This method is provided for any derived class that may need to get

(-)a/src/devices/emu/wscript (+7 lines)

Lines 1-5	Link Here

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

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

import os.path

def configure(conf):

def configure(conf):

    if conf.env['ENABLE_THREADING']:

    if conf.env['ENABLE_THREADING']:

        conf.env['ENABLE_EMU'] = conf.check(header_name='netpacket/packet.h',

        conf.env['ENABLE_EMU'] = conf.check(header_name='netpacket/packet.h',

Lines 12-17	Link Here

                                     False,

                                     False,

                                     "needs threading support which is not available")

                                     "needs threading support which is not available")

    if conf.env['ENABLE_EMU']:

        blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant()))

        emucreatordir = os.path.abspath(os.path.join(blddir, "src/devices/emu"))

        conf.env.append_value('NS3_EXECUTABLE_PATH', emucreatordir)

def build(bld):

def build(bld):

    module = bld.create_ns3_module('emu', ['node'])

    module = bld.create_ns3_module('emu', ['node'])

    module.source = [

    module.source = [




      //
      // Execute the socket creation process image.
      //
      status = ::execlp ("tap-creator", 
                        "tap-creator",                        // argv[0] (filename)
                        ossDeviceName.str ().c_str (),        // argv[1] (-d<device name>)
                        ossGateway.str ().c_str (),           // argv[2] (-g<gateway>)
                        ossIp.str ().c_str (),                // argv[3] (-i<IP address>)

                        (char *)NULL);

      //
      // If the execlp successfully completes, it never returns.  If it returns it failed or the OS is
      // broken.  In either case, we bail.
      //
      NS_FATAL_ERROR ("TapBridge::CreateTap(): Back from execlp(), errno = " << ::strerror (errno));
    }
  else
    {

    }
}

std::string
TapBridge::FindCreator (std::string creatorName)
{
  NS_LOG_FUNCTION (creatorName);

  std::list<std::string> locations;

  // The path to the bits if we're sitting in the root of the repo
  locations.push_back ("./build/optimized/src/devices/tap-bridge/");
  locations.push_back ("./build/debug/src/devices/tap-bridge/");

  // if in src
  locations.push_back ("../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../build/debug/src/devices/tap-bridge/");

  // if in src/devices
  locations.push_back ("../../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../../build/debug/src/devices/tap-bridge/");

  // if in src/devices/tap-bridge
  locations.push_back ("../../../build/optimized/src/devices/tap-bridge/");
  locations.push_back ("../../../build/debug/src/devices/tap-bridge/");

  for (std::list<std::string>::const_iterator i = locations.begin (); i != locations.end (); ++i)
    {
      struct stat st;

      if (::stat ((*i + creatorName).c_str (), &st) == 0)
	{
          NS_LOG_INFO ("Found Creator " << *i + creatorName);                  
	  return *i + creatorName;
	}
    }

  NS_FATAL_ERROR ("TapBridge::FindCreator(): Couldn't find creator");
  return ""; // quiet compiler
}

void
TapBridge::ReadThread (void)
{




  /**
   * \internal
   *
   * Figure out where the tap creation program lives on the system.
   *
   * \param creatorName The name of the program used to create the Tap.
   * \returns A path name to use when you want to create a Tap.
   */
  std::string FindCreator (std::string creatorName);

  /**
   * \internal
   *
   * Spin up the device
   */
  void StartTapDevice (void);

(-)a/src/devices/tap-bridge/wscript (+7 lines)

Lines 1-5	Link Here

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

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

import os.path

def configure(conf):

def configure(conf):

    if conf.env['ENABLE_THREADING']:

    if conf.env['ENABLE_THREADING']:

        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',

        conf.env['ENABLE_TAP'] = conf.check(header_name='linux/if_tun.h',

Lines 12-17	Link Here

                                     False,

                                     False,

                                     "needs threading support which is not available")

                                     "needs threading support which is not available")

    if conf.env['ENABLE_TAP']:

        blddir = os.path.abspath(os.path.join(conf.blddir, conf.env.variant()))

        tapcreatordir = os.path.abspath(os.path.join(blddir, "src/devices/tap-bridge"))

        conf.env.append_value('NS3_EXECUTABLE_PATH', tapcreatordir)

def build(bld):

def build(bld):

    module = bld.create_ns3_module('tap-bridge', ['node'])

    module = bld.create_ns3_module('tap-bridge', ['node'])

    module.source = [

    module.source = [

Return to bug 720