-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
typedef struct RoutingPlatf RoutingPlatf;
#endif
-/** \ingroup SURF_models
+/** @ingroup SURF_c_bindings
* \brief Model datatype
*
* Generic data structure for a model. The workstations,
typedef NetworkCm02Link *surf_network_link_t;
typedef Cpu *surf_cpu_t;
-/** \ingroup SURF_actions
+/** @ingroup SURF_c_bindings
* \brief Action structure
*
* Never create s_surf_action_t by yourself ! The actions are created
* \see e_surf_action_state_t
*/
typedef Action *surf_action_t;
-typedef ActionLmm *surf_action_lmm_t;
-typedef StorageActionLmm *surf_storage_action_lmm_t;
typedef As *AS_t;
typedef RoutingEdge *routing_edge_t;
/***************************/
/* Generic model object */
/***************************/
+
//FIXME:REMOVE typedef struct s_routing_platf s_routing_platf_t, *routing_platf_t;
XBT_PUBLIC_DATA(routing_platf_t) routing_platf;
*
* @param resource [description]
* @param cpu [description]
- * @param long [description]
+ * @param mask [description]
*/
XBT_PUBLIC(void) surf_vm_workstation_set_affinity(surf_resource_t resource, surf_resource_t cpu, unsigned long mask);
* @brief Get the workstation power peak
* @details [long description]
*
- * @param resource The surf workstation
+ * @param host The surf workstation
* @return The power peak
*/
XBT_PUBLIC(double) surf_workstation_get_current_power_peak(surf_resource_t host);
* @brief [brief description]
* @details [long description]
*
- * @param resource [description]
+ * @param host [description]
* @param pstate_index [description]
*
* @return [description]
* @brief [brief description]
* @details [long description]
*
- * @param resource [description]
+ * @param host [description]
* @return [description]
*/
XBT_PUBLIC(int) surf_workstation_get_nb_pstates(surf_resource_t host);
* @brief [brief description]
* @details [long description]
*
- * @param resource [description]
+ * @param host [description]
* @param pstate_index [description]
*/
XBT_PUBLIC(void) surf_workstation_set_power_peak_at(surf_resource_t host, int pstate_index);
/**
* @brief Get the consumed energy (in joules) of a workstation
*
- * @param resource The surf workstation
+ * @param host The surf workstation
* @return The consumed energy
*/
XBT_PUBLIC(double) surf_workstation_get_consumed_energy(surf_resource_t host);
* @param action The surf action
* @return The cost of the action
*/
-XBT_PUBLIC(int) surf_action_get_cost(surf_action_t action);
+XBT_PUBLIC(double) surf_action_get_cost(surf_action_t action);
/**
* @brief [brief desrciption]
*
* @param action The surf cpu action
* @param cpu [description]
- * @param long [description]
+ * @param mask [description]
*/
XBT_PUBLIC(void) surf_cpu_action_set_affinity(surf_action_t action, surf_resource_t cpu, unsigned long mask);
*/
XBT_PUBLIC(void) surf_cpu_action_set_bound(surf_action_t action, double bound);
+/**
+ * @brief [brief description]
+ * @details [long description]
+ *
+ * @param action The surf network action
+ */
+XBT_PUBLIC(double) surf_network_action_get_latency_limited(surf_action_t action);
+
/**
* @brief Get the file associated to a storage action
*
/* Prototypes of the functions that handle the properties */
XBT_PUBLIC_DATA(xbt_dict_t) current_property_set; /* the prop set for the currently parsed element (also used in SIMIX) */
+/* The same for model_prop set*/
+XBT_PUBLIC_DATA(xbt_dict_t) current_model_property_set;
+
/* surf parse file related (public because called from a test suite) */
XBT_PUBLIC(void) parse_platform_file(const char *file);