diff --git a/examples/animation/dumbbell-animation.cc b/examples/animation/dumbbell-animation.cc index 702cdb4a2..3fcd7a3b3 100644 --- a/examples/animation/dumbbell-animation.cc +++ b/examples/animation/dumbbell-animation.cc @@ -19,7 +19,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/grid-animation.cc b/examples/animation/grid-animation.cc index 330be3f89..be9b6410c 100644 --- a/examples/animation/grid-animation.cc +++ b/examples/animation/grid-animation.cc @@ -19,7 +19,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/animation/star-animation.cc b/examples/animation/star-animation.cc index 9d70b0e4f..b7e6d7ba3 100644 --- a/examples/animation/star-animation.cc +++ b/examples/animation/star-animation.cc @@ -16,7 +16,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/csma/csma-broadcast.cc b/examples/csma/csma-broadcast.cc index a718385fd..312526dc7 100644 --- a/examples/csma/csma-broadcast.cc +++ b/examples/csma/csma-broadcast.cc @@ -33,7 +33,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-multicast.cc b/examples/csma/csma-multicast.cc index 4fe8f7b4c..78583e0fe 100644 --- a/examples/csma/csma-multicast.cc +++ b/examples/csma/csma-multicast.cc @@ -33,7 +33,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/csma/csma-one-subnet.cc b/examples/csma/csma-one-subnet.cc index 9ba1c0d0a..b0a81868b 100644 --- a/examples/csma/csma-one-subnet.cc +++ b/examples/csma/csma-one-subnet.cc @@ -28,7 +28,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-packet-socket.cc b/examples/csma/csma-packet-socket.cc index d9ef8d204..4e86168cc 100644 --- a/examples/csma/csma-packet-socket.cc +++ b/examples/csma/csma-packet-socket.cc @@ -33,7 +33,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-ping.cc b/examples/csma/csma-ping.cc index 5419b2458..c9b458239 100644 --- a/examples/csma/csma-ping.cc +++ b/examples/csma/csma-ping.cc @@ -29,7 +29,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-raw-ip-socket.cc b/examples/csma/csma-raw-ip-socket.cc index f10d2142c..e3bd6feeb 100644 --- a/examples/csma/csma-raw-ip-socket.cc +++ b/examples/csma/csma-raw-ip-socket.cc @@ -32,7 +32,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/csma/csma-star.cc b/examples/csma/csma-star.cc index 8ff38f7e1..69fdfd73c 100644 --- a/examples/csma/csma-star.cc +++ b/examples/csma/csma-star.cc @@ -16,7 +16,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/csma-module.h" diff --git a/examples/emulation/emu-ping.cc b/examples/emulation/emu-ping.cc index c5c3143e0..250ea1864 100644 --- a/examples/emulation/emu-ping.cc +++ b/examples/emulation/emu-ping.cc @@ -53,7 +53,7 @@ #include "ns3/abort.h" #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/emu-module.h" #include "ns3/v4ping-module.h" diff --git a/examples/emulation/emu-udp-echo.cc b/examples/emulation/emu-udp-echo.cc index 6e8e79875..29fc7e47e 100644 --- a/examples/emulation/emu-udp-echo.cc +++ b/examples/emulation/emu-udp-echo.cc @@ -63,7 +63,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/emu-helper.h" diff --git a/examples/energy/wscript b/examples/energy/wscript index aa50f98a9..b66442ff4 100644 --- a/examples/energy/wscript +++ b/examples/energy/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('energy-model-example', ['core', 'simulator', 'mobility', 'wifi', 'energy', 'internet-stack']) - obj.source = 'energy-model-example.cc' \ No newline at end of file + obj = bld.create_ns3_program('energy-model-example', ['core', 'mobility', 'wifi', 'energy', 'internet-stack']) + obj.source = 'energy-model-example.cc' diff --git a/examples/error-model/simple-error-model.cc b/examples/error-model/simple-error-model.cc index 327a542c7..e47e125ce 100644 --- a/examples/error-model/simple-error-model.cc +++ b/examples/error-model/simple-error-model.cc @@ -37,7 +37,7 @@ #include #include "ns3/core-module.h" #include "ns3/common-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/ipv6/fragmentation-ipv6.cc b/examples/ipv6/fragmentation-ipv6.cc index be1281111..819a622fb 100644 --- a/examples/ipv6/fragmentation-ipv6.cc +++ b/examples/ipv6/fragmentation-ipv6.cc @@ -30,7 +30,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/icmpv6-redirect.cc b/examples/ipv6/icmpv6-redirect.cc index 87c57aa8b..231e6285f 100644 --- a/examples/ipv6/icmpv6-redirect.cc +++ b/examples/ipv6/icmpv6-redirect.cc @@ -42,7 +42,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/ipv6/loose-routing-ipv6.cc b/examples/ipv6/loose-routing-ipv6.cc index 2f631321e..e7332fc3d 100644 --- a/examples/ipv6/loose-routing-ipv6.cc +++ b/examples/ipv6/loose-routing-ipv6.cc @@ -40,7 +40,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/ipv6-header.h" using namespace ns3; diff --git a/examples/ipv6/ping6.cc b/examples/ipv6/ping6.cc index ce9e476e9..1a099aa0b 100644 --- a/examples/ipv6/ping6.cc +++ b/examples/ipv6/ping6.cc @@ -31,7 +31,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/ipv6/radvd-two-prefix.cc b/examples/ipv6/radvd-two-prefix.cc index ee8638e9b..91048a74d 100644 --- a/examples/ipv6/radvd-two-prefix.cc +++ b/examples/ipv6/radvd-two-prefix.cc @@ -34,7 +34,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/ipv6-routing-table-entry.h" diff --git a/examples/ipv6/radvd.cc b/examples/ipv6/radvd.cc index 2da628d4c..e5f57897d 100644 --- a/examples/ipv6/radvd.cc +++ b/examples/ipv6/radvd.cc @@ -33,7 +33,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/radvd.h" diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index b18f35ddd..218b6e88c 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -47,7 +47,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/global-route-manager.h" diff --git a/examples/mesh/mesh.cc b/examples/mesh/mesh.cc index 866b28a33..410a88f6c 100644 --- a/examples/mesh/mesh.cc +++ b/examples/mesh/mesh.cc @@ -45,7 +45,7 @@ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" diff --git a/examples/mesh/wscript b/examples/mesh/wscript index dc8917831..5a87e93e5 100644 --- a/examples/mesh/wscript +++ b/examples/mesh/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('mesh', ['core', 'simulator', 'mobility', 'wifi', 'mesh']) + obj = bld.create_ns3_program('mesh', ['core', 'mobility', 'wifi', 'mesh']) obj.source = 'mesh.cc' diff --git a/examples/mobility/ns2-mobility-trace.cc b/examples/mobility/ns2-mobility-trace.cc index eade597f9..d71500bd0 100644 --- a/examples/mobility/ns2-mobility-trace.cc +++ b/examples/mobility/ns2-mobility-trace.cc @@ -56,7 +56,7 @@ #include "ns3/core-module.h" #include "ns3/mobility-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" #include "ns3/ns2-mobility-helper.h" diff --git a/examples/mobility/wscript b/examples/mobility/wscript index 73537ff83..fe4024cf1 100644 --- a/examples/mobility/wscript +++ b/examples/mobility/wscript @@ -1,6 +1,6 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('ns2-mobility-trace', ['core', 'simulator', 'mobility', 'wifi', 'mesh']) + obj = bld.create_ns3_program('ns2-mobility-trace', ['core', 'mobility', 'wifi', 'mesh']) obj.source = 'ns2-mobility-trace.cc' diff --git a/examples/mpi/nms-p2p-nix-distributed.cc b/examples/mpi/nms-p2p-nix-distributed.cc index afd24c5f0..04d89e9ee 100644 --- a/examples/mpi/nms-p2p-nix-distributed.cc +++ b/examples/mpi/nms-p2p-nix-distributed.cc @@ -39,7 +39,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" diff --git a/examples/mpi/simple-distributed.cc b/examples/mpi/simple-distributed.cc index 9bde4d35e..e8d400959 100644 --- a/examples/mpi/simple-distributed.cc +++ b/examples/mpi/simple-distributed.cc @@ -42,7 +42,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/mpi-interface.h" diff --git a/examples/mpi/third-distributed.cc b/examples/mpi/third-distributed.cc index 6e292631c..e9939ae1f 100644 --- a/examples/mpi/third-distributed.cc +++ b/examples/mpi/third-distributed.cc @@ -15,7 +15,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" diff --git a/examples/naming/object-names.cc b/examples/naming/object-names.cc index d3841d276..77d597abd 100644 --- a/examples/naming/object-names.cc +++ b/examples/naming/object-names.cc @@ -23,7 +23,7 @@ // #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/naming/wscript b/examples/naming/wscript index ac0e7735b..188cb9d3d 100644 --- a/examples/naming/wscript +++ b/examples/naming/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('object-names', ['core', 'simulator', 'csma', 'internet-stack']) + obj = bld.create_ns3_program('object-names', ['core', 'csma', 'internet-stack']) obj.source = 'object-names.cc' diff --git a/examples/realtime/realtime-udp-echo.cc b/examples/realtime/realtime-udp-echo.cc index c650a1ae3..bc99c0dc8 100644 --- a/examples/realtime/realtime-udp-echo.cc +++ b/examples/realtime/realtime-udp-echo.cc @@ -27,7 +27,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/routing/dynamic-global-routing.cc b/examples/routing/dynamic-global-routing.cc index dd6bbb1c8..a3dba07c5 100644 --- a/examples/routing/dynamic-global-routing.cc +++ b/examples/routing/dynamic-global-routing.cc @@ -68,7 +68,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/global-injection-slash32.cc b/examples/routing/global-injection-slash32.cc index af0cb4cff..5925e79e0 100644 --- a/examples/routing/global-injection-slash32.cc +++ b/examples/routing/global-injection-slash32.cc @@ -26,7 +26,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing.h" diff --git a/examples/routing/global-routing-slash32.cc b/examples/routing/global-routing-slash32.cc index cd75f33cb..d6497cab5 100644 --- a/examples/routing/global-routing-slash32.cc +++ b/examples/routing/global-routing-slash32.cc @@ -26,7 +26,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/mixed-global-routing.cc b/examples/routing/mixed-global-routing.cc index 7ff2714e9..5c79b7f51 100644 --- a/examples/routing/mixed-global-routing.cc +++ b/examples/routing/mixed-global-routing.cc @@ -37,7 +37,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/nix-simple.cc b/examples/routing/nix-simple.cc index f2d7286df..0d934ac55 100644 --- a/examples/routing/nix-simple.cc +++ b/examples/routing/nix-simple.cc @@ -15,7 +15,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/routing/nms-p2p-nix.cc b/examples/routing/nms-p2p-nix.cc index 961a5cbf2..69049301c 100644 --- a/examples/routing/nms-p2p-nix.cc +++ b/examples/routing/nms-p2p-nix.cc @@ -37,7 +37,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" diff --git a/examples/routing/simple-alternate-routing.cc b/examples/routing/simple-alternate-routing.cc index 060e374f2..7d3e76c0a 100644 --- a/examples/routing/simple-alternate-routing.cc +++ b/examples/routing/simple-alternate-routing.cc @@ -38,7 +38,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/routing/simple-global-routing.cc b/examples/routing/simple-global-routing.cc index 8cfbd328e..ab843a2ca 100644 --- a/examples/routing/simple-global-routing.cc +++ b/examples/routing/simple-global-routing.cc @@ -40,7 +40,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/flow-monitor-helper.h" diff --git a/examples/routing/simple-routing-ping6.cc b/examples/routing/simple-routing-ping6.cc index 510cfbb49..cbbee0be5 100644 --- a/examples/routing/simple-routing-ping6.cc +++ b/examples/routing/simple-routing-ping6.cc @@ -30,7 +30,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/ipv6-static-routing-helper.h" diff --git a/examples/routing/static-routing-slash32.cc b/examples/routing/static-routing-slash32.cc index 4b598b00f..72fad8e35 100644 --- a/examples/routing/static-routing-slash32.cc +++ b/examples/routing/static-routing-slash32.cc @@ -26,7 +26,7 @@ #include "ns3/csma-net-device.h" #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/socket/socket-bound-static-routing.cc b/examples/socket/socket-bound-static-routing.cc index 4603fac17..9b1519b88 100644 --- a/examples/socket/socket-bound-static-routing.cc +++ b/examples/socket/socket-bound-static-routing.cc @@ -36,7 +36,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/socket/socket-bound-tcp-static-routing.cc b/examples/socket/socket-bound-tcp-static-routing.cc index 5748d9d69..372cefb2b 100644 --- a/examples/socket/socket-bound-tcp-static-routing.cc +++ b/examples/socket/socket-bound-tcp-static-routing.cc @@ -36,7 +36,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-static-routing-helper.h" diff --git a/examples/stats/wifi-example-apps.cc b/examples/stats/wifi-example-apps.cc index 65a25b372..a32e39b2e 100644 --- a/examples/stats/wifi-example-apps.cc +++ b/examples/stats/wifi-example-apps.cc @@ -29,7 +29,7 @@ #include "ns3/core-module.h" #include "ns3/common-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/internet-stack-module.h" diff --git a/examples/tap/tap-csma-virtual-machine.cc b/examples/tap/tap-csma-virtual-machine.cc index e9eeb77b9..8d66246fb 100644 --- a/examples/tap/tap-csma-virtual-machine.cc +++ b/examples/tap/tap-csma-virtual-machine.cc @@ -61,7 +61,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/examples/tap/tap-csma.cc b/examples/tap/tap-csma.cc index e47cdad92..88d2c6318 100644 --- a/examples/tap/tap-csma.cc +++ b/examples/tap/tap-csma.cc @@ -57,7 +57,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" diff --git a/examples/tap/tap-wifi-dumbbell.cc b/examples/tap/tap-wifi-dumbbell.cc index 3a4680069..6d1e2740e 100644 --- a/examples/tap/tap-wifi-dumbbell.cc +++ b/examples/tap/tap-wifi-dumbbell.cc @@ -99,7 +99,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" diff --git a/examples/tap/tap-wifi-virtual-machine.cc b/examples/tap/tap-wifi-virtual-machine.cc index 5d08e1862..f1121bf38 100644 --- a/examples/tap/tap-wifi-virtual-machine.cc +++ b/examples/tap/tap-wifi-virtual-machine.cc @@ -69,7 +69,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/wifi-module.h" diff --git a/examples/tcp/star.cc b/examples/tcp/star.cc index 69e0b2eba..98c0967b1 100644 --- a/examples/tcp/star.cc +++ b/examples/tcp/star.cc @@ -16,7 +16,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tcp/tcp-bulk-send.cc b/examples/tcp/tcp-bulk-send.cc index 28a2f7b5e..482e07839 100644 --- a/examples/tcp/tcp-bulk-send.cc +++ b/examples/tcp/tcp-bulk-send.cc @@ -27,7 +27,7 @@ #include #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" #include "ns3/packet-sink.h" diff --git a/examples/tcp/tcp-large-transfer.cc b/examples/tcp/tcp-large-transfer.cc index 2281c1495..343201afc 100644 --- a/examples/tcp/tcp-large-transfer.cc +++ b/examples/tcp/tcp-large-transfer.cc @@ -39,7 +39,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-nsc-lfn.cc b/examples/tcp/tcp-nsc-lfn.cc index d3f715a89..2e452be3a 100644 --- a/examples/tcp/tcp-nsc-lfn.cc +++ b/examples/tcp/tcp-nsc-lfn.cc @@ -36,7 +36,7 @@ #include "ns3/common-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index e0a89dcd7..b012293c8 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/examples/tcp/tcp-nsc-zoo.cc @@ -33,7 +33,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/ipv4-global-routing-helper.h" using namespace ns3; diff --git a/examples/tcp/tcp-star-server.cc b/examples/tcp/tcp-star-server.cc index 6b7bab516..cd3e25fe6 100644 --- a/examples/tcp/tcp-star-server.cc +++ b/examples/tcp/tcp-star-server.cc @@ -49,7 +49,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/topology-read/topology-example-sim.cc b/examples/topology-read/topology-example-sim.cc index 48ffcf3b6..a19c7e069 100644 --- a/examples/topology-read/topology-example-sim.cc +++ b/examples/topology-read/topology-example-sim.cc @@ -30,7 +30,7 @@ #include "ns3/common-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/ipv4-static-routing-helper.h" #include "ns3/ipv4-list-routing-helper.h" diff --git a/examples/tutorial/fifth.cc b/examples/tutorial/fifth.cc index 3687cec2a..db9dfcb4d 100644 --- a/examples/tutorial/fifth.cc +++ b/examples/tutorial/fifth.cc @@ -17,7 +17,7 @@ #include #include "ns3/core-module.h" #include "ns3/common-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/tutorial/first.cc b/examples/tutorial/first.cc index 0461d4cc9..5164c16a0 100644 --- a/examples/tutorial/first.cc +++ b/examples/tutorial/first.cc @@ -15,7 +15,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/tutorial/second.cc b/examples/tutorial/second.cc index 93485a88a..f683aeaa2 100644 --- a/examples/tutorial/second.cc +++ b/examples/tutorial/second.cc @@ -15,7 +15,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/ipv4-global-routing-helper.h" diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index 10a50647c..882291f70 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -17,7 +17,7 @@ #include #include "ns3/core-module.h" #include "ns3/common-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" diff --git a/examples/tutorial/third.cc b/examples/tutorial/third.cc index 5b31a84f8..1506bed3e 100644 --- a/examples/tutorial/third.cc +++ b/examples/tutorial/third.cc @@ -15,7 +15,7 @@ */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" diff --git a/examples/tutorial/wscript b/examples/tutorial/wscript index 5886bad6a..4e240e1a1 100644 --- a/examples/tutorial/wscript +++ b/examples/tutorial/wscript @@ -4,20 +4,20 @@ def build(bld): obj = bld.create_ns3_program('hello-simulator', ['core']) obj.source = 'hello-simulator.cc' - obj = bld.create_ns3_program('first', ['core', 'simulator', 'point-to-point', 'internet-stack']) + obj = bld.create_ns3_program('first', ['core', 'point-to-point', 'internet-stack']) obj.source = 'first.cc' - obj = bld.create_ns3_program('second', ['core', 'simulator', 'point-to-point', 'csma', 'internet-stack']) + obj = bld.create_ns3_program('second', ['core', 'point-to-point', 'csma', 'internet-stack']) obj.source = 'second.cc' - obj = bld.create_ns3_program('third', ['core', 'simulator', 'point-to-point', 'csma', 'wifi', 'internet-stack']) + obj = bld.create_ns3_program('third', ['core', 'point-to-point', 'csma', 'wifi', 'internet-stack']) obj.source = 'third.cc' obj = bld.create_ns3_program('fourth', ['core']) obj.source = 'fourth.cc' - obj = bld.create_ns3_program('fifth', ['core', 'simulator', 'point-to-point', 'internet-stack']) + obj = bld.create_ns3_program('fifth', ['core', 'point-to-point', 'internet-stack']) obj.source = 'fifth.cc' - obj = bld.create_ns3_program('sixth', ['core', 'simulator', 'point-to-point', 'internet-stack']) + obj = bld.create_ns3_program('sixth', ['core', 'point-to-point', 'internet-stack']) obj.source = 'sixth.cc' diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc index 60aab2bb4..10721f45e 100644 --- a/examples/udp-client-server/udp-client-server.cc +++ b/examples/udp-client-server/udp-client-server.cc @@ -25,7 +25,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/udp-client-server/udp-trace-client-server.cc b/examples/udp-client-server/udp-trace-client-server.cc index b9bb0edc8..d82703071 100644 --- a/examples/udp-client-server/udp-trace-client-server.cc +++ b/examples/udp-client-server/udp-trace-client-server.cc @@ -25,7 +25,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/udp/udp-echo.cc b/examples/udp/udp-echo.cc index 657758ef4..956994ef8 100644 --- a/examples/udp/udp-echo.cc +++ b/examples/udp/udp-echo.cc @@ -27,7 +27,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/examples/wireless/simple-wifi-frame-aggregation.cc b/examples/wireless/simple-wifi-frame-aggregation.cc index b70b77aa7..cd268303b 100644 --- a/examples/wireless/simple-wifi-frame-aggregation.cc +++ b/examples/wireless/simple-wifi-frame-aggregation.cc @@ -18,7 +18,7 @@ * Author: Mirko Banchi */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 8b9f64020..e1411a21a 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -40,7 +40,7 @@ * - the recipient receives a block ack request or a MPDU with ack policy Block Ack. */ #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/global-routing-module.h" diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index b236356f5..a16a377a0 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -44,7 +44,7 @@ // #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/mobility-module.h" #include "ns3/helper-module.h" #include "ns3/wifi-module.h" diff --git a/examples/wireless/wscript b/examples/wireless/wscript index 37008f341..cf3d4663a 100644 --- a/examples/wireless/wscript +++ b/examples/wireless/wscript @@ -1,45 +1,45 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('mixed-wireless', ['core', 'simulator', 'mobility', 'wifi', 'point-to-point', + obj = bld.create_ns3_program('mixed-wireless', ['core', 'mobility', 'wifi', 'point-to-point', 'internet-stack']) obj.source = 'mixed-wireless.cc' - obj = bld.create_ns3_program('wifi-adhoc', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-adhoc', ['core', 'mobility', 'wifi']) obj.source = 'wifi-adhoc.cc' - obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-clear-channel-cmu', ['core', 'mobility', 'wifi']) obj.source = 'wifi-clear-channel-cmu.cc' - obj = bld.create_ns3_program('wifi-ap', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-ap', ['core', 'mobility', 'wifi']) obj.source = 'wifi-ap.cc' - obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'simulator', 'mobility', 'wifi', 'csma', 'helper', 'bridge']) + obj = bld.create_ns3_program('wifi-wired-bridging', ['core', 'mobility', 'wifi', 'csma', 'helper', 'bridge']) obj.source = 'wifi-wired-bridging.cc' - obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('simple-wifi-frame-aggregation', ['core', 'mobility', 'wifi']) obj.source = 'simple-wifi-frame-aggregation.cc' - obj = bld.create_ns3_program('multirate', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('multirate', ['core', 'mobility', 'wifi']) obj.source = 'multirate.cc' - obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-simple-adhoc', ['core', 'mobility', 'wifi']) obj.source = 'wifi-simple-adhoc.cc' - obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-simple-adhoc-grid', ['core', 'mobility', 'wifi']) obj.source = 'wifi-simple-adhoc-grid.cc' - obj = bld.create_ns3_program('wifi-simple-infra', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-simple-infra', ['core', 'mobility', 'wifi']) obj.source = 'wifi-simple-infra.cc' - obj = bld.create_ns3_program('wifi-simple-interference', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-simple-interference', ['core', 'mobility', 'wifi']) obj.source = 'wifi-simple-interference.cc' - obj = bld.create_ns3_program('wifi-blockack', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('wifi-blockack', ['core', 'mobility', 'wifi']) obj.source = 'wifi-blockack.cc' - obj = bld.create_ns3_program('ofdm-validation', ['core', 'simulator', 'mobility', 'wifi']) + obj = bld.create_ns3_program('ofdm-validation', ['core', 'mobility', 'wifi']) obj.source = 'ofdm-validation.cc' - obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'simulator', 'mobility', 'wifi', 'propagation', 'flow-monitor']) + obj = bld.create_ns3_program('wifi-hidden-terminal', ['core', 'mobility', 'wifi', 'propagation', 'flow-monitor']) obj.source = 'wifi-hidden-terminal.cc' diff --git a/samples/main-random-topology.cc b/samples/main-random-topology.cc index 2fae6f119..ea070a598 100644 --- a/samples/main-random-topology.cc +++ b/samples/main-random-topology.cc @@ -2,7 +2,7 @@ #include "ns3/core-module.h" #include "ns3/mobility-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/helper-module.h" using namespace ns3; diff --git a/samples/main-random-walk.cc b/samples/main-random-walk.cc index 4a2106cf5..e5893f6b7 100644 --- a/samples/main-random-walk.cc +++ b/samples/main-random-walk.cc @@ -3,7 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/mobility-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" using namespace ns3; diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 92c6e5c36..f48b6ed1b 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -3,7 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" using namespace ns3; diff --git a/samples/wscript b/samples/wscript index b20363455..d67242b75 100644 --- a/samples/wscript +++ b/samples/wscript @@ -11,7 +11,7 @@ def build(bld): obj = bld.create_ns3_program('main-callback', ['core']) obj.source = 'main-callback.cc' - obj = bld.create_ns3_program('sample-simulator', ['core', 'simulator']) + obj = bld.create_ns3_program('sample-simulator', ['core']) obj.source = 'sample-simulator.cc' obj = bld.create_ns3_program('main-ptr', ['core'] ) @@ -20,10 +20,10 @@ def build(bld): obj = bld.create_ns3_program('main-random-variable', ['core', 'contrib']) obj.source = 'main-random-variable.cc' - obj = bld.create_ns3_program('main-packet-header', ['common', 'simulator']) + obj = bld.create_ns3_program('main-packet-header', ['common', 'core']) obj.source = 'main-packet-header.cc' - obj = bld.create_ns3_program('main-packet-tag', ['common', 'simulator']) + obj = bld.create_ns3_program('main-packet-tag', ['common', 'core']) obj.source = 'main-packet-tag.cc' if bld.env['ENABLE_THREADING'] and bld.env["ENABLE_REAL_TIME"]: @@ -35,22 +35,22 @@ def build(bld): obj.source = 'main-simple.cc' obj = bld.create_ns3_program('main-grid-topology', - ['core', 'simulator', 'mobility', 'internet-stack']) + ['core', 'mobility', 'internet-stack']) obj.source = 'main-grid-topology.cc' obj = bld.create_ns3_program('main-random-topology', - ['core', 'simulator', 'helper', 'mobility']) + ['core', 'helper', 'mobility']) obj.source = 'main-random-topology.cc' obj = bld.create_ns3_program('main-random-walk', - ['core', 'simulator', 'helper', 'mobility']) + ['core', 'helper', 'mobility']) obj.source = 'main-random-walk.cc' obj = bld.create_ns3_program('main-propagation-loss', - ['core', 'simulator', 'mobility', 'wifi']) + ['core', 'mobility', 'wifi']) obj.source = 'main-propagation-loss.cc' obj = bld.create_ns3_program('sample-random-variable', - ['core', 'simulator']) + ['core']) obj.source = 'sample-random-variable.cc' diff --git a/scratch/multiple-sources/simple-simulation.cc b/scratch/multiple-sources/simple-simulation.cc index 8650842e2..5fb56ee4c 100644 --- a/scratch/multiple-sources/simple-simulation.cc +++ b/scratch/multiple-sources/simple-simulation.cc @@ -3,7 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" using namespace ns3; diff --git a/scratch/simple.cc b/scratch/simple.cc index a5f408ba5..889321bdc 100644 --- a/scratch/simple.cc +++ b/scratch/simple.cc @@ -3,7 +3,7 @@ #include "ns3/core-module.h" #include "ns3/helper-module.h" #include "ns3/node-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" using namespace ns3; diff --git a/src/applications/bulk-send/wscript b/src/applications/bulk-send/wscript index c8bbe7d77..8a53e04b5 100644 --- a/src/applications/bulk-send/wscript +++ b/src/applications/bulk-send/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('bulk-send', ['core', 'simulator', 'node']) + module = bld.create_ns3_module('bulk-send', ['core', 'node']) module.source = [ 'bulk-send-application.cc', ] diff --git a/src/applications/onoff/wscript b/src/applications/onoff/wscript index 961dcaac5..ec72ac135 100644 --- a/src/applications/onoff/wscript +++ b/src/applications/onoff/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - module = bld.create_ns3_module('onoff', ['core', 'simulator', 'node']) + module = bld.create_ns3_module('onoff', ['core', 'node']) module.source = [ 'onoff-application.cc', ] diff --git a/src/common/wscript b/src/common/wscript index bf0d9335d..3fb50e9d5 100644 --- a/src/common/wscript +++ b/src/common/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - common = bld.create_ns3_module('common', ['core', 'simulator', 'mobility']) + common = bld.create_ns3_module('common', ['core', 'mobility']) common.source = [ 'buffer.cc', 'buffer-test.cc', diff --git a/src/contrib/energy/examples/wscript b/src/contrib/energy/examples/wscript index 295000bc4..68fd1e26f 100644 --- a/src/contrib/energy/examples/wscript +++ b/src/contrib/energy/examples/wscript @@ -1,5 +1,5 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('li-ion-energy-source', ['core', 'simulator', 'energy']) + obj = bld.create_ns3_program('li-ion-energy-source', ['core', 'energy']) obj.source = 'li-ion-energy-source.cc' diff --git a/src/contrib/wscript b/src/contrib/wscript index aa322122c..eb9ad5b6a 100644 --- a/src/contrib/wscript +++ b/src/contrib/wscript @@ -20,7 +20,7 @@ def configure(conf): def build(bld): - module = bld.create_ns3_module('contrib', ['simulator', 'common']) + module = bld.create_ns3_module('contrib', ['core', 'common']) module.source = [ 'event-garbage-collector.cc', 'gnuplot.cc', diff --git a/src/core/abort.h b/src/core/model/abort.h similarity index 100% rename from src/core/abort.h rename to src/core/model/abort.h diff --git a/src/core/assert.h b/src/core/model/assert.h similarity index 100% rename from src/core/assert.h rename to src/core/model/assert.h diff --git a/src/core/attribute-accessor-helper.h b/src/core/model/attribute-accessor-helper.h similarity index 100% rename from src/core/attribute-accessor-helper.h rename to src/core/model/attribute-accessor-helper.h diff --git a/src/core/attribute-helper.h b/src/core/model/attribute-helper.h similarity index 100% rename from src/core/attribute-helper.h rename to src/core/model/attribute-helper.h diff --git a/src/core/attribute-list.cc b/src/core/model/attribute-list.cc similarity index 100% rename from src/core/attribute-list.cc rename to src/core/model/attribute-list.cc diff --git a/src/core/attribute-list.h b/src/core/model/attribute-list.h similarity index 100% rename from src/core/attribute-list.h rename to src/core/model/attribute-list.h diff --git a/src/core/attribute.cc b/src/core/model/attribute.cc similarity index 100% rename from src/core/attribute.cc rename to src/core/model/attribute.cc diff --git a/src/core/attribute.h b/src/core/model/attribute.h similarity index 100% rename from src/core/attribute.h rename to src/core/model/attribute.h diff --git a/src/core/boolean.cc b/src/core/model/boolean.cc similarity index 100% rename from src/core/boolean.cc rename to src/core/model/boolean.cc diff --git a/src/core/boolean.h b/src/core/model/boolean.h similarity index 100% rename from src/core/boolean.h rename to src/core/model/boolean.h diff --git a/src/core/breakpoint.cc b/src/core/model/breakpoint.cc similarity index 100% rename from src/core/breakpoint.cc rename to src/core/model/breakpoint.cc diff --git a/src/core/breakpoint.h b/src/core/model/breakpoint.h similarity index 100% rename from src/core/breakpoint.h rename to src/core/model/breakpoint.h diff --git a/src/simulator/cairo-wideint-private.h b/src/core/model/cairo-wideint-private.h similarity index 99% rename from src/simulator/cairo-wideint-private.h rename to src/core/model/cairo-wideint-private.h index bbbca4fd7..5b407ef14 100644 --- a/src/simulator/cairo-wideint-private.h +++ b/src/core/model/cairo-wideint-private.h @@ -32,7 +32,7 @@ #ifndef CAIRO_WIDEINT_H #define CAIRO_WIDEINT_H -#include "ns3/simulator-config.h" +#include "ns3/core-config.h" #define cairo_private #define HAVE_UINT64_T 1 diff --git a/src/simulator/cairo-wideint.c b/src/core/model/cairo-wideint.c similarity index 100% rename from src/simulator/cairo-wideint.c rename to src/core/model/cairo-wideint.c diff --git a/src/simulator/calendar-scheduler.cc b/src/core/model/calendar-scheduler.cc similarity index 100% rename from src/simulator/calendar-scheduler.cc rename to src/core/model/calendar-scheduler.cc diff --git a/src/simulator/calendar-scheduler.h b/src/core/model/calendar-scheduler.h similarity index 100% rename from src/simulator/calendar-scheduler.h rename to src/core/model/calendar-scheduler.h diff --git a/src/core/callback.cc b/src/core/model/callback.cc similarity index 100% rename from src/core/callback.cc rename to src/core/model/callback.cc diff --git a/src/core/callback.h b/src/core/model/callback.h similarity index 100% rename from src/core/callback.h rename to src/core/model/callback.h diff --git a/src/core/command-line.cc b/src/core/model/command-line.cc similarity index 100% rename from src/core/command-line.cc rename to src/core/model/command-line.cc diff --git a/src/core/command-line.h b/src/core/model/command-line.h similarity index 100% rename from src/core/command-line.h rename to src/core/model/command-line.h diff --git a/src/core/config.cc b/src/core/model/config.cc similarity index 100% rename from src/core/config.cc rename to src/core/model/config.cc diff --git a/src/core/config.h b/src/core/model/config.h similarity index 100% rename from src/core/config.h rename to src/core/model/config.h diff --git a/src/core/default-deleter.h b/src/core/model/default-deleter.h similarity index 100% rename from src/core/default-deleter.h rename to src/core/model/default-deleter.h diff --git a/src/simulator/default-simulator-impl.cc b/src/core/model/default-simulator-impl.cc similarity index 100% rename from src/simulator/default-simulator-impl.cc rename to src/core/model/default-simulator-impl.cc diff --git a/src/simulator/default-simulator-impl.h b/src/core/model/default-simulator-impl.h similarity index 100% rename from src/simulator/default-simulator-impl.h rename to src/core/model/default-simulator-impl.h diff --git a/src/core/deprecated.h b/src/core/model/deprecated.h similarity index 100% rename from src/core/deprecated.h rename to src/core/model/deprecated.h diff --git a/src/core/double.cc b/src/core/model/double.cc similarity index 100% rename from src/core/double.cc rename to src/core/model/double.cc diff --git a/src/core/double.h b/src/core/model/double.h similarity index 100% rename from src/core/double.h rename to src/core/model/double.h diff --git a/src/core/empty.h b/src/core/model/empty.h similarity index 100% rename from src/core/empty.h rename to src/core/model/empty.h diff --git a/src/core/enum.cc b/src/core/model/enum.cc similarity index 100% rename from src/core/enum.cc rename to src/core/model/enum.cc diff --git a/src/core/enum.h b/src/core/model/enum.h similarity index 100% rename from src/core/enum.h rename to src/core/model/enum.h diff --git a/src/simulator/event-id.cc b/src/core/model/event-id.cc similarity index 100% rename from src/simulator/event-id.cc rename to src/core/model/event-id.cc diff --git a/src/simulator/event-id.h b/src/core/model/event-id.h similarity index 100% rename from src/simulator/event-id.h rename to src/core/model/event-id.h diff --git a/src/simulator/event-impl.cc b/src/core/model/event-impl.cc similarity index 100% rename from src/simulator/event-impl.cc rename to src/core/model/event-impl.cc diff --git a/src/simulator/event-impl.h b/src/core/model/event-impl.h similarity index 100% rename from src/simulator/event-impl.h rename to src/core/model/event-impl.h diff --git a/src/core/fatal-error.h b/src/core/model/fatal-error.h similarity index 100% rename from src/core/fatal-error.h rename to src/core/model/fatal-error.h diff --git a/src/core/fatal-impl.cc b/src/core/model/fatal-impl.cc similarity index 100% rename from src/core/fatal-impl.cc rename to src/core/model/fatal-impl.cc diff --git a/src/core/fatal-impl.h b/src/core/model/fatal-impl.h similarity index 100% rename from src/core/fatal-impl.h rename to src/core/model/fatal-impl.h diff --git a/src/core/global-value.cc b/src/core/model/global-value.cc similarity index 100% rename from src/core/global-value.cc rename to src/core/model/global-value.cc diff --git a/src/core/global-value.h b/src/core/model/global-value.h similarity index 100% rename from src/core/global-value.h rename to src/core/model/global-value.h diff --git a/src/simulator/heap-scheduler.cc b/src/core/model/heap-scheduler.cc similarity index 100% rename from src/simulator/heap-scheduler.cc rename to src/core/model/heap-scheduler.cc diff --git a/src/simulator/heap-scheduler.h b/src/core/model/heap-scheduler.h similarity index 100% rename from src/simulator/heap-scheduler.h rename to src/core/model/heap-scheduler.h diff --git a/src/simulator/high-precision-128.cc b/src/core/model/high-precision-128.cc similarity index 100% rename from src/simulator/high-precision-128.cc rename to src/core/model/high-precision-128.cc diff --git a/src/simulator/high-precision-128.h b/src/core/model/high-precision-128.h similarity index 99% rename from src/simulator/high-precision-128.h rename to src/core/model/high-precision-128.h index e44066dd1..d8e7891a7 100644 --- a/src/simulator/high-precision-128.h +++ b/src/core/model/high-precision-128.h @@ -20,7 +20,7 @@ #ifndef HIGH_PRECISION_128_H #define HIGH_PRECISION_128_H -#include "ns3/simulator-config.h" +#include "ns3/core-config.h" #include #include #include diff --git a/src/simulator/high-precision-cairo.cc b/src/core/model/high-precision-cairo.cc similarity index 100% rename from src/simulator/high-precision-cairo.cc rename to src/core/model/high-precision-cairo.cc diff --git a/src/simulator/high-precision-cairo.h b/src/core/model/high-precision-cairo.h similarity index 100% rename from src/simulator/high-precision-cairo.h rename to src/core/model/high-precision-cairo.h diff --git a/src/simulator/high-precision-double.h b/src/core/model/high-precision-double.h similarity index 100% rename from src/simulator/high-precision-double.h rename to src/core/model/high-precision-double.h diff --git a/src/simulator/high-precision.cc b/src/core/model/high-precision.cc similarity index 100% rename from src/simulator/high-precision.cc rename to src/core/model/high-precision.cc diff --git a/src/simulator/high-precision.h b/src/core/model/high-precision.h similarity index 98% rename from src/simulator/high-precision.h rename to src/core/model/high-precision.h index 96cc82fff..ef7e10b3f 100644 --- a/src/simulator/high-precision.h +++ b/src/core/model/high-precision.h @@ -21,7 +21,7 @@ #define HIGH_PRECISION_H #include -#include "ns3/simulator-config.h" +#include "ns3/core-config.h" #if defined (USE_HIGH_PRECISION_DOUBLE) #include "high-precision-double.h" diff --git a/src/core/int-to-type.h b/src/core/model/int-to-type.h similarity index 100% rename from src/core/int-to-type.h rename to src/core/model/int-to-type.h diff --git a/src/core/integer.cc b/src/core/model/integer.cc similarity index 100% rename from src/core/integer.cc rename to src/core/model/integer.cc diff --git a/src/core/integer.h b/src/core/model/integer.h similarity index 100% rename from src/core/integer.h rename to src/core/model/integer.h diff --git a/src/simulator/list-scheduler.cc b/src/core/model/list-scheduler.cc similarity index 100% rename from src/simulator/list-scheduler.cc rename to src/core/model/list-scheduler.cc diff --git a/src/simulator/list-scheduler.h b/src/core/model/list-scheduler.h similarity index 100% rename from src/simulator/list-scheduler.h rename to src/core/model/list-scheduler.h diff --git a/src/core/log.cc b/src/core/model/log.cc similarity index 100% rename from src/core/log.cc rename to src/core/model/log.cc diff --git a/src/core/log.h b/src/core/model/log.h similarity index 100% rename from src/core/log.h rename to src/core/model/log.h diff --git a/src/simulator/make-event.cc b/src/core/model/make-event.cc similarity index 100% rename from src/simulator/make-event.cc rename to src/core/model/make-event.cc diff --git a/src/simulator/make-event.h b/src/core/model/make-event.h similarity index 100% rename from src/simulator/make-event.h rename to src/core/model/make-event.h diff --git a/src/simulator/map-scheduler.cc b/src/core/model/map-scheduler.cc similarity index 100% rename from src/simulator/map-scheduler.cc rename to src/core/model/map-scheduler.cc diff --git a/src/simulator/map-scheduler.h b/src/core/model/map-scheduler.h similarity index 100% rename from src/simulator/map-scheduler.h rename to src/core/model/map-scheduler.h diff --git a/src/core/names.cc b/src/core/model/names.cc similarity index 100% rename from src/core/names.cc rename to src/core/model/names.cc diff --git a/src/core/names.h b/src/core/model/names.h similarity index 100% rename from src/core/names.h rename to src/core/model/names.h diff --git a/src/simulator/ns2-calendar-scheduler.cc b/src/core/model/ns2-calendar-scheduler.cc similarity index 100% rename from src/simulator/ns2-calendar-scheduler.cc rename to src/core/model/ns2-calendar-scheduler.cc diff --git a/src/simulator/ns2-calendar-scheduler.h b/src/core/model/ns2-calendar-scheduler.h similarity index 100% rename from src/simulator/ns2-calendar-scheduler.h rename to src/core/model/ns2-calendar-scheduler.h diff --git a/src/simulator/nstime.h b/src/core/model/nstime.h similarity index 100% rename from src/simulator/nstime.h rename to src/core/model/nstime.h diff --git a/src/core/object-base.cc b/src/core/model/object-base.cc similarity index 100% rename from src/core/object-base.cc rename to src/core/model/object-base.cc diff --git a/src/core/object-base.h b/src/core/model/object-base.h similarity index 100% rename from src/core/object-base.h rename to src/core/model/object-base.h diff --git a/src/core/object-factory.cc b/src/core/model/object-factory.cc similarity index 100% rename from src/core/object-factory.cc rename to src/core/model/object-factory.cc diff --git a/src/core/object-factory.h b/src/core/model/object-factory.h similarity index 100% rename from src/core/object-factory.h rename to src/core/model/object-factory.h diff --git a/src/core/object-vector.cc b/src/core/model/object-vector.cc similarity index 100% rename from src/core/object-vector.cc rename to src/core/model/object-vector.cc diff --git a/src/core/object-vector.h b/src/core/model/object-vector.h similarity index 100% rename from src/core/object-vector.h rename to src/core/model/object-vector.h diff --git a/src/core/object.cc b/src/core/model/object.cc similarity index 100% rename from src/core/object.cc rename to src/core/model/object.cc diff --git a/src/core/object.h b/src/core/model/object.h similarity index 100% rename from src/core/object.h rename to src/core/model/object.h diff --git a/src/core/pointer.cc b/src/core/model/pointer.cc similarity index 100% rename from src/core/pointer.cc rename to src/core/model/pointer.cc diff --git a/src/core/pointer.h b/src/core/model/pointer.h similarity index 100% rename from src/core/pointer.h rename to src/core/model/pointer.h diff --git a/src/core/ptr.h b/src/core/model/ptr.h similarity index 100% rename from src/core/ptr.h rename to src/core/model/ptr.h diff --git a/src/core/random-variable.cc b/src/core/model/random-variable.cc similarity index 100% rename from src/core/random-variable.cc rename to src/core/model/random-variable.cc diff --git a/src/core/random-variable.h b/src/core/model/random-variable.h similarity index 100% rename from src/core/random-variable.h rename to src/core/model/random-variable.h diff --git a/src/simulator/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc similarity index 100% rename from src/simulator/realtime-simulator-impl.cc rename to src/core/model/realtime-simulator-impl.cc diff --git a/src/simulator/realtime-simulator-impl.h b/src/core/model/realtime-simulator-impl.h similarity index 100% rename from src/simulator/realtime-simulator-impl.h rename to src/core/model/realtime-simulator-impl.h diff --git a/src/core/ref-count-base.cc b/src/core/model/ref-count-base.cc similarity index 100% rename from src/core/ref-count-base.cc rename to src/core/model/ref-count-base.cc diff --git a/src/core/ref-count-base.h b/src/core/model/ref-count-base.h similarity index 100% rename from src/core/ref-count-base.h rename to src/core/model/ref-count-base.h diff --git a/src/core/rng-stream.cc b/src/core/model/rng-stream.cc similarity index 100% rename from src/core/rng-stream.cc rename to src/core/model/rng-stream.cc diff --git a/src/core/rng-stream.h b/src/core/model/rng-stream.h similarity index 100% rename from src/core/rng-stream.h rename to src/core/model/rng-stream.h diff --git a/src/simulator/scheduler.cc b/src/core/model/scheduler.cc similarity index 100% rename from src/simulator/scheduler.cc rename to src/core/model/scheduler.cc diff --git a/src/simulator/scheduler.h b/src/core/model/scheduler.h similarity index 100% rename from src/simulator/scheduler.h rename to src/core/model/scheduler.h diff --git a/src/core/simple-ref-count.h b/src/core/model/simple-ref-count.h similarity index 100% rename from src/core/simple-ref-count.h rename to src/core/model/simple-ref-count.h diff --git a/src/simulator/simulation-singleton.h b/src/core/model/simulation-singleton.h similarity index 100% rename from src/simulator/simulation-singleton.h rename to src/core/model/simulation-singleton.h diff --git a/src/simulator/simulator-impl.cc b/src/core/model/simulator-impl.cc similarity index 100% rename from src/simulator/simulator-impl.cc rename to src/core/model/simulator-impl.cc diff --git a/src/simulator/simulator-impl.h b/src/core/model/simulator-impl.h similarity index 100% rename from src/simulator/simulator-impl.h rename to src/core/model/simulator-impl.h diff --git a/src/simulator/simulator.cc b/src/core/model/simulator.cc similarity index 100% rename from src/simulator/simulator.cc rename to src/core/model/simulator.cc diff --git a/src/simulator/simulator.h b/src/core/model/simulator.h similarity index 100% rename from src/simulator/simulator.h rename to src/core/model/simulator.h diff --git a/src/core/singleton.h b/src/core/model/singleton.h similarity index 100% rename from src/core/singleton.h rename to src/core/model/singleton.h diff --git a/src/core/string.cc b/src/core/model/string.cc similarity index 100% rename from src/core/string.cc rename to src/core/model/string.cc diff --git a/src/core/string.h b/src/core/model/string.h similarity index 100% rename from src/core/string.h rename to src/core/model/string.h diff --git a/src/simulator/synchronizer.cc b/src/core/model/synchronizer.cc similarity index 100% rename from src/simulator/synchronizer.cc rename to src/core/model/synchronizer.cc diff --git a/src/simulator/synchronizer.h b/src/core/model/synchronizer.h similarity index 100% rename from src/simulator/synchronizer.h rename to src/core/model/synchronizer.h diff --git a/src/core/system-condition.h b/src/core/model/system-condition.h similarity index 100% rename from src/core/system-condition.h rename to src/core/model/system-condition.h diff --git a/src/core/system-mutex.h b/src/core/model/system-mutex.h similarity index 100% rename from src/core/system-mutex.h rename to src/core/model/system-mutex.h diff --git a/src/core/system-thread.h b/src/core/model/system-thread.h similarity index 100% rename from src/core/system-thread.h rename to src/core/model/system-thread.h diff --git a/src/core/system-wall-clock-ms.h b/src/core/model/system-wall-clock-ms.h similarity index 100% rename from src/core/system-wall-clock-ms.h rename to src/core/model/system-wall-clock-ms.h diff --git a/src/core/test.cc b/src/core/model/test.cc similarity index 100% rename from src/core/test.cc rename to src/core/model/test.cc diff --git a/src/core/test.h b/src/core/model/test.h similarity index 100% rename from src/core/test.h rename to src/core/model/test.h diff --git a/src/simulator/time-base.cc b/src/core/model/time-base.cc similarity index 100% rename from src/simulator/time-base.cc rename to src/core/model/time-base.cc diff --git a/src/simulator/time-base.h b/src/core/model/time-base.h similarity index 100% rename from src/simulator/time-base.h rename to src/core/model/time-base.h diff --git a/src/simulator/time.cc b/src/core/model/time.cc similarity index 100% rename from src/simulator/time.cc rename to src/core/model/time.cc diff --git a/src/simulator/timer-impl.h b/src/core/model/timer-impl.h similarity index 100% rename from src/simulator/timer-impl.h rename to src/core/model/timer-impl.h diff --git a/src/simulator/timer.cc b/src/core/model/timer.cc similarity index 100% rename from src/simulator/timer.cc rename to src/core/model/timer.cc diff --git a/src/simulator/timer.h b/src/core/model/timer.h similarity index 100% rename from src/simulator/timer.h rename to src/core/model/timer.h diff --git a/src/core/trace-source-accessor.cc b/src/core/model/trace-source-accessor.cc similarity index 100% rename from src/core/trace-source-accessor.cc rename to src/core/model/trace-source-accessor.cc diff --git a/src/core/trace-source-accessor.h b/src/core/model/trace-source-accessor.h similarity index 100% rename from src/core/trace-source-accessor.h rename to src/core/model/trace-source-accessor.h diff --git a/src/core/traced-callback.h b/src/core/model/traced-callback.h similarity index 100% rename from src/core/traced-callback.h rename to src/core/model/traced-callback.h diff --git a/src/core/traced-value.h b/src/core/model/traced-value.h similarity index 100% rename from src/core/traced-value.h rename to src/core/model/traced-value.h diff --git a/src/core/type-id.cc b/src/core/model/type-id.cc similarity index 100% rename from src/core/type-id.cc rename to src/core/model/type-id.cc diff --git a/src/core/type-id.h b/src/core/model/type-id.h similarity index 100% rename from src/core/type-id.h rename to src/core/model/type-id.h diff --git a/src/core/type-name.cc b/src/core/model/type-name.cc similarity index 100% rename from src/core/type-name.cc rename to src/core/model/type-name.cc diff --git a/src/core/type-name.h b/src/core/model/type-name.h similarity index 100% rename from src/core/type-name.h rename to src/core/model/type-name.h diff --git a/src/core/type-traits.h b/src/core/model/type-traits.h similarity index 100% rename from src/core/type-traits.h rename to src/core/model/type-traits.h diff --git a/src/core/uinteger.cc b/src/core/model/uinteger.cc similarity index 100% rename from src/core/uinteger.cc rename to src/core/model/uinteger.cc diff --git a/src/core/uinteger.h b/src/core/model/uinteger.h similarity index 100% rename from src/core/uinteger.h rename to src/core/model/uinteger.h diff --git a/src/simulator/unix-fd-reader.cc b/src/core/model/unix-fd-reader.cc similarity index 100% rename from src/simulator/unix-fd-reader.cc rename to src/core/model/unix-fd-reader.cc diff --git a/src/simulator/unix-fd-reader.h b/src/core/model/unix-fd-reader.h similarity index 100% rename from src/simulator/unix-fd-reader.h rename to src/core/model/unix-fd-reader.h diff --git a/src/core/unix-system-condition.cc b/src/core/model/unix-system-condition.cc similarity index 100% rename from src/core/unix-system-condition.cc rename to src/core/model/unix-system-condition.cc diff --git a/src/core/unix-system-mutex.cc b/src/core/model/unix-system-mutex.cc similarity index 100% rename from src/core/unix-system-mutex.cc rename to src/core/model/unix-system-mutex.cc diff --git a/src/core/unix-system-thread.cc b/src/core/model/unix-system-thread.cc similarity index 100% rename from src/core/unix-system-thread.cc rename to src/core/model/unix-system-thread.cc diff --git a/src/core/unix-system-wall-clock-ms.cc b/src/core/model/unix-system-wall-clock-ms.cc similarity index 100% rename from src/core/unix-system-wall-clock-ms.cc rename to src/core/model/unix-system-wall-clock-ms.cc diff --git a/src/core/vector.cc b/src/core/model/vector.cc similarity index 100% rename from src/core/vector.cc rename to src/core/model/vector.cc diff --git a/src/core/vector.h b/src/core/model/vector.h similarity index 100% rename from src/core/vector.h rename to src/core/model/vector.h diff --git a/src/simulator/wall-clock-synchronizer.cc b/src/core/model/wall-clock-synchronizer.cc similarity index 100% rename from src/simulator/wall-clock-synchronizer.cc rename to src/core/model/wall-clock-synchronizer.cc diff --git a/src/simulator/wall-clock-synchronizer.h b/src/core/model/wall-clock-synchronizer.h similarity index 100% rename from src/simulator/wall-clock-synchronizer.h rename to src/core/model/wall-clock-synchronizer.h diff --git a/src/simulator/watchdog.cc b/src/core/model/watchdog.cc similarity index 100% rename from src/simulator/watchdog.cc rename to src/core/model/watchdog.cc diff --git a/src/simulator/watchdog.h b/src/core/model/watchdog.h similarity index 100% rename from src/simulator/watchdog.h rename to src/core/model/watchdog.h diff --git a/src/core/win32-system-wall-clock-ms.cc b/src/core/model/win32-system-wall-clock-ms.cc similarity index 100% rename from src/core/win32-system-wall-clock-ms.cc rename to src/core/model/win32-system-wall-clock-ms.cc diff --git a/src/core/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc similarity index 99% rename from src/core/attribute-test-suite.cc rename to src/core/test/attribute-test-suite.cc index 94895c674..34f1127b9 100644 --- a/src/core/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -16,20 +16,20 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "test.h" -#include "object.h" -#include "boolean.h" -#include "integer.h" -#include "uinteger.h" -#include "enum.h" -#include "string.h" -#include "random-variable.h" -#include "double.h" -#include "object-vector.h" -#include "traced-value.h" -#include "callback.h" -#include "trace-source-accessor.h" -#include "pointer.h" +#include "ns3/test.h" +#include "ns3/object.h" +#include "ns3/boolean.h" +#include "ns3/integer.h" +#include "ns3/uinteger.h" +#include "ns3/enum.h" +#include "ns3/string.h" +#include "ns3/random-variable.h" +#include "ns3/double.h" +#include "ns3/object-vector.h" +#include "ns3/traced-value.h" +#include "ns3/callback.h" +#include "ns3/trace-source-accessor.h" +#include "ns3/pointer.h" namespace ns3 { diff --git a/src/core/callback-test-suite.cc b/src/core/test/callback-test-suite.cc similarity index 99% rename from src/core/callback-test-suite.cc rename to src/core/test/callback-test-suite.cc index 5968399dd..dbb7c9e10 100644 --- a/src/core/callback-test-suite.cc +++ b/src/core/test/callback-test-suite.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "test.h" -#include "callback.h" +#include "ns3/test.h" +#include "ns3/callback.h" #include namespace ns3 { diff --git a/src/core/names-test-suite.cc b/src/core/test/names-test-suite.cc similarity index 99% rename from src/core/names-test-suite.cc rename to src/core/test/names-test-suite.cc index cb01157c6..942e1ef36 100644 --- a/src/core/names-test-suite.cc +++ b/src/core/test/names-test-suite.cc @@ -14,8 +14,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "test.h" -#include "names.h" +#include "ns3/test.h" +#include "ns3/names.h" using namespace ns3; diff --git a/src/core/ptr-test-suite.cc b/src/core/test/ptr-test-suite.cc similarity index 99% rename from src/core/ptr-test-suite.cc rename to src/core/test/ptr-test-suite.cc index a6447307c..99967b4ec 100644 --- a/src/core/ptr-test-suite.cc +++ b/src/core/test/ptr-test-suite.cc @@ -18,8 +18,8 @@ * Author: Mathieu Lacage */ -#include "test.h" -#include "ptr.h" +#include "ns3/test.h" +#include "ns3/ptr.h" namespace ns3 { diff --git a/src/core/rng-test-suite.cc b/src/core/test/rng-test-suite.cc similarity index 99% rename from src/core/rng-test-suite.cc rename to src/core/test/rng-test-suite.cc index 13cb86124..ea859bb31 100644 --- a/src/core/rng-test-suite.cc +++ b/src/core/test/rng-test-suite.cc @@ -21,8 +21,8 @@ #include #include -#include "test.h" -#include "random-variable.h" +#include "ns3/test.h" +#include "ns3/random-variable.h" using namespace ns3; diff --git a/src/core/traced-callback-test-suite.cc b/src/core/test/traced-callback-test-suite.cc similarity index 98% rename from src/core/traced-callback-test-suite.cc rename to src/core/test/traced-callback-test-suite.cc index 2a304a486..76a8d5e30 100644 --- a/src/core/traced-callback-test-suite.cc +++ b/src/core/test/traced-callback-test-suite.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "test.h" -#include "traced-callback.h" +#include "ns3/test.h" +#include "ns3/traced-callback.h" using namespace ns3; diff --git a/src/core/type-traits-test-suite.cc b/src/core/test/type-traits-test-suite.cc similarity index 97% rename from src/core/type-traits-test-suite.cc rename to src/core/test/type-traits-test-suite.cc index e274eec3a..66e02225f 100644 --- a/src/core/type-traits-test-suite.cc +++ b/src/core/test/type-traits-test-suite.cc @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "type-traits.h" -#include "test.h" +#include "ns3/type-traits.h" +#include "ns3/test.h" namespace ns3 { diff --git a/src/core/wscript b/src/core/wscript index 7ca9c388d..a9b0c44e3 100644 --- a/src/core/wscript +++ b/src/core/wscript @@ -1,7 +1,19 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- import sys + import Options + +def set_options(opt): + opt.add_option('--high-precision-as-double', + help=('Whether to use a double floating point' + ' type for high precision time values' + ' WARNING: this option only has effect ' + 'with the configure command.'), + action="store_true", default=False, + dest='high_precision_as_double') + + def configure(conf): if conf.check(header_name='stdlib.h'): conf.define('HAVE_STDLIB_H', 1) @@ -41,119 +53,221 @@ int main () conf.env['ENABLE_THREADING'], " include not detected") + a = conf.check(type_name='uint128_t', define_name='HAVE_UINT128_T') + b = conf.check(type_name='__uint128_t', define_name='HAVE___UINT128_T') + + + if Options.options.high_precision_as_double: + conf.define('USE_HIGH_PRECISION_DOUBLE', 1) + conf.env['USE_HIGH_PRECISION_DOUBLE'] = 1 + highprec = 'long double' + elif a or b: + conf.define('USE_HIGH_PRECISION_128', 1) + conf.env['USE_HIGH_PRECISION_128'] = 1 + highprec = '128-bit integer' + else: + conf.define('USE_HIGH_PRECISION_CAIRO', 1) + conf.env['USE_HIGH_PRECISION_CAIRO'] = 1 + highprec = 'cairo 128-bit integer' + + conf.check_message_custom('high precision time', 'implementation', highprec) + + conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H') + conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H') + + conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H') + + if not conf.check(lib='rt', uselib='RT', define_name='HAVE_RT'): + conf.report_optional_feature("RealTime", "Real Time Simulator", + False, "librt is not available") + else: + conf.report_optional_feature("RealTime", "Real Time Simulator", + conf.env['ENABLE_THREADING'], + "threading not enabled") + conf.env["ENABLE_REAL_TIME"] = conf.env['ENABLE_THREADING'] + conf.write_config_header('ns3/core-config.h', top=True) def build(bld): core = bld.create_ns3_module('core') core.source = [ - 'log.cc', - 'breakpoint.cc', - 'type-id.cc', - 'attribute-list.cc', - 'object-base.cc', - 'ref-count-base.cc', - 'object.cc', - 'test.cc', - 'random-variable.cc', - 'rng-stream.cc', - 'command-line.cc', - 'type-name.cc', - 'attribute.cc', - 'boolean.cc', - 'integer.cc', - 'uinteger.cc', - 'enum.cc', - 'double.cc', - 'string.cc', - 'pointer.cc', - 'object-vector.cc', - 'object-factory.cc', - 'global-value.cc', - 'trace-source-accessor.cc', - 'config.cc', - 'callback.cc', - 'names.cc', - 'vector.cc', - 'attribute-test-suite.cc', - 'callback-test-suite.cc', - 'names-test-suite.cc', - 'type-traits-test-suite.cc', - 'traced-callback-test-suite.cc', - 'ptr-test-suite.cc', - 'fatal-impl.cc', + 'model/high-precision.cc', + 'model/time-base.cc', + 'model/time.cc', + 'model/event-id.cc', + 'model/scheduler.cc', + 'model/list-scheduler.cc', + 'model/map-scheduler.cc', + 'model/heap-scheduler.cc', + 'model/calendar-scheduler.cc', + 'model/ns2-calendar-scheduler.cc', + 'model/event-impl.cc', + 'model/simulator.cc', + 'model/simulator-impl.cc', + 'model/default-simulator-impl.cc', + 'model/timer.cc', + 'model/watchdog.cc', + 'model/synchronizer.cc', + 'model/make-event.cc', + 'model/log.cc', + 'model/breakpoint.cc', + 'model/type-id.cc', + 'model/attribute-list.cc', + 'model/object-base.cc', + 'model/ref-count-base.cc', + 'model/object.cc', + 'model/test.cc', + 'model/random-variable.cc', + 'model/rng-stream.cc', + 'model/command-line.cc', + 'model/type-name.cc', + 'model/attribute.cc', + 'model/boolean.cc', + 'model/integer.cc', + 'model/uinteger.cc', + 'model/enum.cc', + 'model/double.cc', + 'model/string.cc', + 'model/pointer.cc', + 'model/object-vector.cc', + 'model/object-factory.cc', + 'model/global-value.cc', + 'model/trace-source-accessor.cc', + 'model/config.cc', + 'model/callback.cc', + 'model/names.cc', + 'model/vector.cc', + 'model/fatal-impl.cc', + 'test/attribute-test-suite.cc', + 'test/callback-test-suite.cc', + 'test/names-test-suite.cc', + 'test/type-traits-test-suite.cc', + 'test/traced-callback-test-suite.cc', + 'test/ptr-test-suite.cc', ] headers = bld.new_task_gen('ns3header') headers.module = 'core' headers.source = [ - 'system-wall-clock-ms.h', - 'empty.h', - 'callback.h', - 'object-base.h', - 'ref-count-base.h', - 'simple-ref-count.h', - 'type-id.h', - 'attribute-list.h', - 'ptr.h', - 'object.h', - 'log.h', - 'assert.h', - 'breakpoint.h', - 'fatal-error.h', - 'test.h', - 'random-variable.h', - 'rng-stream.h', - 'command-line.h', - 'type-name.h', - 'type-traits.h', - 'int-to-type.h', - 'attribute.h', - 'attribute-accessor-helper.h', - 'boolean.h', - 'integer.h', - 'uinteger.h', - 'double.h', - 'enum.h', - 'string.h', - 'pointer.h', - 'object-factory.h', - 'attribute-helper.h', - 'global-value.h', - 'traced-callback.h', - 'traced-value.h', - 'trace-source-accessor.h', - 'config.h', - 'object-vector.h', - 'deprecated.h', - 'abort.h', - 'names.h', - 'vector.h', - 'default-deleter.h', - 'fatal-impl.h', + 'model/high-precision.h', + 'model/time-base.h', + 'model/nstime.h', + 'model/event-id.h', + 'model/event-impl.h', + 'model/simulator.h', + 'model/simulator-impl.h', + 'model/default-simulator-impl.h', + 'model/scheduler.h', + 'model/list-scheduler.h', + 'model/map-scheduler.h', + 'model/heap-scheduler.h', + 'model/calendar-scheduler.h', + 'model/ns2-calendar-scheduler.h', + 'model/simulation-singleton.h', + 'model/timer.h', + 'model/timer-impl.h', + 'model/watchdog.h', + 'model/synchronizer.h', + 'model/make-event.h', + 'model/system-wall-clock-ms.h', + 'model/empty.h', + 'model/callback.h', + 'model/object-base.h', + 'model/ref-count-base.h', + 'model/simple-ref-count.h', + 'model/type-id.h', + 'model/attribute-list.h', + 'model/ptr.h', + 'model/object.h', + 'model/log.h', + 'model/assert.h', + 'model/breakpoint.h', + 'model/fatal-error.h', + 'model/test.h', + 'model/random-variable.h', + 'model/rng-stream.h', + 'model/command-line.h', + 'model/type-name.h', + 'model/type-traits.h', + 'model/int-to-type.h', + 'model/attribute.h', + 'model/attribute-accessor-helper.h', + 'model/boolean.h', + 'model/integer.h', + 'model/uinteger.h', + 'model/double.h', + 'model/enum.h', + 'model/string.h', + 'model/pointer.h', + 'model/object-factory.h', + 'model/attribute-helper.h', + 'model/global-value.h', + 'model/traced-callback.h', + 'model/traced-value.h', + 'model/trace-source-accessor.h', + 'model/config.h', + 'model/object-vector.h', + 'model/deprecated.h', + 'model/abort.h', + 'model/names.h', + 'model/vector.h', + 'model/default-deleter.h', + 'model/fatal-impl.h', ] if sys.platform == 'win32': core.source.extend([ - 'win32-system-wall-clock-ms.cc', + 'model/win32-system-wall-clock-ms.cc', ]) else: core.source.extend([ - 'unix-system-wall-clock-ms.cc', + 'model/unix-system-wall-clock-ms.cc', ]) - if bld.env['ENABLE_THREADING']: + env = bld.env_of_name('default') + if env['USE_HIGH_PRECISION_DOUBLE']: + headers.source.extend(['model/high-precision-double.h']) + elif env['USE_HIGH_PRECISION_128']: + headers.source.extend(['model/high-precision-128.h']) + core.source.extend(['model/high-precision-128.cc']) + elif env['USE_HIGH_PRECISION_CAIRO']: core.source.extend([ - 'unix-system-thread.cc', - 'unix-system-mutex.cc', - 'unix-system-condition.cc', + 'model/high-precision-cairo.cc', +# 'model/cairo-wideint.c', ]) - core.uselib = 'PTHREAD' headers.source.extend([ - 'system-mutex.h', - 'system-thread.h', - 'system-condition.h', + 'model/high-precision-cairo.h', + 'model/cairo-wideint-private.h', + ]) + + if env['ENABLE_REAL_TIME']: + headers.source.extend([ + 'model/realtime-simulator-impl.h', + 'model/wall-clock-synchronizer.h', + ]) + core.source.extend([ + 'model/realtime-simulator-impl.cc', + 'model/wall-clock-synchronizer.cc', + ]) + core.uselib = 'RT' + else: + core.uselib = '' + + if env['ENABLE_THREADING']: + core.source.extend([ + 'model/unix-fd-reader.cc', + 'model/unix-system-thread.cc', + 'model/unix-system-mutex.cc', + 'model/unix-system-condition.cc', + ]) + core.uselib = core.uselib + ' PTHREAD' + headers.source.extend([ + 'model/unix-fd-reader.h', + 'model/system-mutex.h', + 'model/system-thread.h', + 'model/system-condition.h', ]) - if bld.env['ENABLE_GSL']: + if env['ENABLE_GSL']: core.uselib = core.uselib + ' GSL GSLCBLAS M' - core.source.extend(['rng-test-suite.cc']) + core.source.extend(['test/rng-test-suite.cc']) diff --git a/src/devices/bridge/examples/csma-bridge-one-hop.cc b/src/devices/bridge/examples/csma-bridge-one-hop.cc index 8b4f07f89..fd1030bbc 100644 --- a/src/devices/bridge/examples/csma-bridge-one-hop.cc +++ b/src/devices/bridge/examples/csma-bridge-one-hop.cc @@ -69,7 +69,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/src/devices/bridge/examples/csma-bridge.cc b/src/devices/bridge/examples/csma-bridge.cc index 994ec6b8e..5b6624062 100644 --- a/src/devices/bridge/examples/csma-bridge.cc +++ b/src/devices/bridge/examples/csma-bridge.cc @@ -32,7 +32,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/src/devices/lte/examples/lte-amc.cc b/src/devices/lte/examples/lte-amc.cc index 8b8c69bf3..b7bee10f3 100644 --- a/src/devices/lte/examples/lte-amc.cc +++ b/src/devices/lte/examples/lte-amc.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-channel-model.cc b/src/devices/lte/examples/lte-channel-model.cc index 2fffc34aa..742dd3639 100644 --- a/src/devices/lte/examples/lte-channel-model.cc +++ b/src/devices/lte/examples/lte-channel-model.cc @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-phy-downlink.cc b/src/devices/lte/examples/lte-phy-downlink.cc index bec60d61d..ecbd53591 100644 --- a/src/devices/lte/examples/lte-phy-downlink.cc +++ b/src/devices/lte/examples/lte-phy-downlink.cc @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/devices/lte/examples/lte-phy-uplink.cc b/src/devices/lte/examples/lte-phy-uplink.cc index 42dc15fa3..51f515149 100644 --- a/src/devices/lte/examples/lte-phy-uplink.cc +++ b/src/devices/lte/examples/lte-phy-uplink.cc @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/devices/uan/examples/wscript b/src/devices/uan/examples/wscript index 16d0e23e1..c8166cbf0 100644 --- a/src/devices/uan/examples/wscript +++ b/src/devices/uan/examples/wscript @@ -1,8 +1,8 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - obj = bld.create_ns3_program('uan-cw-example', ['core', 'simulator', 'mobility', 'uan']) + obj = bld.create_ns3_program('uan-cw-example', ['core', 'mobility', 'uan']) obj.source = 'uan-cw-example.cc' - obj = bld.create_ns3_program('uan-rc-example', ['core', 'simulator', 'mobility', 'uan']) + obj = bld.create_ns3_program('uan-rc-example', ['core', 'mobility', 'uan']) obj.source = 'uan-rc-example.cc' diff --git a/src/devices/virtual-net-device/examples/virtual-net-device.cc b/src/devices/virtual-net-device/examples/virtual-net-device.cc index 496844180..c5e1cef7a 100644 --- a/src/devices/virtual-net-device/examples/virtual-net-device.cc +++ b/src/devices/virtual-net-device/examples/virtual-net-device.cc @@ -52,7 +52,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/virtual-net-device.h" diff --git a/src/mobility/wscript b/src/mobility/wscript index 1a4d6f970..0fd84c9e5 100644 --- a/src/mobility/wscript +++ b/src/mobility/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - mobility = bld.create_ns3_module('mobility', ['core', 'simulator']) + mobility = bld.create_ns3_module('mobility', ['core']) mobility.source = [ 'hierarchical-mobility-model.cc', 'mobility-model.cc', diff --git a/src/mpi/wscript b/src/mpi/wscript index 34988bcba..f1a54fdfa 100644 --- a/src/mpi/wscript +++ b/src/mpi/wscript @@ -6,7 +6,7 @@ import Options def build(bld): env = bld.env_of_name('default') - sim = bld.create_ns3_module('mpi', ['core', 'simulator']) + sim = bld.create_ns3_module('mpi', ['core']) sim.source = [ 'distributed-simulator-impl.cc', 'mpi-interface.cc', diff --git a/src/node/wscript b/src/node/wscript index d21855cbf..d9a92dfbf 100644 --- a/src/node/wscript +++ b/src/node/wscript @@ -1,7 +1,7 @@ ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- def build(bld): - node = bld.create_ns3_module('node', ['core', 'common', 'simulator']) + node = bld.create_ns3_module('node', ['core', 'common']) node.source = [ 'address.cc', 'mac48-address.cc', diff --git a/src/routing/olsr/examples/simple-point-to-point-olsr.cc b/src/routing/olsr/examples/simple-point-to-point-olsr.cc index acf8a659c..9f6c1eccc 100644 --- a/src/routing/olsr/examples/simple-point-to-point-olsr.cc +++ b/src/routing/olsr/examples/simple-point-to-point-olsr.cc @@ -41,7 +41,7 @@ #include #include "ns3/core-module.h" -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/helper-module.h" #include "ns3/olsr-helper.h" diff --git a/src/simulator/waf b/src/simulator/waf deleted file mode 100755 index 3dcf598bc..000000000 --- a/src/simulator/waf +++ /dev/null @@ -1 +0,0 @@ -exec "`dirname "$0"`"/../../waf "$@" \ No newline at end of file diff --git a/src/simulator/wscript b/src/simulator/wscript deleted file mode 100644 index a18cc992e..000000000 --- a/src/simulator/wscript +++ /dev/null @@ -1,139 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- -import sys - -import Options - - -def set_options(opt): - opt.add_option('--high-precision-as-double', - help=('Whether to use a double floating point' - ' type for high precision time values' - ' WARNING: this option only has effect ' - 'with the configure command.'), - action="store_true", default=False, - dest='high_precision_as_double') - - -def configure(conf): - a = conf.check(type_name='uint128_t', define_name='HAVE_UINT128_T') - b = conf.check(type_name='__uint128_t', define_name='HAVE___UINT128_T') - - - if Options.options.high_precision_as_double: - conf.define('USE_HIGH_PRECISION_DOUBLE', 1) - conf.env['USE_HIGH_PRECISION_DOUBLE'] = 1 - highprec = 'long double' - elif a or b: - conf.define('USE_HIGH_PRECISION_128', 1) - conf.env['USE_HIGH_PRECISION_128'] = 1 - highprec = '128-bit integer' - else: - conf.define('USE_HIGH_PRECISION_CAIRO', 1) - conf.env['USE_HIGH_PRECISION_CAIRO'] = 1 - highprec = 'cairo 128-bit integer' - - conf.check_message_custom('high precision time', 'implementation', highprec) - - conf.check(header_name='stdint.h', define_name='HAVE_STDINT_H') - conf.check(header_name='inttypes.h', define_name='HAVE_INTTYPES_H') - - conf.check(header_name='sys/inttypes.h', define_name='HAVE_SYS_INT_TYPES_H') - - conf.write_config_header('ns3/simulator-config.h', top=True) - - if not conf.check(lib='rt', uselib='RT', define_name='HAVE_RT'): - conf.report_optional_feature("RealTime", "Real Time Simulator", - False, "librt is not available") - else: - conf.report_optional_feature("RealTime", "Real Time Simulator", - conf.env['ENABLE_THREADING'], - "threading not enabled") - conf.env["ENABLE_REAL_TIME"] = conf.env['ENABLE_THREADING'] - - -def build(bld): - sim = bld.create_ns3_module('simulator', ['core']) - sim.source = [ - 'high-precision.cc', - 'time-base.cc', - 'time.cc', - 'event-id.cc', - 'scheduler.cc', - 'list-scheduler.cc', - 'map-scheduler.cc', - 'heap-scheduler.cc', - 'calendar-scheduler.cc', - 'ns2-calendar-scheduler.cc', - 'event-impl.cc', - 'simulator.cc', - 'simulator-impl.cc', - 'default-simulator-impl.cc', - 'timer.cc', - 'watchdog.cc', - 'synchronizer.cc', - 'make-event.cc', - ] - - headers = bld.new_task_gen('ns3header') - headers.module = 'simulator' - headers.source = [ - 'high-precision.h', - 'time-base.h', - 'nstime.h', - 'event-id.h', - 'event-impl.h', - 'simulator.h', - 'simulator-impl.h', - 'default-simulator-impl.h', - 'scheduler.h', - 'list-scheduler.h', - 'map-scheduler.h', - 'heap-scheduler.h', - 'calendar-scheduler.h', - 'ns2-calendar-scheduler.h', - 'simulation-singleton.h', - 'timer.h', - 'timer-impl.h', - 'watchdog.h', - 'synchronizer.h', - 'make-event.h', - ] - - env = bld.env_of_name('default') - if env['USE_HIGH_PRECISION_DOUBLE']: - headers.source.extend(['high-precision-double.h']) - elif env['USE_HIGH_PRECISION_128']: - headers.source.extend(['high-precision-128.h']) - sim.source.extend(['high-precision-128.cc']) - elif env['USE_HIGH_PRECISION_CAIRO']: - sim.source.extend([ - 'high-precision-cairo.cc', -# 'cairo-wideint.c', - ]) - headers.source.extend([ - 'high-precision-cairo.h', - 'cairo-wideint-private.h', - ]) - - if env['ENABLE_REAL_TIME']: - headers.source.extend([ - 'realtime-simulator-impl.h', - 'wall-clock-synchronizer.h', - ]) - sim.source.extend([ - 'realtime-simulator-impl.cc', - 'wall-clock-synchronizer.cc', - ]) - sim.uselib = 'RT' - else: - sim.uselib = '' - - if env['ENABLE_THREADING']: - sim.source.extend([ - 'unix-fd-reader.cc', - ]) - sim.uselib = sim.uselib + ' PTHREAD' - headers.source.extend([ - 'unix-fd-reader.h', - ]) - diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc index 41c51b4d7..22c8b5a42 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy-with-microwave-oven.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc index 1c5cbea67..0c353044a 100644 --- a/src/spectrum/examples/adhoc-aloha-ideal-phy.cc +++ b/src/spectrum/examples/adhoc-aloha-ideal-phy.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/test/perf/perf-io.cc b/src/test/perf/perf-io.cc index aad9ccd4d..7b70e56ef 100644 --- a/src/test/perf/perf-io.cc +++ b/src/test/perf/perf-io.cc @@ -23,7 +23,7 @@ #include #include -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/node-module.h" #include "ns3/core-module.h" #include "ns3/helper-module.h" diff --git a/src/wscript b/src/wscript index 522cb8fb4..1c6cf91cd 100644 --- a/src/wscript +++ b/src/wscript @@ -20,7 +20,6 @@ except NameError: all_modules = ( 'core', 'common', - 'simulator', 'contrib', 'node', 'internet-stack', @@ -70,7 +69,7 @@ all_modules = ( ) def set_options(opt): - opt.sub_options('simulator') + opt.sub_options('core') opt.add_option('--enable-rpath', help=("Link programs with rpath" @@ -85,7 +84,6 @@ def set_options(opt): def configure(conf): conf.sub_config('core') - conf.sub_config('simulator') conf.sub_config('devices/emu') conf.sub_config('devices/tap-bridge') conf.sub_config('contrib') diff --git a/utils/bench-simulator.cc b/utils/bench-simulator.cc index c06ddbae1..646042372 100644 --- a/utils/bench-simulator.cc +++ b/utils/bench-simulator.cc @@ -18,7 +18,7 @@ * Author: Mathieu Lacage */ -#include "ns3/simulator-module.h" +#include "ns3/core-module.h" #include "ns3/core-module.h" #include #include diff --git a/utils/wscript b/utils/wscript index ee037d02e..3eed6b1c8 100644 --- a/utils/wscript +++ b/utils/wscript @@ -9,7 +9,7 @@ def build(bld): test_runner.source = 'test-runner.cc' test_runner.uselib_local = 'ns3' - obj = bld.create_ns3_program('bench-simulator', ['simulator']) + obj = bld.create_ns3_program('bench-simulator', ['core']) obj.source = 'bench-simulator.cc' obj = bld.create_ns3_program('bench-packets', ['common']) diff --git a/wscript b/wscript index 6a2b5ef3c..1c1449da2 100644 --- a/wscript +++ b/wscript @@ -450,7 +450,7 @@ def create_suid_program(bld, name): return program -def create_ns3_program(bld, name, dependencies=('simulator',)): +def create_ns3_program(bld, name, dependencies=('core',)): program = bld.new_task_gen('cxx', 'program') program.is_ns3_program = True program.name = name