X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f777f30924d7890b9e1da29f9d1a637035531b..70388188c97f56fbe2b645c9b00dcb05d0b86509:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 4ef507c894..062d9ea9f8 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -169,7 +169,7 @@ typedef struct surf_cpu_model_extension_public { e_surf_resource_state_t(*get_state) (void *cpu); double (*get_speed) (void *cpu, double load); double (*get_available_speed) (void *cpu); - void* (*create_resource) (char *name, double power_peak, + void* (*create_resource) (const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -195,7 +195,7 @@ typedef struct surf_network_model_extension_public { double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); void (*add_traces) (void); - void* (*create_resource) (char *name, + void* (*create_resource) (const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -233,7 +233,7 @@ typedef struct surf_workstation_model_extension_public { double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */ int (*link_shared) (const void *link); xbt_dict_t(*get_properties) (const void *resource); - void* (*link_create_resource) (char *name, + void* (*link_create_resource) (const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -243,7 +243,7 @@ typedef struct surf_workstation_model_extension_public { tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - void* (*cpu_create_resource) (char *name, double power_peak, + void* (*cpu_create_resource) (const char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, e_surf_resource_state_t state_initial, @@ -648,15 +648,6 @@ XBT_PUBLIC_DATA(xbt_cfg_t) _surf_cfg_set; */ XBT_PUBLIC(void) surf_init(int *argc, char **argv); /* initialize common structures */ -/** \brief Initialize the used models. - * - * Must be called after the surf_init so that configuration infrastructure is created - * Must be called before parsing/creating the environment - * Must not be called within the initialization process so that the use get a chance to change the settings from - * its code between, say, MSG_init and MSG_create_environment using MSG_config - */ -XBT_PUBLIC(void) surf_config_models_setup(void); - /** \brief create the elements of the models * * Must be called after parsing the platform file and before using any elements