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
add a solve() fun pointer to maxmin datatype (+minor cleanups)
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
903bdff
..
14cea53
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-6,12
+6,14
@@
#include <unordered_set>
#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 "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"
#include "src/surf/HostImpl.hpp"
#include "src/surf/surf_private.h"
@@
-61,7
+63,7
@@
static void ns3_add_host(simgrid::s4u::Host& host)
host.extension_set(NS3_EXTENSION_ID, ns3host);
}
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();
{
const char* id = netcard->name();
@@
-78,12
+80,12
@@
static void ns3_add_netcard(simgrid::surf::NetCard* netcard)
#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)
{
- const char *groups =
NULL
;
+ const char *groups =
nullptr
;
int start, end, i;
unsigned int iter;
int start, end, i;
unsigned int iter;
- xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int),
NULL
);
+ xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int),
nullptr
);
char *router_id,*host_id;
char *router_id,*host_id;
@@
-165,7
+167,7
@@
static void create_ns3_topology(void)
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);
- simgrid::
surf
::Onelink *onelink;
+ simgrid::
kernel::routing
::Onelink *onelink;
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();
@@
-212,18
+214,22
@@
void surf_network_model_init_NS3()
return;
surf_network_model = new simgrid::surf::NetworkNS3Model();
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() {
namespace simgrid {
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
- ns3_initialize(
xbt_cfg_get_string("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::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);
simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
simgrid::surf::on_postparse.connect(&create_ns3_topology);
@@
-245,7
+251,7
@@
Link* NetworkNS3Model::createLink(const char *name, double bandwidth, double lat
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::kernel::routing::NetCard *src,simgrid::kernel::routing::
NetCard *dst, double size, double rate)
{
return new NetworkNS3Action(this, size, src, dst);
}
{
return new NetworkNS3Action(this, size, src, dst);
}
@@
-261,7
+267,7
@@
double NetworkNS3Model::next_occuring_event(double now)
else
do {
ns3_simulator(now);
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);
} while(double_equals(time_to_next_flow_completion, 0, sg_surf_precision));
XBT_DEBUG("min : %f", now);
@@
-274,7
+280,7
@@
double NetworkNS3Model::next_occuring_event(double now)
void NetworkNS3Model::updateActionsState(double now, double delta)
{
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()) {
/* If there are no running flows, advance the NS3 simulator and return */
if (getRunningActionSet()->empty()) {
@@
-285,7
+291,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
return;
}
return;
}
- xbt_dict_cursor_t cursor =
NULL
;
+ xbt_dict_cursor_t cursor =
nullptr
;
char *ns3Socket;
SgFlow *sgFlow;
xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
char *ns3Socket;
SgFlow *sgFlow;
xbt_dict_foreach(flowFromSock,cursor,ns3Socket,sgFlow){
@@
-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_, 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;
@@
-358,7
+364,7
@@
void LinkNS3::setLatencyTrace(tmgr_trace_t trace) {
* Action *
**********/
* Action *
**********/
-NetworkNS3Action::NetworkNS3Action(Model *model, double size,
NetCard *src,
NetCard *dst)
+NetworkNS3Action::NetworkNS3Action(Model *model, double size,
simgrid::kernel::routing::NetCard *src, simgrid::kernel::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());
@@
-424,7
+430,7
@@
void ns3_create_flow(const char* a,const char *b,double startTime,u_int32_t Tota
ns3::Ptr<ns3::Socket> sock = ns3::Socket::CreateSocket (src_node, ns3::TcpSocketFactory::GetTypeId());
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",
sock->Bind(ns3::InetSocketAddress(port_number));
XBT_DEBUG("Create flow starting to %fs + %fs = %fs",