xbt_dynar_t sg_platf_trace_cb_list = NULL;
xbt_dynar_t sg_platf_trace_connect_cb_list = NULL;
-xbt_dynar_t sg_platf_storage_cb_list = NULL; // of sg_platf_storage_cb_t
-xbt_dynar_t sg_platf_storage_type_cb_list = NULL; // of sg_platf_storage_cb_t
-xbt_dynar_t sg_platf_mstorage_cb_list = NULL; // of sg_platf_storage_cb_t
-xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t
-
/* ***************************************** */
/* TUTORIAL: New TAG */
sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL);
sg_platf_trace_connect_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_connect_cb_t), NULL);
- sg_platf_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
- sg_platf_storage_type_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
- sg_platf_mstorage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
- sg_platf_mount_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
-
/* ***************************************** */
/* TUTORIAL: New TAG */
xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
xbt_dynar_free(&sg_platf_bypassASroute_cb_list);
- xbt_dynar_free(&sg_platf_storage_cb_list);
- xbt_dynar_free(&sg_platf_storage_type_cb_list);
- xbt_dynar_free(&sg_platf_mstorage_cb_list);
- xbt_dynar_free(&sg_platf_mount_cb_list);
-
/* ***************************************** */
/* TUTORIAL: New TAG */
fun(cabinet);
}
}
-void sg_platf_new_storage(sg_platf_storage_cbarg_t storage){
- unsigned int iterator;
- sg_platf_storage_cb_t fun;
- xbt_dynar_foreach(sg_platf_storage_cb_list, iterator, fun) {
- fun(storage);
+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),
+ "Reading a storage, processing unit \"%s\" already exists", storage->id);
+
+ // Verification of an existing type_id
+#ifndef NDEBUG
+ void* storage_type = xbt_lib_get_or_null(storage_type_lib, storage->type_id,ROUTING_STORAGE_TYPE_LEVEL);
+#endif
+ xbt_assert(storage_type,"Reading a storage, type id \"%s\" does not exists", storage->type_id);
+
+ XBT_DEBUG("ROUTING Create a storage name '%s' with type_id '%s' and content '%s'",
+ storage->id,
+ storage->type_id,
+ storage->content);
+
+ xbt_lib_set(storage_lib,
+ storage->id,
+ ROUTING_STORAGE_LEVEL,
+ (void *) xbt_strdup(storage->type_id));
+
+ void* stype = xbt_lib_get_or_null(storage_type_lib,
+ storage->type_id,
+ ROUTING_STORAGE_TYPE_LEVEL);
+ if(!stype) xbt_die("No storage type '%s'",storage->type_id);
+
+ // if storage content is not specified use the content of storage_type if exist
+ if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){
+ storage->content = ((storage_type_t) stype)->content;
+ storage->content_type = ((storage_type_t) stype)->content_type;
+ XBT_DEBUG("For disk '%s' content is empty, inherit the content (of type %s) from storage type '%s' ",
+ storage->id,((storage_type_t) stype)->content_type,
+ ((storage_type_t) stype)->type_id);
}
+
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' "
+ "\n\t\tmodel '%s' \n\t\tcontent '%s'\n\t\tcontent_type '%s' "
+ "\n\t\tproperties '%p''\n",
+ storage->id,
+ ((storage_type_t) stype)->model,
+ ((storage_type_t) stype)->type_id,
+ storage->content,
+ storage->content_type,
+ storage->properties);
+
+ surf_storage_model->createStorage(storage->id,
+ ((storage_type_t) stype)->type_id,
+ storage->content,
+ storage->content_type,
+ storage->properties,
+ storage->attach);
}
void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
- unsigned int iterator;
- sg_platf_storage_type_cb_t fun;
- xbt_dynar_foreach(sg_platf_storage_type_cb_list, iterator, fun) {
- fun(storage_type);
- }
-}
-void sg_platf_new_mstorage(sg_platf_mstorage_cbarg_t mstorage){
- unsigned int iterator;
- sg_platf_mstorage_cb_t fun;
- xbt_dynar_foreach(sg_platf_mstorage_cb_list, iterator, fun) {
- fun(mstorage);
- }
+
+ xbt_assert(!xbt_lib_get_or_null(storage_type_lib, storage_type->id,ROUTING_STORAGE_TYPE_LEVEL),
+ "Reading a storage type, processing unit \"%s\" already exists", storage_type->id);
+
+ storage_type_t stype = xbt_new0(s_storage_type_t, 1);
+ stype->model = xbt_strdup(storage_type->model);
+ stype->properties = storage_type->properties;
+ stype->content = xbt_strdup(storage_type->content);
+ stype->content_type = xbt_strdup(storage_type->content_type);
+ stype->type_id = xbt_strdup(storage_type->id);
+ stype->size = storage_type->size;
+ stype->model_properties = storage_type->model_properties;
+
+ XBT_DEBUG("ROUTING Create a storage type id '%s' with model '%s', "
+ "content '%s', and content_type '%s'",
+ stype->type_id,
+ stype->model,
+ storage_type->content,
+ storage_type->content_type);
+
+ xbt_lib_set(storage_type_lib,
+ stype->type_id,
+ ROUTING_STORAGE_TYPE_LEVEL,
+ (void *) stype);
+}
+void sg_platf_new_mstorage(sg_platf_mstorage_cbarg_t mstorage)
+{
+ THROW_UNIMPLEMENTED;
+// mount_t mnt = xbt_new0(s_mount_t, 1);
+// mnt->id = xbt_strdup(mstorage->type_id);
+// mnt->name = xbt_strdup(mstorage->name);
+//
+// if(!mount_list){
+// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id);
+// mount_list = xbt_dynar_new(sizeof(char *), NULL);
+// }
+// xbt_dynar_push(mount_list,(void *) mnt);
+// free(mnt->id);
+// free(mnt->name);
+// xbt_free(mnt);
+// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id);
+}
+
+static void mount_free(void *p)
+{
+ mount_t mnt = (mount_t) p;
+ xbt_free(mnt->name);
}
+
void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){
- unsigned int iterator;
- sg_platf_mount_cb_t fun;
- xbt_dynar_foreach(sg_platf_mount_cb_list, iterator, fun) {
- fun(mount);
+ // Verification of an existing storage
+#ifndef NDEBUG
+ void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL);
+#endif
+ xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId);
+
+ XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name);
+
+ s_mount_t mnt;
+ mnt.storage = surf_storage_resource_priv(surf_storage_resource_by_name(mount->storageId));
+ mnt.name = xbt_strdup(mount->name);
+
+ if(!mount_list){
+ XBT_DEBUG("Create a Mount list for %s",A_surfxml_host_id);
+ mount_list = xbt_dynar_new(sizeof(s_mount_t), mount_free);
}
+ 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_DEBUG("Process %s(%s) will be started at time %f", arg->name,
arg->hostname, start_time);
- SIMIX_timer_set(start_time, (void*) SIMIX_process_create_from_wrapper, arg);
+ SIMIX_timer_set(start_time, [](void* arg) {
+ SIMIX_process_create_from_wrapper((smx_process_arg_t) arg);
+ }, arg);
} else { // start_time <= SIMIX_get_clock()
XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], sg_host_get_name(host));
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_storage_add_cb(sg_platf_storage_cb_t fct) {
- xbt_dynar_push(sg_platf_storage_cb_list, &fct);
-}
-void sg_platf_storage_type_add_cb(sg_platf_storage_type_cb_t fct) {
- xbt_dynar_push(sg_platf_storage_type_cb_list, &fct);
-}
-void sg_platf_mstorage_add_cb(sg_platf_mstorage_cb_t fct) {
- xbt_dynar_push(sg_platf_mstorage_cb_list, &fct);
-}
-void sg_platf_mount_add_cb(sg_platf_mount_cb_t fct) {
- xbt_dynar_push(sg_platf_mount_cb_list, &fct);
-}
void sg_platf_route_add_cb(sg_platf_route_cb_t fct) {
xbt_dynar_push(sg_platf_route_cb_list, &fct);
}
