A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make SIMIX_context_new() accept std::function
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
ceb4afc
..
e42338e
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-6,6
+6,8
@@
#include <unordered_set>
#include <unordered_set>
+#include <xbt/config.hpp>
+
#include "ns3/core-module.h"
#include "ns3/node.h"
#include "ns3/core-module.h"
#include "ns3/node.h"
@@
-25,7
+27,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network
int NS3_EXTENSION_ID;
xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
int NS3_EXTENSION_ID;
xbt_dynar_t IPV4addr = xbt_dynar_new(sizeof(char*),free);
-static double time_to_next_flow_completion = -1;
/*****************
* Crude globals *
/*****************
* Crude globals *
@@
-48,7
+49,7
@@
static int port_number = 1025; //Port number is limited from 1025 to 65 000
* Callbacks *
*************/
* Callbacks *
*************/
-static void
simgrid_
ns3_add_host(simgrid::s4u::Host& host)
+static void ns3_add_host(simgrid::s4u::Host& host)
{
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);
@@
-62,7
+63,7
@@
static void simgrid_ns3_add_host(simgrid::s4u::Host& host)
host.extension_set(NS3_EXTENSION_ID, ns3host);
}
host.extension_set(NS3_EXTENSION_ID, ns3host);
}
-static void
simgrid_
ns3_add_netcard(simgrid::surf::NetCard* netcard)
+static void ns3_add_netcard(simgrid::surf::NetCard* netcard)
{
const char* id = netcard->name();
{
const char* id = netcard->name();
@@
-90,15
+91,14
@@
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
- xbt_dynar_t radical_ends = xbt_str_split(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 *));
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));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
break;
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
break;
@@
-109,8
+109,7
@@
static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
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));
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
}
XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
free(router_id);
}
@@
-218,21
+217,27
@@
void surf_network_model_init_NS3()
xbt_dynar_push(all_existing_models, &surf_network_model);
}
xbt_dynar_push(all_existing_models, &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() {
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(NULL);
- simgrid::s4u::Host::onCreation.connect(simgrid_ns3_add_host);
- simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_netcard);
- simgrid::surf::on_link.connect(netlink_parse_init);
+ simgrid::s4u::Host::onCreation.connect(ns3_add_host);
+ simgrid::surf::netcardCreatedCallbacks.connect(ns3_add_netcard);
simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
- simgrid::surf::on_postparse.connect(&create_ns3_topology);
//get_one_link_routes
+ simgrid::surf::on_postparse.connect(&create_ns3_topology);
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);
+
+ LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
+ LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
}
NetworkNS3Model::~NetworkNS3Model() {
}
NetworkNS3Model::~NetworkNS3Model() {
@@
-253,6
+258,7
@@
Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst, double size, do
double NetworkNS3Model::next_occuring_event(double now)
{
double NetworkNS3Model::next_occuring_event(double now)
{
+ double time_to_next_flow_completion;
XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
XBT_DEBUG("ns3_next_occuring_event");
//get the first relevant value from the running_actions list
@@
-299,7
+305,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
std::vector<Link*> *route = new std::vector<Link*>();
std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency (action->src
Elm_, action->dstElm
_, route, NULL);
+ routing_platf->getRouteAndLatency (action->src
_, action->dst
_, route, NULL);
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;
@@
-324,7
+330,6
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
}
xbt_dict_remove(flowFromSock, ns3Socket);
}
}
xbt_dict_remove(flowFromSock, ns3Socket);
}
- return;
}
/************
}
/************
@@
-364,8
+369,8
@@
NetworkNS3Action::NetworkNS3Action(Model *model, double size, NetCard *src, NetC
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
{
XBT_DEBUG("Communicate from %s to %s", src->name(), dst->name());
- src
Elm
_ = src;
- dst
Elm
_ = dst;
+ src_ = src;
+ dst_ = dst;
ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
Link::onCommunicate(this, src, dst);
ns3_create_flow(src->name(), dst->name(), surf_get_clock(), size, this);
Link::onCommunicate(this, src, dst);
@@
-382,15
+387,15
@@
void NetworkNS3Action::resume() {
/* Test whether a flow is suspended */
bool NetworkNS3Action::isSuspended()
{
/* Test whether a flow is suspended */
bool NetworkNS3Action::isSuspended()
{
- return
0
;
+ return
false
;
}
int NetworkNS3Action::unref()
{
}
int NetworkNS3Action::unref()
{
-
m_refcount
--;
- if (!
m_refcount
) {
- if (action_hook.is_linked())
-
p_stateSet->erase(p_stateSet
->iterator_to(*this));
+
refcount_
--;
+ if (!
refcount_
) {
+
if (action_hook.is_linked())
+
stateSet_->erase(stateSet_
->iterator_to(*this));
XBT_DEBUG ("Removing action %p", this);
delete this;
return 1;
XBT_DEBUG ("Removing action %p", this);
delete this;
return 1;
@@
-485,7
+490,6
@@
void * ns3_add_host_cluster(const char * id)
void ns3_add_cluster(char * bw,char * lat,const char *id)
{
void ns3_add_cluster(char * bw,char * lat,const char *id)
{
-
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);
@@
-534,11
+538,6
@@
static char* transformIpv4Address (ns3::Ipv4Address from){
void ns3_add_link(int src, int dst, char *bw, char *lat)
{
void ns3_add_link(int src, int dst, char *bw, char *lat)
{
- if(number_of_links == 1 ) {
- LogComponentEnable("UdpEchoClientApplication", ns3::LOG_LEVEL_INFO);
- LogComponentEnable("UdpEchoServerApplication", ns3::LOG_LEVEL_INFO);
- }
-
ns3::PointToPointHelper pointToPoint;
ns3::NetDeviceContainer netA;
ns3::PointToPointHelper pointToPoint;
ns3::NetDeviceContainer netA;