-/* Copyright (c) 2006-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
resource with computing capabilities</em> and has a <em>name</em>.
@see SD_workstation_management */
-typedef xbt_dictelm_t SD_workstation_t;
+typedef sg_host_t SD_workstation_t;
/** @brief Workstation access mode
@ingroup SD_datatypes_management
@see SD_storage_management */
typedef xbt_dictelm_t SD_storage_t;
-/************************** AS handling *************************************/
-XBT_PUBLIC(xbt_dict_t) SD_as_router_get_properties(const char *as);
-XBT_PUBLIC(const char*) SD_as_router_get_property_value(const char * as,
- const char *name);
-
/************************** Link handling ***********************************/
/** @defgroup SD_link_management Links
* @brief Functions for managing the network links
* @{
*/
XBT_PUBLIC(const SD_link_t *) SD_link_get_list(void);
-XBT_PUBLIC(int) SD_link_get_number(void);
+/** @brief Returns the number of links in the whole platform */
+static inline int SD_link_get_number(void) {
+ return sg_link_count();
+}
+
/** @brief Returns the user data of a link */
static inline void *SD_link_get_data(SD_link_t link) {
return sg_link_data(link);
static inline void SD_link_set_data(SD_link_t link, void *data) {
sg_link_data_set(link, data);
}
-/** @Returns the name of a link */
+/** @brief Returns the name of a link */
static inline const char *SD_link_get_name(SD_link_t link) {
return sg_link_name(link);
}
const SD_workstation_t *
workstation_list,
const double *flops_amount,
- const double *bytes_amount);
-XBT_PUBLIC(int) SD_task_get_kind(SD_task_t task);
+ const double *bytes_amount);
+XBT_PUBLIC(e_SD_task_kind_t) SD_task_get_kind(SD_task_t task);
XBT_PUBLIC(void) SD_task_schedule(SD_task_t task, int workstation_nb,
const SD_workstation_t *
workstation_list,
/** @defgroup SD_simulation Simulation
* @brief Functions for creating the environment and launching the simulation
*
- * This section describes the functions for initialising SimDag, launching
+ * This section describes the functions for initializing SimDag, launching
* the simulation and exiting SimDag.
*
* @{
/** @} */
+SG_END_DECL()
+
#include "simgrid/instr.h"
-SG_END_DECL()
#endif