A few weeks ago, there was a brutal renaming of resource to model. It

was a little too brutal. Setting back correct names for functions and
variables that really concerned resources and not models...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4590 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index fb4e0b9..5a50994 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -123,7 +123,7 @@ typedef struct surf_action_state {
 typedef struct surf_model_public {
   s_surf_action_state_t states;        /**< Any living action on this model */
   void *(*name_service) (const char *name); /**< Return a model given its name */
-  const char *(*get_resource_name) (void *resource_id); /**< Return the name of a model */
+  const char *(*get_resource_name) (void *resource_id); /**< Return the name of a resource */
 
   e_surf_action_state_t(*action_get_state) (surf_action_t action); /**< Return the state of an action */
   double (*action_get_start_time) (surf_action_t action); /**< Return the start time of an action */

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index 84a5f3d..0b66302 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -31,7 +31,7 @@ typedef enum {
 
 typedef struct surf_model_private {
   int (*resource_used) (void *resource_id);
-  /* Share the models to the actions and return in hom much time
+  /* Share the resources to the actions and return in hom much time
      the next action may terminate */
   double (*share_resources) (double now);
   /* Update the actions' state */
@@ -54,7 +54,7 @@ double generic_maxmin_share_resources2(xbt_swag_t running_actions,
                                       lmm_system_t sys,
                                       void (*solve)(lmm_system_t));
 
-/* Generic functions common to all ressources */
+/* Generic functions common to all modelss */
 e_surf_action_state_t surf_action_get_state(surf_action_t action);
 double surf_action_get_start_time(surf_action_t action);
 double surf_action_get_finish_time(surf_action_t action);