#include "ns3/core-module.h"
#include "ns3/node.h"
#include "ns3/ns3_interface.h"
#include "ns3/ns3_simulator.h"
#include "ns3/core-module.h"
#include "ns3/node.h"
#include "ns3/ns3_interface.h"
#include "ns3/ns3_simulator.h"
{
const char* id = host.name().c_str();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
{
const char* id = host.name().c_str();
XBT_DEBUG("NS3_ADD_HOST '%s'", id);
#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)
{
#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)
{
char *router_id,*host_id;
xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
char *router_id,*host_id;
xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
switch (xbt_dynar_length(radical_ends)) {
case 1:
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);
switch (xbt_dynar_length(radical_ends)) {
case 1:
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);
- simgrid::s4u::Host::by_name_or_create(router_id)
- ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
+ simgrid::s4u::Host::by_name_or_create(router_id)->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
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);
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);
- simgrid::s4u::Host::by_name_or_create(router_id)
- ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
+ simgrid::s4u::Host::by_name_or_create(router_id)->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_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);
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);
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
char *src = onelink->src_->name();
unsigned int iter;
xbt_dynar_foreach(onelink_routes, iter, onelink) {
char *src = onelink->src_->name();
- routing_model_create(NULL);
- simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
- simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard);
+ routing_model_create(nullptr);
+ simgrid::s4u::Host::onCreation.connect(ns3_add_host);
+ simgrid::routing::netcardCreatedCallbacks.connect(ns3_add_netcard);
NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f);
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f);
NS3_EXTENSION_ID = simgrid::s4u::Host::extension_create(xbt_free_f);
NS3_ASR_LEVEL = xbt_lib_add_level(as_router_lib, xbt_free_f);
return new LinkNS3(this, name, properties, bandwidth, latency);
}
return new LinkNS3(this, name, properties, bandwidth, latency);
}
-Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, double rate)
+Action *NetworkNS3Model::communicate(simgrid::routing::NetCard *src,simgrid::routing::NetCard *dst, double size, double rate)
{
return new NetworkNS3Action(this, size, src, dst);
}
double NetworkNS3Model::next_occuring_event(double now)
{
{
return new NetworkNS3Action(this, size, src, dst);
}
double NetworkNS3Model::next_occuring_event(double now)
{
/* If there are no running flows, advance the NS3 simulator and return */
if (getRunningActionSet()->empty()) {
/* If there are no running flows, advance the NS3 simulator and return */
if (getRunningActionSet()->empty()) {
char *ns3Socket;
SgFlow *sgFlow;
xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
char *ns3Socket;
SgFlow *sgFlow;
xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
- routing_platf->getRouteAndLatency (action->src_, action->dst_, route, NULL);
+ routing_platf->getRouteAndLatency (action->src_, action->dst_, route, nullptr);
for (auto link : *route)
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
delete route;
for (auto link : *route)
TRACE_surf_link_set_utilization (link->getName(), action->getCategory(), (data_delta_sent)/delta, now-delta, delta);
delete route;
-NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetCard *dst)
+NetworkNS3Action::NetworkNS3Action(Model *model, double size, simgrid::routing::NetCard *src, simgrid::routing::NetCard *dst)
: NetworkAction(model, size, false)
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
: NetworkAction(model, size, false)
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
- 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",
sock->Bind(ns3::InetSocketAddress(port_number));
XBT_DEBUG("Create flow starting to %fs + %fs = %fs",
XBT_DEBUG("cluster_id: %s",id);
XBT_DEBUG("bw: %s lat: %s",bw,lat);
XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
XBT_DEBUG("cluster_id: %s",id);
XBT_DEBUG("bw: %s lat: %s",bw,lat);
XBT_DEBUG("Number of %s nodes: %d",id,Cluster_nodes.GetN() - number_of_clusters_nodes);
void ns3_add_link(int src, int dst, char *bw, char *lat)
{
void ns3_add_link(int src, int dst, char *bw, char *lat)
{