From 3f391af133151d7ed0125a4fbcfaf6f68a5df2c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Tue, 8 Oct 2013 18:04:24 +0200 Subject: [PATCH] Fix surf_usage2 --- src/include/surf/surf.h | 3 +-- src/simix/smx_network.c | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 784df53716..117e7bb0f8 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -318,7 +318,7 @@ surf_action_t surf_workstation_model_execute_parallel_task(surf_workstation_mode double *computation_amount, double *communication_amount, double rate); -surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_workstation_CLM03_t src, surf_workstation_CLM03_t dst, double size, double rate); +surf_action_t surf_workstation_model_communicate(surf_workstation_model_t model, surf_workstation_t src, surf_workstation_t dst, double size, double rate); xbt_dynar_t surf_workstation_model_get_route(surf_workstation_model_t model, surf_workstation_t src, surf_workstation_t dst); surf_action_t surf_network_model_communicate(surf_network_model_t model, sg_routing_edge_t src, sg_routing_edge_t dst, double size, double rate); const char *surf_resource_name(surf_resource_t resource); @@ -329,7 +329,6 @@ double surf_workstation_get_available_speed(surf_workstation_t resource); int surf_workstation_get_core(surf_workstation_t resource); surf_action_t surf_workstation_execute(surf_workstation_t resource, double size); surf_action_t surf_workstation_sleep(surf_workstation_t resource, double duration); -surf_action_t surf_workstation_communicate(surf_workstation_t workstation_src, surf_workstation_t workstation_dst, double size, double rate); surf_action_t surf_workstation_open(surf_workstation_t workstation, const char* mount, const char* path); surf_action_t surf_workstation_close(surf_workstation_t workstation, surf_file_t fd); const char *surf_cpu_name(surf_cpu_t resource); diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 53133ae297..046791ad83 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -846,7 +846,9 @@ XBT_INLINE void SIMIX_comm_start(smx_action_t action) XBT_DEBUG("Starting communication %p from '%s' to '%s'", action, SIMIX_host_get_name(sender), SIMIX_host_get_name(receiver)); - action->comm.surf_comm = surf_workstation_communicate(sender, receiver, action->comm.task_size, action->comm.rate); + action->comm.surf_comm = surf_workstation_model_communicate(surf_workstation_model, + sender, receiver, + action->comm.task_size, action->comm.rate); surf_action_set_data(action->comm.surf_comm, action); -- 2.20.1