X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..e76ef17ba2a7db2ab8a3b921995823af5abd8882:/src/simdag/sd_link.c?ds=sidebyside diff --git a/src/simdag/sd_link.c b/src/simdag/sd_link.c index e147c42424..7f5da90d27 100644 --- a/src/simdag/sd_link.c +++ b/src/simdag/sd_link.c @@ -1,15 +1,14 @@ -/* Copyright (c) 2006-2012. The SimGrid Team. +/* Copyright (c) 2006-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 "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/dict.h" #include "xbt/sysdep.h" #include "surf/surf.h" -#include "surf/surf_resource.h" /* Creates a link and registers it in SD. @@ -23,7 +22,7 @@ SD_link_t __SD_link_create(void *surf_link, void *data) link = xbt_new(s_SD_link_t, 1); link->surf_link = surf_link; link->data = data; /* user data */ - if (surf_workstation_model->extension.workstation.link_shared(surf_link)) + if (surf_network_link_is_shared(surf_link)) link->sharing_policy = SD_LINK_SHARED; else link->sharing_policy = SD_LINK_FATPIPE; @@ -118,8 +117,7 @@ const char *SD_link_get_name(SD_link_t link) */ double SD_link_get_current_bandwidth(SD_link_t link) { - return surf_workstation_model->extension.workstation. - get_link_bandwidth(link->surf_link); + return surf_network_link_get_bandwidth(link->surf_link); } /** @@ -130,8 +128,7 @@ double SD_link_get_current_bandwidth(SD_link_t link) */ double SD_link_get_current_latency(SD_link_t link) { - return surf_workstation_model->extension.workstation. - get_link_latency(link->surf_link); + return surf_network_link_get_latency(link->surf_link); } /**