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
obvious typo
[simgrid.git]
/
src
/
surf
/
network_smpi.cpp
diff --git
a/src/surf/network_smpi.cpp
b/src/surf/network_smpi.cpp
index
6d52fc7
..
e9dea0e
100644
(file)
--- a/
src/surf/network_smpi.cpp
+++ b/
src/surf/network_smpi.cpp
@@
-1,3
+1,9
@@
+/* Copyright (c) 2013-2014. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
#include "network_smpi.hpp"
#include "simgrid/sg_config.h"
#include "network_smpi.hpp"
#include "simgrid/sg_config.h"
@@
-99,9
+105,9
@@
NetworkSmpiModel::~NetworkSmpiModel(){
}
}
}
}
-void NetworkSmpiModel::gapAppend(double size, const NetworkLink
LmmPtr link, NetworkActionLmm
Ptr action)
+void NetworkSmpiModel::gapAppend(double size, const NetworkLink
Ptr link, NetworkAction
Ptr action)
{
{
- const char *src = link->
m_name
;
+ const char *src = link->
getName()
;
xbt_fifo_t fifo;
//surf_action_network_CM02_t last_action;
//double bw;
xbt_fifo_t fifo;
//surf_action_network_CM02_t last_action;
//double bw;
@@
-136,11
+142,11
@@
void NetworkSmpiModel::gapAppend(double size, const NetworkLinkLmmPtr link, Netw
}
}
}
}
-void NetworkSmpiModel::gapRemove(Action
Lmm
Ptr lmm_action)
+void NetworkSmpiModel::gapRemove(ActionPtr lmm_action)
{
xbt_fifo_t fifo;
size_t size;
{
xbt_fifo_t fifo;
size_t size;
- NetworkCm02Action
LmmPtr action = (NetworkCm02ActionLmmPtr)
(lmm_action);
+ NetworkCm02Action
Ptr action = static_cast<NetworkCm02ActionPtr>
(lmm_action);
if (sg_sender_gap > 0.0 && action->p_senderLinkName
&& action->p_senderFifoItem) {
if (sg_sender_gap > 0.0 && action->p_senderLinkName
&& action->p_senderFifoItem) {
@@
-180,6
+186,7
@@
double NetworkSmpiModel::bandwidthFactor(double size)
return current;
}
return current;
}
+
double NetworkSmpiModel::latencyFactor(double size)
{
if (!smpi_lat_factor)
double NetworkSmpiModel::latencyFactor(double size)
{
if (!smpi_lat_factor)