#include "xbt/RngStream.h"
#include "simgrid/platf_interface.h"
#include "surf/surf_routing.h"
+#include "surf/surf.h"
#include "src/simix/smx_private.h"
#include "host_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-xbt_dynar_t sg_platf_host_cb_list = NULL; // of sg_platf_host_cb_t
-xbt_dynar_t sg_platf_host_link_cb_list = NULL; // of sg_platf_host_link_cb_t
xbt_dynar_t sg_platf_link_cb_list = NULL; // of sg_platf_link_cb_t
-xbt_dynar_t sg_platf_router_cb_list = NULL; // of sg_platf_router_cb_t
-xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t
xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
-xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t
-xbt_dynar_t sg_platf_AS_begin_cb_list = NULL; //of sg_platf_AS_begin_cb_t
-xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t
xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
-xbt_dynar_t sg_platf_prop_cb_list = NULL; // of sg_platf_prop_cb_t
-xbt_dynar_t sg_platf_route_cb_list = NULL; // of sg_platf_route_cb_t
xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t
xbt_dynar_t sg_platf_bypassRoute_cb_list = NULL; // of sg_platf_bypassRoute_cb_t
xbt_dynar_t sg_platf_bypassASroute_cb_list = NULL; // of sg_platf_bypassASroute_cb_t
void sg_platf_init(void) {
//FIXME : Ugly, but useful...
- if(sg_platf_host_cb_list)
+ if (sg_platf_gpu_cb_list)
return; //Already initialized, so do nothing...
- sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
- sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL);
- sg_platf_router_cb_list = xbt_dynar_new(sizeof(sg_platf_router_cb_t), NULL);
sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
- sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL);
sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
- sg_platf_cabinet_cb_list = xbt_dynar_new(sizeof(sg_platf_cabinet_cb_t), NULL);
sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
- sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL);
- sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_cb_t),NULL);
- sg_platf_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL);
- sg_platf_route_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
}
/** Module management function: frees all internal data structures */
void sg_platf_exit(void) {
- xbt_dynar_free(&sg_platf_host_cb_list);
- xbt_dynar_free(&sg_platf_host_link_cb_list);
- xbt_dynar_free(&sg_platf_router_cb_list);
xbt_dynar_free(&sg_platf_link_cb_list);
xbt_dynar_free(&sg_platf_postparse_cb_list);
- xbt_dynar_free(&sg_platf_peer_cb_list);
xbt_dynar_free(&sg_platf_cluster_cb_list);
- xbt_dynar_free(&sg_platf_cabinet_cb_list);
- xbt_dynar_free(&sg_platf_AS_begin_cb_list);
- xbt_dynar_free(&sg_platf_AS_end_cb_list);
- xbt_dynar_free(&sg_platf_prop_cb_list);
xbt_dynar_free(&sg_platf_trace_cb_list);
xbt_dynar_free(&sg_platf_trace_connect_cb_list);
- xbt_dynar_free(&sg_platf_route_cb_list);
xbt_dynar_free(&sg_platf_ASroute_cb_list);
xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
xbt_dynar_free(&sg_platf_bypassASroute_cb_list);
void sg_platf_new_host(sg_platf_host_cbarg_t host)
{
-
xbt_assert(! sg_host_by_name(host->id),
"Refusing to create a second host named '%s'.", host->id);
host->properties);
surf_host_model->createHost(host->id, net, cpu);
- unsigned int iterator;
- sg_platf_host_cb_t fun;
- xbt_dynar_foreach(sg_platf_host_cb_list, iterator, fun) {
- fun(host);
- }
-}
-void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){
- unsigned int iterator;
- sg_platf_host_link_cb_t fun;
- xbt_dynar_foreach(sg_platf_host_link_cb_list, iterator, fun) {
- fun(h);
- }
+ if (TRACE_is_enabled() && TRACE_needs_platform())
+ sg_instr_new_host(host);
}
/**
XBT_DEBUG("Having set router coordinates for '%s'",router->id);
}
- unsigned int iterator;
- sg_platf_router_cb_t fun;
- xbt_dynar_foreach(sg_platf_router_cb_list, iterator, fun) {
- fun(router);
- }
+ if (TRACE_is_enabled())
+ sg_instr_new_router(router);
}
void sg_platf_new_link(sg_platf_link_cbarg_t link){
}
}
-void sg_platf_new_peer(sg_platf_peer_cbarg_t peer){
- unsigned int iterator;
- sg_platf_peer_cb_t fun;
- xbt_dynar_foreach(sg_platf_peer_cb_list, iterator, fun) {
- fun(peer);
- }
-}
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
unsigned int iterator;
sg_platf_cluster_cb_t fun;
fun(cluster);
}
}
-void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){
- unsigned int iterator;
- sg_platf_cabinet_cb_t fun;
- xbt_dynar_foreach(sg_platf_cabinet_cb_list, iterator, fun) {
- fun(cabinet);
- }
-}
+
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
{
xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
xbt_dynar_push(mount_list, &mnt);
}
-void sg_platf_new_route(sg_platf_route_cbarg_t route) {
- unsigned int iterator;
- sg_platf_route_cb_t fun;
- xbt_dynar_foreach(sg_platf_route_cb_list, iterator, fun) {
- fun(route);
- }
+void sg_platf_new_route(sg_platf_route_cbarg_t route)
+{
+ routing_get_current()->parseRoute(route);
}
+
void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) {
unsigned int iterator;
sg_platf_route_cb_t fun;
fun(bypassASroute);
}
}
-void sg_platf_new_prop(sg_platf_prop_cbarg_t prop) {
- unsigned int iterator;
- sg_platf_prop_cb_t fun;
- xbt_dynar_foreach(sg_platf_prop_cb_list, iterator, fun) {
- fun(prop);
- }
-}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) {
unsigned int iterator;
sg_platf_trace_cb_t fun;
}
}
-void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) {
- unsigned int iterator;
- sg_platf_AS_cb_t fun;
-
- if (!surf_parse_models_setup_already_called && !xbt_dynar_is_empty(sg_platf_AS_begin_cb_list)) {
+void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
+{
+ if (!surf_parse_models_setup_already_called) {
/* Initialize the surf models. That must be done after we got all config, and before we need the models.
* That is, after the last <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
*
* (FIXME: check it out by creating a file beginning with one of these tags)
* but cluster and peer create ASes internally, so putting the code in there is ok.
*
- * We are also guarding against xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't
- * want to initialize the models if we are parsing the file to get the deployment. That could happen if
- * the same file would be used for platf and deploy: it'd contain AS tags even during the deploy parsing.
- * Removing that guard would result of the models to get re-inited when parsing for deploy.
+ * TODO, There used to be a guard protecting here against
+ * xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't want to
+ * initialize the models if we are parsing the file to get the deployment.
+ * That could happen if the same file would be used for platf and deploy:
+ * it'd contain AS tags even during the deploy parsing. Removing that guard
+ * would result of the models to get re-inited when parsing for deploy.
+ * Currently using the same file for platform and deployment is broken
+ * however. This guard will have to ba adapted in order to make this feature
+ * work again.
*/
surf_parse_models_setup_already_called = 1;
surf_config_models_setup();
}
- xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) {
- fun(AS);
- }
+ routing_AS_begin(AS);
+ if (TRACE_is_enabled())
+ sg_instr_AS_begin(AS);
}
-void sg_platf_new_AS_end() {
- unsigned int iterator;
- void_f_void_t fun;
- xbt_dynar_foreach(sg_platf_AS_end_cb_list, iterator, fun) {
- fun();
- }
+void sg_platf_new_AS_end()
+{
+ routing_AS_end();
+ if (TRACE_is_enabled())
+ sg_instr_AS_end();
}
/* ***************************************** */
/* ***************************************** */
-
-void sg_platf_host_add_cb(sg_platf_host_cb_t fct) {
- xbt_dynar_push(sg_platf_host_cb_list, &fct);
-}
-void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t fct) {
- xbt_dynar_push(sg_platf_host_link_cb_list, &fct);
-}
void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
xbt_dynar_push(sg_platf_link_cb_list, &fct);
}
-void sg_platf_router_add_cb(sg_platf_router_cb_t fct) {
- xbt_dynar_push(sg_platf_router_cb_list, &fct);
-}
-void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) {
- xbt_dynar_push(sg_platf_peer_cb_list, &fct);
-}
void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
xbt_dynar_push(sg_platf_cluster_cb_list, &fct);
}
-void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) {
- xbt_dynar_push(sg_platf_cabinet_cb_list, &fct);
-}
void sg_platf_postparse_add_cb(void_f_void_t fct) {
xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
}
-void sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t fct) {
- xbt_dynar_push(sg_platf_AS_begin_cb_list, &fct);
-}
-void sg_platf_AS_end_add_cb(sg_platf_AS_cb_t fct) {
- xbt_dynar_push(sg_platf_AS_end_cb_list, &fct);
-}
-void sg_platf_route_add_cb(sg_platf_route_cb_t fct) {
- xbt_dynar_push(sg_platf_route_cb_list, &fct);
-}
void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_ASroute_cb_list, &fct);
}
void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct);
}
-void sg_platf_prop_add_cb(sg_platf_prop_cb_t fct) {
- xbt_dynar_push(sg_platf_prop_cb_list, &fct);
-}
void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) {
xbt_dynar_push(sg_platf_trace_cb_list, &fct);
}
