#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 {
- NS3_NETWORK_ELEMENT_NULL = 0, /* NULL */
- NS3_NETWORK_ELEMENT_HOST, /* host type */
- NS3_NETWORK_ELEMENT_ROUTER, /* router type */
- NS3_NETWORK_ELEMENT_AS, /* AS type */
-} e_ns3_network_element_type_t;
+namespace simgrid{
+ namespace surf{
+ class NetworkNS3Action;
+ }
+}
-typedef struct ns3_nodes{
+typedef struct ns3_node {
int node_num;
- e_ns3_network_element_type_t type;
- void * data;
-}s_ns3_nodes_t, *ns3_nodes_t;
+} s_ns3_node_t, *ns3_node_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);
-XBT_PUBLIC(char) ns3_get_socket_is_finished(void *socket);
-XBT_PUBLIC(void *) ns3_add_host(const char * id);
+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_simulator(double maxSeconds);
XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
XBT_PUBLIC(void *) ns3_add_router(const char * id);
-XBT_PUBLIC(void *) ns3_add_AS(const char * id);
-XBT_PUBLIC(void) ns3_add_link(int src, e_ns3_network_element_type_t type_src,
- int dst, e_ns3_network_element_type_t type_dst,
- char * bw,char * lat);
-XBT_PUBLIC(void) ns3_end_platform(void);
-XBT_PUBLIC(void) ns3_add_cluster(char * bw,char * lat,const char *id);
+XBT_PUBLIC(void) ns3_add_link(int src, int dst, char * bw,char * lat);
+XBT_PUBLIC(void) ns3_add_cluster(char * bw,char * lat,const char *id);
-XBT_INLINE
-ns3_nodes_t ns3_find_host(const char* id)
+inline
+ns3_node_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_facet(host, NS3_HOST_LEVEL);
+ return (ns3_node_t) host->extension(NS3_EXTENSION_ID);
}
SG_END_DECL()