X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/08ce0edd12b2c42378cc228a91d37613bbc2acbc..fec43de0a32ebea77563d441cdf9b888667da722:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 52d11f3966..7f48885836 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, @@ -809,8 +809,6 @@ XBT_PUBLIC(void) routing_store_route(void); * interface between surf and lua bindings * see surfxml_parse.c */ -XBT_PUBLIC(void) surf_AS_new(const char *id, const char *mode); -XBT_PUBLIC(void) surf_AS_finalize(const char *id); XBT_PUBLIC(void) surf_route_add_host(const char *id); XBT_PUBLIC(void) surf_routing_add_route(const char *src_id, const char *dest_id,