X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d000a773b5ebcd411b28c31de68eeddf804e66b..5e9ecc268a45db21daf49b37edb7df76987f798b:/src/include/surf/surf.h diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 52a2e56a62..166ce02768 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -257,7 +257,7 @@ XBT_PUBLIC(surf_action_t) surf_network_model_communicate(surf_network_model_t mo */ XBT_PUBLIC(const char * ) surf_resource_name(surf_cpp_resource_t resource); static inline const char * surf_cpu_name(surf_cpu_t cpu) { - return surf_resource_name((surf_cpp_resource_t)cpu); + return surf_resource_name((surf_cpp_resource_t)cpu); } /** @brief Get the available speed of cpu associated to a host */ @@ -975,12 +975,6 @@ XBT_PUBLIC(void) parse_platform_file(const char *file); /* For the trace and trace:connect tag (store their content till the end of the parsing) */ XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_host_speed; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_avail; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_bw; -XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_link_lat; - -XBT_PUBLIC(double) parse_cpu_speed(const char *str_speed); XBT_PUBLIC(xbt_dict_t) get_as_router_properties(const char* name); @@ -1011,7 +1005,6 @@ void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *fi /********** Routing **********/ void routing_AS_begin(sg_platf_AS_cbarg_t AS); void routing_AS_end(void); -surf_NetCard* routing_add_host(surf_As* as, sg_platf_host_cbarg_t host); void routing_cluster_add_backbone(void* bb); surf_As* routing_get_current();