-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/base.h"
#include "network_interface.hpp"
-#include "src/surf/ns3/ns3_interface.hpp"
namespace simgrid {
namespace surf {
+++ /dev/null
-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
-
-/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package. */
-
-#ifndef NS3_INTERFACE_HPP
-#define NS3_INTERFACE_HPP
-
-#include "ns3/ptr.h"
-#include "simgrid/s4u/Host.hpp"
-
-namespace simgrid {
-namespace surf {
-class NetworkNS3Action;
-}
-}
-namespace ns3 {
-class Node;
-}
-
-class NetPointNs3 {
-public:
- static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
-
- explicit NetPointNs3();
- int node_num;
- ns3::Ptr<ns3::Node> ns3Node_;
-};
-
-XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
-extern "C" {
-XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
-XBT_PUBLIC(void) ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
-XBT_PUBLIC(void) ns3_add_cluster(const char* id, double bw, double lat);
-}
-
-#endif
#ifndef NS3_SIMULATOR_HPP
#define NS3_SIMULATOR_HPP
-#include "ns3_interface.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include <ns3/node.h>
#include <ns3/tcp-socket-factory.h>
#include <cstdint>
+namespace simgrid {
+namespace surf {
+class NetworkNS3Action;
+}
+} // namespace simgrid
+
+class NetPointNs3 {
+public:
+ static simgrid::xbt::Extension<simgrid::kernel::routing::NetPoint, NetPointNs3> EXTENSION_ID;
+
+ explicit NetPointNs3();
+ int node_num;
+ ns3::Ptr<ns3::Node> ns3Node_;
+};
+
+XBT_PUBLIC(void) ns3_initialize(std::string TcpProtocol);
+extern "C" {
+XBT_PUBLIC(void) ns3_simulator(double maxSeconds);
+XBT_PUBLIC(void) ns3_add_link(NetPointNs3* src, NetPointNs3* dst, double bw, double lat);
+XBT_PUBLIC(void) ns3_add_cluster(const char* id, double bw, double lat);
+}
+
class XBT_PRIVATE SgFlow {
public:
SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action);
src/surf/network_ns3.hpp
src/surf/network_smpi.hpp
src/surf/network_ib.hpp
- src/surf/ns3/ns3_interface.hpp
src/surf/ns3/ns3_simulator.hpp
src/surf/trace_mgr_test.cpp
src/surf/xml/simgrid.dtd