-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
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();
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");
}
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);
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));
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));
+ NetworkNS3Link* link = ((NetworkNS3Link*)xbt_dynar_get_ptr(route, i));
TRACE_surf_link_set_utilization (link->getName(),
action->getCategory(),
(data_delta_sent)/delta,
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)
: Link(model, name, props)
, p_lat(bprintf("%f", lat_initial))
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(ModelPtr model, double cost, bool failed)
+NetworkNS3Action::NetworkNS3Action(Model *model, double cost, bool failed)
: NetworkAction(model, cost, failed)
{}