11
|
1 |
diff -r fc08a4cc768f example/dce-quagga-ospfd-rocketfuel.cc
|
|
2 |
--- a/example/dce-quagga-ospfd-rocketfuel.cc Thu Mar 29 13:55:22 2012 +0900
|
|
3 |
+++ b/example/dce-quagga-ospfd-rocketfuel.cc Thu Mar 29 13:55:54 2012 +0900
|
3
|
4 |
@@ -13,15 +13,18 @@
|
|
5 |
|
|
6 |
#include <sys/resource.h>
|
|
7 |
|
|
8 |
+#define NS3_OPENMPI
|
|
9 |
+#define NS3_MPI
|
|
10 |
#ifdef NS3_MPI
|
|
11 |
#include <mpi.h>
|
|
12 |
+#include "ns3/mpi-interface.h"
|
|
13 |
#endif
|
|
14 |
using namespace ns3;
|
|
15 |
|
|
16 |
NS_LOG_COMPONENT_DEFINE ("quagga-ospfd-rocketfuel");
|
|
17 |
|
|
18 |
// Parameters
|
|
19 |
-uint32_t stopTime = 60;
|
|
20 |
+uint32_t stopTime = 3600;
|
|
21 |
|
|
22 |
static void
|
|
23 |
SetRlimit ()
|
|
24 |
@@ -148,7 +151,7 @@
|
|
25 |
p2p.SetDeviceAttribute ("DataRate", StringValue ("5Mbps"));
|
|
26 |
ndc[i] = p2p.Install (nc[i]);
|
|
27 |
}
|
|
28 |
- // p2p.EnablePcapAll ("quagga-rocketfuel");
|
|
29 |
+// p2p.EnablePcapAll ("quagga-rocketfuel");
|
|
30 |
|
|
31 |
NS_LOG_INFO ("creating ipv4 interfaces");
|
|
32 |
Ipv4InterfaceContainer ipic[totlinks];
|
|
33 |
@@ -166,6 +169,7 @@
|
|
34 |
NS_LOG_INFO ("creating quagga process");
|
|
35 |
//run quagga programs in every node
|
|
36 |
DceManagerHelper processManager;
|
|
37 |
+ processManager.SetLoader ("ns3::DlmLoaderFactory");
|
|
38 |
QuaggaHelper quagga;
|
|
39 |
|
|
40 |
//
|
|
41 |
@@ -195,6 +199,7 @@
|
|
42 |
// std::cout << "[" << systemId << "] start quagga Node " << i << std::endl;
|
|
43 |
processManager.Install (nodes.Get (i));
|
|
44 |
quagga.EnableOspf (nodes.Get (i));
|
|
45 |
+ quagga.EnableOspfDebug (nodes.Get (i));
|
|
46 |
quagga.Install (nodes.Get (i));
|
|
47 |
}
|
|
48 |
}
|
11
|
49 |
diff -r fc08a4cc768f helper/quagga-helper.cc
|
|
50 |
--- a/helper/quagga-helper.cc Thu Mar 29 13:55:22 2012 +0900
|
|
51 |
+++ b/helper/quagga-helper.cc Thu Mar 29 13:55:54 2012 +0900
|
3
|
52 |
@@ -829,9 +829,9 @@
|
|
53 |
|
|
54 |
process.SetBinary ("ospfd");
|
|
55 |
process.AddArguments ("-f", ospf_conf->GetFilename ());
|
|
56 |
- process.AddArguments ("-i", "/usr/local/etc/ospfd.pid");
|
|
57 |
+// process.AddArguments ("-i", "/usr/local/etc/ospfd.pid");
|
|
58 |
apps.Add (process.Install (node));
|
|
59 |
- apps.Get(1)->SetStartTime (Seconds (2.0 + 0.1 * node->GetId ()));
|
|
60 |
+ apps.Get(1)->SetStartTime (Seconds (20.0 + 0.1 * node->GetId ()));
|
|
61 |
node->AddApplication (apps.Get (1));
|
|
62 |
}
|
|
63 |
|
11
|
64 |
diff -r fc08a4cc768f utils/setenv.zsh
|
|
65 |
--- a/utils/setenv.zsh Thu Mar 29 13:55:22 2012 +0900
|
|
66 |
+++ b/utils/setenv.zsh Thu Mar 29 13:55:54 2012 +0900
|
3
|
67 |
@@ -3,7 +3,7 @@
|
|
68 |
# Set environnement for ns3 dce
|
|
69 |
cd `dirname ${BASH_SOURCE:-$0}`/../..
|
|
70 |
BASE=$PWD
|
|
71 |
-LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:."
|
|
72 |
+LD_LIBRARY_PATH="$BASE/ns-3-dce/build/lib:$BASE/build/lib:$BASE/build/bin:$BASE/ns-3-dce/build/bin:.:/usr/local/mpi/gcc/openmpi-1.4.3/lib/"
|
|
73 |
PKG_CONFIG_PATH="$BASE/build/lib/pkgconfig"
|
|
74 |
PATH="$BASE/build/bin:$BASE/build/sbin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/bin:/home/tazaki/hgworks/ns-3-dce-thehajime/build/sbin:$PATH"
|
|
75 |
PYTHONPATH=$BASE/ns-3-dev/build/debug/bindings/python:$BASE/ns-3-dev/src/visualizer:$BASE/pybindgen-0.15.0.795:$BASE/build/lib/python2.6/site-packages/
|
11
|
76 |
diff -r fc08a4cc768f wscript
|
|
77 |
--- a/wscript Thu Mar 29 13:55:22 2012 +0900
|
|
78 |
+++ b/wscript Thu Mar 29 13:55:54 2012 +0900
|
|
79 |
@@ -248,7 +248,7 @@
|
|
80 |
target='bin/dce-bash-simple',
|
|
81 |
source=['example/bash/dce-bash-simple.cc'])
|
|
82 |
|
4
|
83 |
- module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read'],
|
|
84 |
+ module.add_example(needed = ['core', 'internet', 'dce', 'point-to-point', 'applications', 'topology-read', 'visualizer'],
|
|
85 |
target='bin/dce-quagga-ospfd-rocketfuel',
|
|
86 |
source=['example/dce-quagga-ospfd-rocketfuel.cc'])
|
11
|
87 |
|