kill some dead code in NS3

[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 36c8aa7..1fc6d22 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -11,8 +11,9 @@
 #include "xbt/dynar.h"
 #include "xbt/misc.h"
 #include "xbt/sysdep.h"
+#include <xbt/Extendable.hpp>
 
-#include <simgrid/host.h>
+#include <simgrid/s4u/host.hpp>
 #include <surf/surf_routing.h>
 
 typedef enum {
@@ -22,19 +23,21 @@ typedef enum {
   NS3_NETWORK_ELEMENT_AS,        /* AS type */
 } e_ns3_network_element_type_t;
 
+
 typedef struct ns3_nodes{
   int node_num;
   e_ns3_network_element_type_t type;
   void * data;
 }s_ns3_nodes_t, *ns3_nodes_t;
 
+XBT_PUBLIC_DATA(int) NS3_EXTENSION_ID;
+
 SG_BEGIN_DECL()
 
 XBT_PUBLIC(int)    ns3_finalize(void);
 XBT_PUBLIC(int)    ns3_initialize(const char* TcpProtocol);
 XBT_PUBLIC(int)    ns3_create_flow(const char* a,const char *b,double start,u_int32_t TotalBytes,void * action);
 XBT_PUBLIC(void)   ns3_simulator(double min);
-XBT_PUBLIC(double) ns3_time(void);
 XBT_PUBLIC(void*)  ns3_get_socket_action(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_remains(void *socket);
 XBT_PUBLIC(double) ns3_get_socket_sent(void *socket);
@@ -49,14 +52,14 @@ XBT_PUBLIC(void) ns3_add_link(int src, e_ns3_network_element_type_t type_src,
 XBT_PUBLIC(void) ns3_end_platform(void);
 XBT_PUBLIC(void) ns3_add_cluster(char * bw,char * lat,const char *id);
 
-XBT_INLINE
+inline
 ns3_nodes_t ns3_find_host(const char* id)
 {
   sg_host_t host = sg_host_by_name(id);
   if (host == nullptr)
     return nullptr;
   else
-    return (ns3_nodes_t) sg_host_get_extension(host, NS3_HOST_LEVEL);
+    return (ns3_nodes_t) host->extension(NS3_EXTENSION_ID);
 }
 
 SG_END_DECL()