#include <unordered_set>
+#include <xbt/config.hpp>
+
#include "ns3/core-module.h"
#include "ns3/node.h"
#include "ns3/ns3_interface.h"
#include "ns3/ns3_simulator.h"
-#include "src/surf/network_ns3.hpp"
+#include "network_ns3.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/surf_private.h"
host.extension_set(NS3_EXTENSION_ID, ns3host);
}
-static void ns3_add_netcard(simgrid::surf::NetCard* netcard)
+static void ns3_add_netcard(simgrid::kernel::routing::NetCard* netcard)
{
const char* id = netcard->name();
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
{
- const char *groups = NULL;
-
- int start, end, i;
- unsigned int iter;
-
- xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
-
- char *router_id,*host_id;
+ xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), nullptr);
xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
+ unsigned int iter;
+ const char* groups = nullptr;
xbt_dynar_foreach(radical_elements, iter, groups) {
xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
- switch (xbt_dynar_length(radical_ends)) {
- case 1:
- start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+ if (xbt_dynar_length(radical_ends) == 1) {
+ int 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);
+ char* router_id = bprintf("ns3_%s%d%s", cluster->prefix, start, cluster->suffix);
simgrid::s4u::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;
- case 2:
- start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
- for (i = start; i <= end; i++){
+ } else if (xbt_dynar_length(radical_ends) == 2) {
+ int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char*));
+ int end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char*));
+ for (int 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);
+ char* router_id = bprintf("ns3_%s%d%s", cluster->prefix, i, cluster->suffix);
simgrid::s4u::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;
- default:
+ } else {
XBT_DEBUG("Malformed radical");
}
}
char * bw = bprintf("%fBps", cluster->bw);
xbt_dynar_foreach(tab_elements_num,cpt,elmts) {
- host_id = bprintf("%s%d%s", cluster->prefix, elmts, cluster->suffix);
- router_id = bprintf("ns3_%s%d%s", cluster->prefix, elmts, cluster->suffix);
+ char* host_id = bprintf("%s%d%s", cluster->prefix, elmts, cluster->suffix);
+ char* 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_node_t host_src = ns3_find_host(host_id);
std::unordered_set<simgrid::surf::LinkNS3*> already_seen = std::unordered_set<simgrid::surf::LinkNS3*>();
XBT_DEBUG("There is %ld one-link routes",onelink_routes->used);
- simgrid::surf::Onelink *onelink;
+ simgrid::kernel::routing::Onelink *onelink;
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
char *src = onelink->src_->name();
return;
surf_network_model = new simgrid::surf::NetworkNS3Model();
- xbt_dynar_push(all_existing_models, &surf_network_model);
+ all_existing_models->push_back(surf_network_model);
}
+static simgrid::config::Flag<std::string> ns3_tcp_model("ns3/TcpModel",
+ "The ns3 tcp model can be : NewReno or Reno or Tahoe",
+ "default");
+
namespace simgrid {
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
- ns3_initialize(xbt_cfg_get_string(_sg_cfg_set, "ns3/TcpModel"));
+ ns3_initialize(ns3_tcp_model.get().c_str());
- routing_model_create(NULL);
+ routing_model_create(nullptr);
simgrid::s4u::Host::onCreation.connect(ns3_add_host);
- simgrid::surf::netcardCreatedCallbacks.connect(ns3_add_netcard);
+ simgrid::kernel::routing::netcardCreatedCallbacks.connect(ns3_add_netcard);
simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
simgrid::surf::on_postparse.connect(&create_ns3_topology);
return new LinkNS3(this, name, properties, bandwidth, latency);
}
-Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
+Action* NetworkNS3Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate)
{
return new NetworkNS3Action(this, size, src, dst);
}
-double NetworkNS3Model::next_occuring_event(double now)
+double NetworkNS3Model::nextOccuringEvent(double now)
{
double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
else
do {
ns3_simulator(now);
- time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();//FIXME: use now instead ?
+ time_to_next_flow_completion = ns3::Simulator::Now().GetSeconds() - surf_get_clock();
} while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
void NetworkNS3Model::updateActionsState(double now, double delta)
{
- static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),NULL);
+ static xbt_dynar_t socket_to_destroy = xbt_dynar_new(sizeof(char*),nullptr);
/* If there are no running flows, advance the NS3 simulator and return */
if (getRunningActionSet()->empty()) {
return;
}
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = nullptr;
char *ns3Socket;
SgFlow *sgFlow;
xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
action->getState() == Action::State::running){
double data_delta_sent = sgFlow->sentBytes_ - action->lastSent_;
- std::vector<Link*> *route = new std::vector<Link*>();
+ std::vector<Link*> route = std::vector<Link*>();
- routing_platf->getRouteAndLatency (action->src_, action->dst_, route, NULL);
- for (auto link : *route)
+ routing_platf->getRouteAndLatency(action->src_->pimpl_netcard, action->dst_->pimpl_netcard, &route, nullptr);
+ for (auto link : route)
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
- delete route;
action->lastSent_ = sgFlow->sentBytes_;
}
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetCard *dst)
-: NetworkAction(model, size, false)
+NetworkNS3Action::NetworkNS3Action(Model* model, double size, s4u::Host* src, s4u::Host* dst)
+ : NetworkAction(model, size, false)
{
- XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
+ XBT_DEBUG("Communicate from %s to %s", src->name().c_str(), dst->name().c_str());
src_ = src;
dst_ = dst;
- ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
+ ns3_create_flow(src->name().c_str(), dst->name().c_str(), surf_get_clock(), size, this);
Link::onCommunicate(this, src, dst);
}
ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId());
- xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), NULL);
+ xbt_dict_set(flowFromSock, transformSocketPtr(sock), new SgFlow(TotalBytes, action), nullptr);
sock->Bind(ns3::InetSocketAddress(port_number));
XBT_DEBUG("Create flow starting to %fs + %fs = %fs",
