X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9070feda0eec90cf10d562ece376fcd6a777ff7c..28b41e5afc60722c75727c405eb4b3d29caf093b:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 6690309406..fc3af0b384 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -67,8 +67,7 @@ typedef struct surf_resource_public { void (*action_recycle) (surf_action_t action); void (*action_change_state) (surf_action_t action, e_surf_action_state_t state); - void (*action_set_data) (surf_action_t action, - void *data); + void (*action_set_data) (surf_action_t action, void *data); void (*suspend) (surf_action_t action); void (*resume) (surf_action_t action); int (*is_suspended) (surf_action_t action); @@ -80,10 +79,6 @@ typedef struct surf_resource { surf_resource_public_t common_public; } s_surf_resource_t; -typedef struct surf_resource_object { - surf_resource_t resource; -} s_surf_resource_object_t, *surf_resource_object_t; - /**************************************/ /* Implementations of resource object */ /**************************************/ @@ -98,7 +93,7 @@ typedef struct surf_cpu_resource_extension_private typedef struct surf_cpu_resource_extension_public { surf_action_t(*execute) (void *cpu, double size); surf_action_t(*sleep) (void *cpu, double duration); - e_surf_cpu_state_t(*get_state) (void *cpu); + e_surf_cpu_state_t(*get_state) (void *cpu); } s_surf_cpu_resource_extension_public_t, *surf_cpu_resource_extension_public_t; @@ -114,7 +109,7 @@ void surf_cpu_resource_init_Cas01(const char *filename); typedef struct surf_network_resource_extension_private *surf_network_resource_extension_private_t; typedef struct surf_network_resource_extension_public { - surf_action_t(*communicate) (void *src, void *dst, double size, + surf_action_t(*communicate) (void *src, void *dst, double size, double max_rate); } s_surf_network_resource_extension_public_t, *surf_network_resource_extension_public_t; @@ -136,7 +131,7 @@ typedef struct surf_workstation_resource_extension_public { surf_action_t(*sleep) (void *workstation, double duration); e_surf_cpu_state_t(*get_state) (void *workstation); surf_action_t(*communicate) (void *workstation_src, - void *workstation_dst, double size, + void *workstation_dst, double size, double max_rate); } s_surf_workstation_resource_extension_public_t, *surf_workstation_resource_extension_public_t;