-/* Copyright (c) 2007-2013. The SimGrid Team.
- *
- * This program is free software; you can redistribute it and/or modify it
+/* Copyright (c) 2007-2014. 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");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
extern xbt_lib_t host_lib;
-extern xbt_lib_t link_lib;
extern xbt_lib_t as_router_lib;
extern xbt_dict_t dict_socket;
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->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)
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;
+ 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);
+ NetworkNS3Link *link = static_cast<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());
*********/
static void free_ns3_link(void * elmts)
{
- delete static_cast<NetworkNS3LinkPtr>(elmts);
+ delete static_cast<NetworkNS3Link*>(elmts);
}
static void free_ns3_host(void * elmts)
xbt_dynar_push(model_list, &surf_network_model);
}
-NetworkNS3Model::NetworkNS3Model() : NetworkModel("network NS3") {
+NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
if (ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"))) {
xbt_die("Impossible to initialize NS3 interface");
}
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);
}
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,
return new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
}
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdgePtr src, RoutingEdgePtr dst)
+xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *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(RoutingEdge *src, RoutingEdge *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
surf_callback_emit(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)
+ : Link(model, name, props)
, p_lat(bprintf("%f", lat_initial))
, p_bdw(bprintf("%f", bw_initial))
, m_created(1)
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(ModelPtr model, double cost, bool failed)
+NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
: NetworkAction(model, cost, failed)
{}