Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
fixing name of the function and its utilization in network constant model
authorschnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 11 Oct 2010 10:15:59 +0000 (10:15 +0000)
committerschnorr <schnorr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Mon, 11 Oct 2010 10:15:59 +0000 (10:15 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8396 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/surf/network_constant.c
src/surf/surf_private.h

index 866ac41..61e1c4e 100644 (file)
@@ -198,7 +198,7 @@ void surf_network_model_init_Constant(const char *filename)
   surf_network_model->action_recycle = net_action_recycle;
   surf_network_model->get_remains = net_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   surf_network_model->action_recycle = net_action_recycle;
   surf_network_model->get_remains = net_action_get_remains;
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-  surf_network_model->get_latency_limited = net_get_link_latency;
+  surf_network_model->get_latency_limited = net_get_link_latency_limited;
 #endif
 
   surf_network_model->model_private->resource_used = netcste_resource_used;
 #endif
 
   surf_network_model->model_private->resource_used = netcste_resource_used;
index f3ecc2b..6102040 100644 (file)
@@ -68,7 +68,7 @@ void surf_config(const char *name, va_list pa);
 void net_action_recycle(surf_action_t action);
 double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 void net_action_recycle(surf_action_t action);
 double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-int net_get_link_latency(surf_action_t action);
+int net_get_link_latency_limited(surf_action_t action);
 #endif
 void net_action_set_max_duration(surf_action_t action, double duration);
 /*
 #endif
 void net_action_set_max_duration(surf_action_t action, double duration);
 /*