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
Kill some more atof
[simgrid.git]
/
src
/
surf
/
network_constant.cpp
diff --git
a/src/surf/network_constant.cpp
b/src/surf/network_constant.cpp
index
673c70c
..
836a8c4
100644
(file)
--- a/
src/surf/network_constant.cpp
+++ b/
src/surf/network_constant.cpp
@@
-5,17
+5,11
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
-#include "surf/random_mgr.h"
#include "host_interface.hpp"
#include "host_interface.hpp"
+#include "src/surf/platform.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static int host_number_int = 0;
-
-static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
- xbt_die("There is no link in the Constant network model. "
- "Please remove any link from your platform (and switch to routing='None')");
-}
/*********
* Model *
/*********
* Model *
@@
-24,16
+18,14
@@
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
surf_network_model = new simgrid::surf::NetworkConstantModel();
{
xbt_assert(surf_network_model == NULL);
surf_network_model = new simgrid::surf::NetworkConstantModel();
+ xbt_dynar_push(all_existing_models, &surf_network_model);
routing_model_create(NULL);
routing_model_create(NULL);
- simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
- host_number_int++;
+ simgrid::surf::on_link.connect([](sg_platf_link_cbarg_t link){
+ xbt_die("There is no link in the Constant network model. "
+ "Please remove any link from your platform (and switch to routing='None')");
});
});
- sg_platf_link_add_cb(netcste_parse_nolink);
-
- simgrid::surf::Model *model = surf_network_model;
- xbt_dynar_push(all_existing_models, &model);
}
namespace simgrid {
}
namespace simgrid {
@@
-46,10
+38,10
@@
double NetworkConstantModel::shareResources(double /*now*/)
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itend(actionSet->end())
-
; it != itend ; ++it) {
-
action = static_cast<NetworkConstantAction*>(&*it);
-
if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
-
min = action->m_latency;
+ ; it != itend ; ++it) {
+ action = static_cast<NetworkConstantAction*>(&*it);
+ if (action->m_latency > 0 && (min < 0 || action->m_latency < min))
+ min = action->m_latency;
}
return min;
}
return min;
@@
-60,9
+52,9
@@
void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
NetworkConstantAction *action = NULL;
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
NetworkConstantAction *action = NULL;
ActionList *actionSet = getRunningActionSet();
for(ActionList::iterator it(actionSet->begin()), itNext=it, itend(actionSet->end())
- ; it != itend ; it=itNext) {
+
; it != itend ; it=itNext) {
++itNext;
++itNext;
-
action = static_cast<NetworkConstantAction*>(&*it);
+ action = static_cast<NetworkConstantAction*>(&*it);
if (action->m_latency > 0) {
if (action->m_latency > delta) {
double_update(&(action->m_latency), delta, sg_surf_precision);
if (action->m_latency > 0) {
if (action->m_latency > delta) {
double_update(&(action->m_latency), delta, sg_surf_precision);
@@
-78,7
+70,7
@@
void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
action->finish();
action->setState(SURF_ACTION_DONE);
} else if ((action->getMaxDuration() != NO_MAX_DURATION)
action->finish();
action->setState(SURF_ACTION_DONE);
} else if ((action->getMaxDuration() != NO_MAX_DURATION)
-
&& (action->getMaxDuration() <= 0)) {
+ && (action->getMaxDuration() <= 0)) {
action->finish();
action->setState(SURF_ACTION_DONE);
}
action->finish();
action->setState(SURF_ACTION_DONE);
}
@@
-86,7
+78,7
@@
void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
}
Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
}
Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
-
double size, double rate)
+ double size, double rate)
{
char *src_name = src->getName();
char *dst_name = dst->getName();
{
char *src_name = src->getName();
char *dst_name = dst->getName();
@@
-107,10
+99,10
@@
int NetworkConstantAction::unref()
{
m_refcount--;
if (!m_refcount) {
{
m_refcount--;
if (!m_refcount) {
-
if (action_hook.is_linked())
-
p_stateSet->erase(p_stateSet->iterator_to(*this));
+ if (action_hook.is_linked())
+ p_stateSet->erase(p_stateSet->iterator_to(*this));
delete this;
delete this;
- return 1;
+
return 1;
}
return 0;
}
}
return 0;
}