#include "src/surf/host_interface.hpp"
#include "src/simdag/simdag_private.h"
#include "simgrid/simdag.h"
-#include "simgrid/Host.hpp"
+#include <simgrid/s4u/host.hpp>
#include "xbt/dict.h"
#include "xbt/lib.h"
#include "xbt/sysdep.h"
* \see SD_workstation_get_number()
*/
const SD_workstation_t *SD_workstation_get_list(void) {
- xbt_assert(SD_workstation_get_number() > 0, "There is no workstation!");
+ xbt_assert(SD_workstation_get_count() > 0, "There is no workstation!");
if (sd_global->workstation_list == NULL) /* this is the first time the function is called */
sd_global->workstation_list = (SD_workstation_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
* \return the number of existing workstations
* \see SD_workstation_get_list()
*/
-int SD_workstation_get_number(void)
+int SD_workstation_get_count(void)
{
return sg_host_count();
}
*
* \param src a workstation
* \param dst another workstation
- * \return a new array of \ref SD_link_t representating the route between these two workstations
+ * \return a new array of \ref SD_link_t representing the route between these two workstations
* \see SD_route_get_size(), SD_link_t
*/
const SD_link_t *SD_route_get_list(SD_workstation_t src,
if (sd_global->recyclable_route == NULL) {
/* first run */
- sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_number());
+ sd_global->recyclable_route = xbt_new(SD_link_t, sg_link_count());
}
surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst);
*/
double SD_workstation_get_power(SD_workstation_t workstation)
{
- return workstation->getSpeed();
+ return workstation->speed();
}
/**
* \brief Returns the amount of cores of a workstation
* \return the amount of cores of this workstation
*/
int SD_workstation_get_cores(SD_workstation_t workstation) {
- return workstation->getCoreAmount();
+ return workstation->core_count();
}
/**
}
/**
- * \brief Returns the latency of the route between two workstations, i.e. the sum of all link latencies
- * between the workstations.
+ * \brief Returns the latency of the route between two workstations.
*
* \param src the first workstation
* \param dst the second workstation
* \return the latency of the route between the two workstations (in seconds)
- * \see SD_route_get_current_bandwidth()
+ * \see SD_route_get_bandwidth()
*/
-double SD_route_get_current_latency(SD_workstation_t src,
- SD_workstation_t dst)
+double SD_route_get_latency(SD_workstation_t src, SD_workstation_t dst)
{
-
- const SD_link_t *links;
- int nb_links;
+ xbt_dynar_t route = NULL;
double latency;
- int i;
-
- links = SD_route_get_list(src, dst);
- nb_links = SD_route_get_size(src, dst);
- latency = 0.0;
- for (i = 0; i < nb_links; i++) {
- latency += SD_link_get_current_latency(links[i]);
- }
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
+ &route, &latency);
return latency;
}
/**
- * \brief Returns the bandwidth of the route between two workstations, i.e. the minimum link bandwidth of all
- * between the workstations.
+ * \brief Returns the bandwidth of the route between two workstations,
+ * i.e. the minimum link bandwidth of all between the workstations.
*
* \param src the first workstation
* \param dst the second workstation
- * \return the bandwidth of the route between the two workstations (in bytes/second)
- * \see SD_route_get_current_latency()
+ * \return the bandwidth of the route between the two workstations
+ * (in bytes/second)
+ * \see SD_route_get_latency()
*/
-double SD_route_get_current_bandwidth(SD_workstation_t src,
- SD_workstation_t dst)
+double SD_route_get_bandwidth(SD_workstation_t src, SD_workstation_t dst)
{
const SD_link_t *links;
min_bandwidth = -1.0;
for (i = 0; i < nb_links; i++) {
- bandwidth = SD_link_get_current_bandwidth(links[i]);
+ bandwidth = sg_link_bandwidth(links[i]);
if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
min_bandwidth = bandwidth;
}
transmission time of a link = communication amount / link bandwidth */
const SD_link_t *links;
+ xbt_dynar_t route = NULL;
int nb_links;
double bandwidth, min_bandwidth;
double latency;
if (bytes_amount == 0.0)
return 0.0;
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
+ &route, &latency);
+
links = SD_route_get_list(src, dst);
nb_links = SD_route_get_size(src, dst);
min_bandwidth = -1.0;
- latency = 0;
for (i = 0; i < nb_links; i++) {
- latency += SD_link_get_current_latency(links[i]);
- bandwidth = SD_link_get_current_bandwidth(links[i]);
+ bandwidth = sg_link_bandwidth(links[i]);
if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
min_bandwidth = bandwidth;
}
return (sg_host_sd(workstation)->current_task);
}
-/**
- * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to the AS
- * or router
- *
- * \param AS, router name
- * \return the xbt_dict_t properties of the AS
- */
-xbt_dict_t SD_as_router_get_properties(const char *asr)
-{
- return get_as_router_properties(asr);
-}
-/**
- * \brief Returns a #xbt_dict_t consisting of the list of properties assigned to the AS
- * or router
- *
- * \param AS, router name
- * \param The name of a properties
- * \return value of the properties
- */
-const char* SD_as_router_get_property_value(const char *asr, const char *name)
-{
- xbt_dict_t dict = get_as_router_properties(asr);
- if(!dict) return NULL;
- return (const char*)xbt_dict_get_or_null(dict,name);
-}