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
Action::finish() is never used without setState().
[simgrid.git]
/
src
/
surf
/
network_ns3.cpp
diff --git
a/src/surf/network_ns3.cpp
b/src/surf/network_ns3.cpp
index
1374317
..
a9139b1
100644
(file)
--- a/
src/surf/network_ns3.cpp
+++ b/
src/surf/network_ns3.cpp
@@
-143,7
+143,7
@@
namespace surf {
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
NetPointNs3::EXTENSION_ID = simgrid::kernel::routing::NetPoint::extension_create<NetPointNs3>();
- flowFromSock = xbt_dict_new_homogeneous([](void* p) { delete
(SgFlow*)p
; });
+ flowFromSock = xbt_dict_new_homogeneous([](void* p) { delete
static_cast<SgFlow*>(p)
; });
ns3_initialize(ns3_tcp_model.get().c_str());
simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) {
ns3_initialize(ns3_tcp_model.get().c_str());
simgrid::kernel::routing::NetPoint::onCreation.connect([](simgrid::kernel::routing::NetPoint* pt) {
@@
-166,7
+166,7
@@
NetworkNS3Model::~NetworkNS3Model() {
xbt_dict_free(&flowFromSock);
}
xbt_dict_free(&flowFromSock);
}
-LinkImpl* NetworkNS3Model::createLink(const
char*
name, double bandwidth, double latency,
+LinkImpl* NetworkNS3Model::createLink(const
std::string&
name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy)
{
return new LinkNS3(this, name, bandwidth, latency);
e_surf_link_sharing_policy_t policy)
{
return new LinkNS3(this, name, bandwidth, latency);
@@
-237,8
+237,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
if(sgFlow->finished_){
xbt_dynar_push(socket_to_destroy,&ns3Socket);
XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
if(sgFlow->finished_){
xbt_dynar_push(socket_to_destroy,&ns3Socket);
XBT_DEBUG("Destroy socket %p of action %p", ns3Socket, action);
- action->finish();
- action->setState(Action::State::done);
+ action->finish(Action::State::done);
}
}
}
}
@@
-246,7
+245,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
xbt_dynar_pop(socket_to_destroy,&ns3Socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
xbt_dynar_pop(socket_to_destroy,&ns3Socket);
if (XBT_LOG_ISENABLED(ns3, xbt_log_priority_debug)) {
- SgFlow
*flow = (SgFlow*)xbt_dict_get (flowFromSock, ns3Socket
);
+ SgFlow
* flow = static_cast<SgFlow*>(xbt_dict_get(flowFromSock, ns3Socket)
);
XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
}
xbt_dict_remove(flowFromSock, ns3Socket);
XBT_DEBUG ("Removing socket %p of action %p", ns3Socket, flow->action_);
}
xbt_dict_remove(flowFromSock, ns3Socket);
@@
-257,7
+256,7
@@
void NetworkNS3Model::updateActionsState(double now, double delta)
* Resource *
************/
* Resource *
************/
-LinkNS3::LinkNS3(NetworkNS3Model* model, const
char*
name, double bandwidth, double latency)
+LinkNS3::LinkNS3(NetworkNS3Model* model, const
std::string&
name, double bandwidth, double latency)
: LinkImpl(model, name, nullptr)
{
bandwidth_.peak = bandwidth;
: LinkImpl(model, name, nullptr)
{
bandwidth_.peak = bandwidth;