X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/129188ec404d7b0aa0bacafd9e2a8d26ed37183a..f1108fb98f55b19642cf5fd4d077ddb8788e60b1:/src/surf/network_smpi.cpp diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp index 6d52fc76e2..e9dea0e30a 100644 --- 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" @@ -99,9 +105,9 @@ NetworkSmpiModel::~NetworkSmpiModel(){ } } -void NetworkSmpiModel::gapAppend(double size, const NetworkLinkLmmPtr link, NetworkActionLmmPtr action) +void NetworkSmpiModel::gapAppend(double size, const NetworkLinkPtr link, NetworkActionPtr 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; @@ -136,11 +142,11 @@ void NetworkSmpiModel::gapAppend(double size, const NetworkLinkLmmPtr link, Netw } } -void NetworkSmpiModel::gapRemove(ActionLmmPtr lmm_action) +void NetworkSmpiModel::gapRemove(ActionPtr lmm_action) { xbt_fifo_t fifo; size_t size; - NetworkCm02ActionLmmPtr action = (NetworkCm02ActionLmmPtr)(lmm_action); + NetworkCm02ActionPtr action = static_cast(lmm_action); if (sg_sender_gap > 0.0 && action->p_senderLinkName && action->p_senderFifoItem) { @@ -180,6 +186,7 @@ double NetworkSmpiModel::bandwidthFactor(double size) return current; } + double NetworkSmpiModel::latencyFactor(double size) { if (!smpi_lat_factor)