#endif
XBT_PUBLIC void surf_network_model_init_NS3();
-/** @ingroup SURF_models
- * @brief Initializes the platform with the network model Reno
- *
- * The problem is related to max( sum( arctan(C * Df * xi) ) ).
- *
- * Reference:
- * [LOW03] S. H. Low. A duality model of TCP and queue management algorithms.
- * IEEE/ACM Transaction on Networking, 11(4):525-536, 2003.
- *
- * Call this function only if you plan using surf_host_model_init_compound.
- */
-XBT_PUBLIC void surf_network_model_init_Reno();
-
-/** @ingroup SURF_models
- * @brief Initializes the platform with the network model Reno2
- *
- * The problem is related to max( sum( arctan(C * Df * xi) ) ).
- *
- * Reference:
- * [LOW01] S. H. Low. A duality model of TCP and queue management algorithms.
- * IEEE/ACM Transaction on Networking, 11(4):525-536, 2003.
- *
- * Call this function only if you plan using surf_host_model_init_compound.
- */
-XBT_PUBLIC void surf_network_model_init_Reno2();
-
-/** @ingroup SURF_models
- * @brief Initializes the platform with the network model Vegas
- *
- * This problem is related to max( sum( a * Df * ln(xi) ) ) which is equivalent to the proportional fairness.
- *
- * Reference:
- * [LOW03] S. H. Low. A duality model of TCP and queue management algorithms.
- * IEEE/ACM Transaction on Networking, 11(4):525-536, 2003.
- *
- * Call this function only if you plan using surf_host_model_init_compound.
- */
-XBT_PUBLIC void surf_network_model_init_Vegas();
-
/** @ingroup SURF_models
* @brief Initializes the platform with the current best network and cpu models at hand
*
*/
XBT_PUBLIC void surf_storage_model_init_default();
+XBT_PUBLIC void surf_disk_model_init_default();
+
/* --------------------
* Model Descriptions
* -------------------- */
XBT_PUBLIC void model_help(const char* category, const std::vector<surf_model_description_t>& table);
#define SIMGRID_REGISTER_PLUGIN(id, desc, init) \
- static void XBT_ATTRIB_CONSTRUCTOR(800) simgrid_##id##_plugin_register() \
+ static void XBT_ATTRIB_CONSTRUCTOR(800) _XBT_CONCAT3(simgrid_, id, _plugin_register)() \
{ \
- simgrid_add_plugin_description(#id, desc, init); \
+ simgrid_add_plugin_description(_XBT_STRINGIFY(id), (desc), (init)); \
}
XBT_PUBLIC void simgrid_add_plugin_description(const char* name, const char* description, void_f_void_t init_fun);
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_cpu_model_description;
/** @brief The list of all network models (pick one with --cfg=network/model) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_network_model_description;
+/** @brief The list of all disk models (pick one with --cfg=disk/model) */
+XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_disk_model_description;
/** @brief The list of all storage models (pick one with --cfg=storage/model) */
XBT_PUBLIC_DATA const std::vector<surf_model_description_t> surf_storage_model_description;
/** @brief The list of all host models (pick one with --cfg=host/model:) */