Attachment #1449 for bug #1462

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

(-)a/test/dce-manager-test.cc (-7 / +17 lines)

Lines 25-31	Link Here

class DceManagerTestCase : public TestCase

class DceManagerTestCase : public TestCase

public:

public:

  DceManagerTestCase (std::string filename, Time maxDuration, std::string stdinFilename, bool useNet, bool useK);

  DceManagerTestCase (std::string filename, Time maxDuration, std::string stdinFilename,

                      bool useNet, bool useK);

private:

private:

  virtual void DoRun (void);

  virtual void DoRun (void);

  static void Finished (int *pstatus, uint16_t pid, int status);

  static void Finished (int *pstatus, uint16_t pid, int status);

Lines 37-45	Link Here

  bool m_useNet;

  bool m_useNet;

};

};

DceManagerTestCase::DceManagerTestCase (std::string filename, Time maxDuration, std::string stdin, bool useNet, bool useK)

DceManagerTestCase::DceManagerTestCase (std::string filename, Time maxDuration,

  : TestCase ("Check that process \"" + filename + "\" completes correctly."),

                                        std::string stdin, bool useNet, bool useK)

    m_filename (filename), m_stdinFilename ( stdin), m_maxDuration ( maxDuration ), m_useKernel (useK), m_useNet (useNet)

  : TestCase ("Check that process \"" + filename +

              (useK ? " (kernel" : " (ns3)") +

              "\" completes correctly."),

    m_filename (filename),

    m_stdinFilename (stdin),

    m_maxDuration (maxDuration),

    m_useKernel (useK),

    m_useNet (useNet)

//  mtrace ();

//  mtrace ();

Lines 83-89	Link Here

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

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

          apps.Start (Seconds (3.0));

          apps.Start (Seconds (3.0));

          //dceManager.SetTaskManagerAttribute( "FiberManagerType", StringValue ( "UcontextFiberManager" ) );

        } else

        } else

          dceManager.Install (nodes);

          dceManager.Install (nodes);

Lines 164-170	Link Here

164

      {  "test-random", 0, "", false },

171

      {  "test-random", 0, "", false },

165

      {  "test-local-socket", 0, "", false },

172

      {  "test-local-socket", 0, "", false },

166

      {  "test-poll", 3200, "", true },

173

      {  "test-poll", 3200, "", true },

167

      //      {  "test-tcp-socket", 320, "", true },

174

      {  "test-tcp-socket", 320, "", true },

168

      {  "test-exec", 0, "" , false},

175

      {  "test-exec", 0, "" , false},

169

      /* {  "test-raw-socket", 320, "", true },*/

176

      /* {  "test-raw-socket", 320, "", true },*/

170

      {  "test-iperf", 0, "" , false},

177

      {  "test-iperf", 0, "" , false},

Lines 193-199	Link Here

193

200

194

  for (unsigned int i = 0; i < sizeof(tests)/sizeof(testPair); i++)

201

  for (unsigned int i = 0; i < sizeof(tests)/sizeof(testPair); i++)

195

202

196

      AddTestCase (new DceManagerTestCase (tests[i].name,  Seconds (tests[i].duration), tests[i].stdinfile, tests[i].useNet, useKernel () ) );

203

      AddTestCase (new DceManagerTestCase (tests[i].name,  Seconds (tests[i].duration),

204

                                           tests[i].stdinfile,

205

                                           tests[i].useNet,

206

                                           useKernel ()));

197

207

198

208

199

209




#!/bin/sh

. ./utils/setenv.sh
#VERBOSE=""

echo -n "Cooja (non-vdl) + Pthread:  "
NS_ATTRIBUTE_DEFAULT='ns3::TaskManager::FiberManagerType=PthreadFiberManager' ./build/bin/ns3test-dce $VERBOSE
echo -n "Cooja (non-vdl) + Ucontext: "
NS_ATTRIBUTE_DEFAULT='ns3::TaskManager::FiberManagerType=UcontextFiberManager' ./build/bin/ns3test-dce $VERBOSE

echo -n "Cooja (vdl) + Pthread:      "
NS_ATTRIBUTE_DEFAULT='ns3::DceManagerHelper::LoaderFactory=ns3::CoojaLoaderFactory[];ns3::TaskManager::FiberManagerType=PthreadFiberManager' ./build/bin/ns3test-dce-vdl $VERBOSE

echo -n "Cooja (vdl) + Ucontext:     "
NS_ATTRIBUTE_DEFAULT='ns3::DceManagerHelper::LoaderFactory=ns3::CoojaLoaderFactory[];ns3::TaskManager::FiberManagerType=UcontextFiberManager' ./build/bin/ns3test-dce-vdl $VERBOSE

echo -n "Dlm (vdl) + Pthread:        "
NS_ATTRIBUTE_DEFAULT='ns3::DceManagerHelper::LoaderFactory=ns3::DlmLoaderFactory[];ns3::TaskManager::FiberManagerType=PthreadFiberManager' ./build/bin/ns3test-dce-vdl $VERBOSE
echo -n "Dlm (vdl) + Ucontext:       "
NS_ATTRIBUTE_DEFAULT='ns3::DceManagerHelper::LoaderFactory=ns3::DlmLoaderFactory[];ns3::TaskManager::FiberManagerType=UcontextFiberManager' ./build/bin/ns3test-dce-vdl $VERBOSE

(-)a/wscript (+4 lines)

Lines 136-143	Link Here

136

def build_dce_tests(module, kern):

136

def build_dce_tests(module, kern):

137

    if kern:

137

    if kern:

138

        module.add_runner_test(needed=['core', 'dce', 'internet'],  source=['test/dce-manager-test.cc', 'test/with-kernel.cc'])

138

        module.add_runner_test(needed=['core', 'dce', 'internet'],  source=['test/dce-manager-test.cc', 'test/with-kernel.cc'])

139

        module.add_runner_test(needed=['core', 'dce', 'internet'],  source=['test/dce-manager-test.cc', 'test/with-kernel.cc'],

140

                               linkflags = ['-Wl,--dynamic-linker=' + os.path.abspath ('../build/lib/ldso')], name='vdl')

139

    else:

141

    else:

140

        module.add_runner_test(needed=['core', 'dce', 'internet'], source=['test/dce-manager-test.cc','test/without-kernel.cc'])

142

        module.add_runner_test(needed=['core', 'dce', 'internet'], source=['test/dce-manager-test.cc','test/without-kernel.cc'])

143

        module.add_runner_test(needed=['core', 'dce', 'internet'], source=['test/dce-manager-test.cc','test/without-kernel.cc'],

144

                               linkflags = ['-Wl,--dynamic-linker=' + os.path.abspath ('../build/lib/ldso')], name='vdl')

141

145

142

    module.add_test(features='cxx cxxshlib', source=['test/test-macros.cc'],

146

    module.add_test(features='cxx cxxshlib', source=['test/test-macros.cc'],

143

                    target='lib/test', linkflags=['-Wl,-soname=libtest.so'])

147

                    target='lib/test', linkflags=['-Wl,-soname=libtest.so'])

Return to bug 1462