-/* Copyright (c) 2007-2013. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+/* Copyright (c) 2007-2015. 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 "network_ns3.hpp"
-#include "surf_private.h"
-#include "simgrid/sg_config.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_ns3, surf,
- "Logging specific to the SURF network NS3 module");
+#include "src/surf/network_ns3.hpp"
+#include "src/surf/surf_private.h"
+#include "src/surf/host_interface.hpp"
+#include "simgrid/sg_config.h"
-extern xbt_lib_t host_lib;
-extern xbt_lib_t link_lib;
-extern xbt_lib_t as_router_lib;
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
-extern xbt_dict_t dict_socket;
+int NS3_EXTENSION_ID;
xbt_dynar_t IPV4addr;
static double time_to_next_flow_completion = -1;
+extern xbt_dict_t dict_socket;
+
/*************
* Callbacks *
*************/
xbt_free(temp);
}
-static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
+static void simgrid_ns3_add_host(simgrid::Host& host)
{
- XBT_DEBUG("NS3_ADD_HOST '%s'",host->id);
- xbt_lib_set(host_lib,
- host->id,
- NS3_HOST_LEVEL,
- ns3_add_host(host->id)
- );
+ const char* id = host.getName().c_str();
+ XBT_DEBUG("NS3_ADD_HOST '%s'", id);
+ host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
}
static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
if(!IPV4addr) IPV4addr = xbt_dynar_new(sizeof(char*),free);
- NetworkLinkPtr net_link = surf_network_model->createResource(link->id,
+ surf_network_model->createLink(link->id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
link->latency_trace,
- link->state,
+ link->initiallyOn,
link->state_trace,
link->policy,
link->properties);
- xbt_lib_set(link_lib, link->id, SURF_LINK_LEVEL, net_link);
}
-static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
+static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
{
- XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id);
+ const char* router_id = router->getName();
+ XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
xbt_lib_set(as_router_lib,
- router->id,
+ router_id,
NS3_ASR_LEVEL,
- ns3_add_router(router->id)
+ ns3_add_router(router_id)
);
}
-static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
+static void parse_ns3_add_AS(simgrid::surf::As* as)
{
- XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
- xbt_lib_set(as_router_lib,
- AS->id,
- NS3_ASR_LEVEL,
- ns3_add_AS(AS->id)
- );
+ const char* as_id = as->p_name;
+ XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
+ xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
}
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
xbt_dynar_push_as(tab_elements_num, int, start);
router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ simgrid::Host::by_name_or_create(router_id)
+ ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
break;
for (i = start; i <= end; i++){
xbt_dynar_push_as(tab_elements_num, int, i);
router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix);
- xbt_lib_set(host_lib,
- router_id,
- NS3_HOST_LEVEL,
- ns3_add_host_cluster(router_id)
- );
+ simgrid::Host::by_name_or_create(router_id)
+ ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
}
router_id = bprintf("ns3_%s%d%s", cluster_prefix, elmts, cluster_suffix);
XBT_DEBUG("Create link from '%s' to '%s'",host_id,router_id);
- ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,host_id, NS3_HOST_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,router_id,NS3_HOST_LEVEL));
+ ns3_nodes_t host_src = ns3_find_host(host_id);
+ ns3_nodes_t host_dst = ns3_find_host(router_id);
if(host_src && host_dst){}
else xbt_die("\tns3_add_link from %d to %d",host_src->node_num,host_dst->node_num);
xbt_die("There is no routes!");
XBT_DEBUG("Have get_onelink_routes, found %ld routes",onelink_routes->used);
//save them in trace file
- OnelinkPtr onelink;
+ simgrid::surf::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
char *src = onelink->p_src->getName();
char *dst = onelink->p_dst->getName();
- NetworkNS3LinkPtr link = static_cast<NetworkNS3LinkPtr>(onelink->p_link);
+ simgrid::surf::NetworkNS3Link *link =
+ static_cast<simgrid::surf::NetworkNS3Link *>(onelink->p_link);
if (strcmp(src,dst) && link->m_created){
XBT_DEBUG("Route from '%s' to '%s' with link '%s'", src, dst, link->getName());
XBT_DEBUG("\tLink (%s) bdw:%s lat:%s", link->getName(), link_bdw, link_lat);
//create link ns3
- ns3_nodes_t host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,src,NS3_HOST_LEVEL));
+ ns3_nodes_t host_src = ns3_find_host(src);
if(!host_src) host_src = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,src,NS3_ASR_LEVEL));
- ns3_nodes_t host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(host_lib,dst,NS3_HOST_LEVEL));
+ ns3_nodes_t host_dst = ns3_find_host(dst);
if(!host_dst) host_dst = static_cast<ns3_nodes_t>(xbt_lib_get_or_null(as_router_lib,dst,NS3_ASR_LEVEL));
if(host_src && host_dst){}
static void define_callbacks_ns3(void)
{
- sg_platf_host_add_cb (&parse_ns3_add_host);
- sg_platf_router_add_cb (&parse_ns3_add_router);
+ simgrid::Host::onCreation.connect(simgrid_ns3_add_host);
+ simgrid::surf::routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
sg_platf_link_add_cb (&parse_ns3_add_link);
sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
- sg_platf_AS_begin_add_cb (&parse_ns3_add_AS);
+ simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
}
*********/
static void free_ns3_link(void * elmts)
{
- delete static_cast<NetworkNS3LinkPtr>(elmts);
+ delete static_cast<simgrid::surf::NetworkNS3Link*>(elmts);
}
static void free_ns3_host(void * elmts)
if (surf_network_model)
return;
- surf_network_model = new NetworkNS3Model();
+ surf_network_model = new simgrid::surf::NetworkNS3Model();
- xbt_dynar_push(model_list, &surf_network_model);
+ xbt_dynar_push(all_existing_models, &surf_network_model);
}
-NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") {
+namespace simgrid {
+namespace surf {
+
+NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
}
routing_model_create(NULL);
define_callbacks_ns3();
- NS3_HOST_LEVEL = xbt_lib_add_level(host_lib,(void_f_pvoid_t)free_ns3_host);
- NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib,(void_f_pvoid_t)free_ns3_host);
- NS3_LINK_LEVEL = xbt_lib_add_level(link_lib,(void_f_pvoid_t)free_ns3_link);
+ NS3_EXTENSION_ID = simgrid::Host::extension_create(free_ns3_host);
+ NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, free_ns3_host);
}
NetworkNS3Model::~NetworkNS3Model() {
xbt_dict_free(&dict_socket);
}
-NetworkLinkPtr NetworkNS3Model::createResource(const char *name,
+Link* NetworkNS3Model::createLink(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t lat_trace,
- e_surf_resource_state_t state_initial,
+ int initiallyOn,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties){
XBT_INFO("The NS3 network model doesn't support latency state traces");
if (state_trace)
XBT_INFO("The NS3 network model doesn't support link state traces");
- return new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
+ Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
+ Link::onCreation(link);
+ return link;
}
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst)
+xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
{
xbt_dynar_t route = NULL;
routing_get_route_and_latency(src, dst, &route, NULL);
return route;
}
-ActionPtr NetworkNS3Model::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());
- NetworkNS3ActionPtr action = new NetworkNS3Action(this, size, 0);
+ NetworkNS3Action *action = new NetworkNS3Action(this, size, 0);
ns3_create_flow(src->getName(), dst->getName(), surf_get_clock(), size, action);
-#ifdef HAVE_TRACING
action->m_lastSent = 0;
action->p_srcElm = src;
action->p_dstElm = dst;
-#endif
+ networkCommunicateCallbacks(action, src, dst, size, rate);
return (surf_action_t) action;
}
do {
ns3_simulator(now);
time_to_next_flow_completion = ns3_time() - surf_get_clock();//FIXME: use now instead ?
- } while(double_equals(time_to_next_flow_completion, 0));
+ } while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
XBT_DEBUG("ns3 time : %f", ns3_time());
/* If there are no running flows, just return */
if (!getRunningActionSet()->size()) {
- while(double_positive(now-ns3_time())) {
+ while(double_positive(now-ns3_time(), sg_surf_precision)) {
ns3_simulator(now-ns3_time());
}
return;
}
- NetworkNS3ActionPtr action;
+ NetworkNS3Action *action;
xbt_dict_foreach(dict_socket,cursor,key,data){
- action = static_cast<NetworkNS3ActionPtr>(ns3_get_socket_action(data));
+ action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
XBT_DEBUG("Processing socket %p (action %p)",data,action);
action->setRemains(action->getCost() - ns3_get_socket_sent(data));
- #ifdef HAVE_TRACING
- if (TRACE_is_enabled() &&
- action->getState() == SURF_ACTION_RUNNING){
- double data_sent = ns3_get_socket_sent(data);
- double data_delta_sent = data_sent - action->m_lastSent;
-
- xbt_dynar_t route = NULL;
-
- routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
- unsigned int i;
- for (i = 0; i < xbt_dynar_length (route); i++){
- NetworkNS3LinkPtr link = ((NetworkNS3LinkPtr)xbt_dynar_get_ptr (route, i));
- TRACE_surf_link_set_utilization (link->getName(),
- action->getCategory(),
- (data_delta_sent)/delta,
- now-delta,
- delta);
- }
- action->m_lastSent = data_sent;
- }
- #endif
+ if (TRACE_is_enabled() &&
+ action->getState() == SURF_ACTION_RUNNING){
+ double data_sent = ns3_get_socket_sent(data);
+ double data_delta_sent = data_sent - action->m_lastSent;
+
+ xbt_dynar_t route = NULL;
+
+ routing_get_route_and_latency (action->p_srcElm, action->p_dstElm, &route, NULL);
+ unsigned int i;
+ for (i = 0; i < xbt_dynar_length (route); i++){
+ NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
+ TRACE_surf_link_set_utilization (link->getName(),
+ action->getCategory(),
+ (data_delta_sent)/delta,
+ now-delta,
+ delta);
+ }
+ action->m_lastSent = data_sent;
+ }
if(ns3_get_socket_is_finished(data) == 1){
xbt_dynar_push(socket_to_destroy,&key);
xbt_dynar_pop(socket_to_destroy,&key);
void *data = xbt_dict_get (dict_socket, key);
- action = static_cast<NetworkNS3ActionPtr>(ns3_get_socket_action(data));
+ action = static_cast<NetworkNS3Action*>(ns3_get_socket_action(data));
XBT_DEBUG ("Removing socket %p of action %p", key, action);
xbt_dict_remove(dict_socket, key);
}
* Resource *
************/
-NetworkNS3Link::NetworkNS3Link(NetworkNS3ModelPtr model, const char *name, xbt_dict_t props,
+NetworkNS3Link::NetworkNS3Link(NetworkNS3Model *model, const char *name, xbt_dict_t props,
double bw_initial, double lat_initial)
- : NetworkLink(model, name, props)
- , p_bdw(bprintf("%f", bw_initial))
+ : Link(model, name, props)
, p_lat(bprintf("%f", lat_initial))
+ , p_bdw(bprintf("%f", bw_initial))
, m_created(1)
{
}
void NetworkNS3Link::updateState(tmgr_trace_event_t event_type, double value, double date)
{
-}
-double NetworkNS3Link::getLatency()
-{
-
-}
-double NetworkNS3Link::getBandwidth()
-{
-
}
/**********
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(ModelPtr model, double cost, bool failed)
+NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
: NetworkAction(model, cost, failed)
{}
{
m_refcount--;
if (!m_refcount) {
- if (actionHook::is_linked())
+ if (action_hook.is_linked())
p_stateSet->erase(p_stateSet->iterator_to(*this));
XBT_DEBUG ("Removing action %p", this);
delete this;
}
return 0;
}
+
+}
+}
