make NetCards extendable, and use this for NS3 extension

[simgrid.git] / src / surf / ns3 / ns3_interface.h

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index 187deb5..215d6d8 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -6,14 +6,7 @@
 #ifndef _NS3_INTERFACE_H
 #define _NS3_INTERFACE_H
 
-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
-#include <xbt/Extendable.hpp>
-
 #include <simgrid/s4u/host.hpp>
-#include <surf/surf_routing.h>
 
 namespace simgrid{
   namespace surf{
@@ -21,32 +14,25 @@ namespace simgrid{
   }
 }
 
-class HostNs3 {
+class NetCardNs3 {
 public:
-  static simgrid::xbt::Extension<simgrid::s4u::Host, HostNs3> EXTENSION_ID;
+  static simgrid::xbt::Extension<simgrid::kernel::routing::NetCard, NetCardNs3> EXTENSION_ID;
 
-  explicit HostNs3();
+  explicit NetCardNs3();
   int node_num;
 };
 
 SG_BEGIN_DECL()
 
 XBT_PUBLIC(void)   ns3_initialize(const char* TcpProtocol);
-XBT_PUBLIC(void)   ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,simgrid::surf::NetworkNS3Action * action);
+XBT_PUBLIC(void)
+ns3_create_flow(sg_host_t src, sg_host_t dst, double start, u_int32_t TotalBytes,
+                simgrid::surf::NetworkNS3Action* action);
 XBT_PUBLIC(void)   ns3_simulator(double maxSeconds);
 XBT_PUBLIC(void *) ns3_add_router(const char * id);
 XBT_PUBLIC(void)   ns3_add_link(int src, int dst, char * bw,char * lat);
 XBT_PUBLIC(void) ns3_add_cluster(const char* id, char* bw, char* lat);
 
-inline HostNs3* ns3_find_host(const char* id)
-{
-  sg_host_t host = sg_host_by_name(id);
-  if (host == nullptr)
-    return nullptr;
-  else
-    return host->extension<HostNs3>();
-}
-
 SG_END_DECL()
 
 #endif