X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2d16cd78c8d1a779948aa69d6e396028c788a5e..d0e93a6a4400978f6473c813eb434437ab540b2d:/include/simgrid/host.h diff --git a/include/simgrid/host.h b/include/simgrid/host.h index 46dba84b12..37efe414fc 100644 --- a/include/simgrid/host.h +++ b/include/simgrid/host.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -22,64 +22,36 @@ XBT_PUBLIC sg_host_t* sg_host_list(); /** Returns the amount of hosts existing in the platform. */ XBT_PUBLIC size_t sg_host_count(); -/** - * @brief Return a dynar containing all the hosts declared at a given point of time (including VMs) - * @remark The host order in the returned array is generally different from the host creation/declaration order in the - * XML platform (we use a hash table internally) - */ -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_list()") XBT_PUBLIC xbt_dynar_t sg_hosts_as_dynar(); - XBT_PUBLIC size_t sg_host_extension_create(void (*deleter)(void*)); XBT_PUBLIC void* sg_host_extension_get(const_sg_host_t host, size_t rank); /** Finds a host from its name */ XBT_PUBLIC sg_host_t sg_host_by_name(const char* name); +XBT_PUBLIC sg_vm_t sg_vm_by_name(sg_host_t host, const char* name); /** @brief Return the name of the sg_host_t. */ XBT_PUBLIC const char* sg_host_get_name(const_sg_host_t host); -#ifndef DOXYGEN // ========== User Data ============== /** @brief Return the user data of a #sg_host_t. * * This functions returns the user data associated to @a host if any. */ XBT_PUBLIC void* sg_host_get_data(const_sg_host_t host); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_data()") XBT_PUBLIC void* sg_host_data(const_sg_host_t host); -XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_get_data()") XBT_PUBLIC void* sg_host_user(sg_host_t host); + /** @brief Set the user data of a #sg_host_t. * * This functions attach @a data to @a host. */ XBT_PUBLIC void sg_host_set_data(sg_host_t host, void* userdata); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_set_data()") XBT_PUBLIC - void sg_host_data_set(sg_host_t host, void* userdata); -XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_set_data()") XBT_PUBLIC - void sg_host_user_set(sg_host_t host, void* userdata); -XBT_ATTRIB_DEPRECATED_v328("Please use sg_host_set_data(h, NULL)") XBT_PUBLIC void sg_host_user_destroy(sg_host_t host); -#endif // ========= storage related functions ============ -/** @brief Return the list of mount point names on a host. - * @param host a host - * @return a dict containing all mount point on the host (mount_name => sg_storage_t) - */ -XBT_PUBLIC xbt_dict_t sg_host_get_mounted_storage_list(sg_host_t host); - -/** @brief Return the list of storages attached to a host. - * @param host a host - * @return a dynar containing all storages (name) attached to the host - */ -XBT_PUBLIC xbt_dynar_t sg_host_get_attached_storage_list(const_sg_host_t host); XBT_PUBLIC void sg_host_get_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_disks()") XBT_PUBLIC - void sg_host_disks(const_sg_host_t host, unsigned int* disk_count, sg_disk_t** disks); // =========== user-level functions =============== /** @brief Return the speed of the processor (in flop/s), regardless of the current load on the machine. */ XBT_PUBLIC double sg_host_get_speed(const_sg_host_t host); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_speed()") XBT_PUBLIC double sg_host_speed(const_sg_host_t host); -XBT_PUBLIC double sg_host_get_pstate_speed(const_sg_host_t host, int pstate_index); +XBT_PUBLIC double sg_host_get_pstate_speed(const_sg_host_t host, unsigned long pstate_index); XBT_PUBLIC double sg_host_get_available_speed(const_sg_host_t host); @@ -89,7 +61,6 @@ XBT_PUBLIC int sg_host_core_count(const_sg_host_t host); * @param host a host */ XBT_PUBLIC double sg_host_get_load(const_sg_host_t host); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_load()") XBT_PUBLIC double sg_host_load(const_sg_host_t host); /** @brief Return the location on which the current process is running. */ XBT_PUBLIC sg_host_t sg_host_self(); @@ -104,10 +75,10 @@ XBT_PUBLIC const char* sg_host_self_get_name(); * * @param host host to test */ -XBT_PUBLIC int sg_host_get_nb_pstates(const_sg_host_t host); +XBT_PUBLIC unsigned long sg_host_get_nb_pstates(const_sg_host_t host); -XBT_PUBLIC int sg_host_get_pstate(const_sg_host_t host); -XBT_PUBLIC void sg_host_set_pstate(sg_host_t host, int pstate); +XBT_PUBLIC unsigned long sg_host_get_pstate(const_sg_host_t host); +XBT_PUBLIC void sg_host_set_pstate(sg_host_t host, unsigned long pstate); XBT_PUBLIC void sg_host_turn_on(sg_host_t host); XBT_PUBLIC void sg_host_turn_off(sg_host_t host); @@ -142,23 +113,10 @@ XBT_PUBLIC void sg_host_set_property_value(sg_host_t host, const char* name, con XBT_PUBLIC void sg_host_get_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links); XBT_PUBLIC double sg_host_get_route_latency(const_sg_host_t from, const_sg_host_t to); XBT_PUBLIC double sg_host_get_route_bandwidth(const_sg_host_t from, const_sg_host_t to); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_route()") XBT_PUBLIC - void sg_host_route(const_sg_host_t from, const_sg_host_t to, xbt_dynar_t links); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_route_latency()") XBT_PUBLIC - double sg_host_route_latency(const_sg_host_t from, const_sg_host_t to); -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_get_route_bandwidth()") XBT_PUBLIC - double sg_host_route_bandwidth(const_sg_host_t from, const_sg_host_t to); XBT_PUBLIC void sg_host_sendto(sg_host_t from, sg_host_t to, double byte_amount); -#ifndef DOXYGEN -XBT_ATTRIB_DEPRECATED_v330("Please use sg_host_sendto") inline void sg_host_send_to(sg_host_t from, sg_host_t to, - double byte_amount) -{ - sg_host_sendto(from, to, byte_amount); -} -#endif - -XBT_PUBLIC void sg_host_dump(const_sg_host_t ws); +XBT_ATTRIB_DEPRECATED_v335("Please manifest if you actually need this function") XBT_PUBLIC + void sg_host_dump(const_sg_host_t ws); XBT_PUBLIC void sg_host_get_actor_list(const_sg_host_t host, xbt_dynar_t whereto); SG_END_DECL