* under the terms of the license (GNU LGPL) which comes with this package. */
#include "storage_n11.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "surf_private.h"
#include <math.h> /*ceil*/
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
/*************
free(stype);
}
-static inline void surf_storage_resource_free(void *r)
-{
- // specific to storage
- simgrid::surf::Storage *storage = static_cast<simgrid::surf::Storage*>(r);
- // generic resource
- delete storage;
-}
-
static inline void routing_storage_host_free(void *r)
{
xbt_dynar_t dyn = (xbt_dynar_t) r;
xbt_dynar_free(&dyn);
}
+static void check_disk_attachment()
+{
+ xbt_lib_cursor_t cursor;
+ char* key;
+ void** data;
+ xbt_lib_foreach(storage_lib, cursor, key, data) {
+ if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) {
+ simgrid::surf::Storage* storage =
+ static_cast<simgrid::surf::Storage*>(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL));
+ simgrid::kernel::routing::NetPoint* host_elm = sg_netcard_by_name_or_null(storage->attach_);
+ if (!host_elm)
+ surf_parse_error("Unable to attach storage %s: host %s does not exist.", storage->getName(), storage->attach_);
+ }
+ }
+}
+
void storage_register_callbacks()
{
+ simgrid::surf::on_postparse.connect(check_disk_attachment);
+ instr_routing_define_callbacks();
+
ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f);
ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free);
ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free);
- SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, surf_storage_resource_free);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, [](void *self) {
+ delete static_cast<simgrid::surf::Storage*>(self);
+ });
}
/*********
namespace simgrid {
namespace surf {
-#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-Storage *StorageN11Model::createStorage(const char* id, const char* type_id,
- const char* content_name, const char* content_type, xbt_dict_t properties, const char* attach)
+Storage* StorageN11Model::createStorage(const char* id, const char* type_id, const char* content_name,
+ const char* content_type, const char* attach)
{
xbt_assert(!surf_storage_resource_priv(surf_storage_resource_by_name(id)),
double Bconnection = surf_parse_get_bandwidth((char*)xbt_dict_get(storage_type->model_properties, "Bconnection"),
"property Bconnection, storage",type_id);
- Storage *storage = new StorageN11(this, id, properties, maxminSystem_,
- Bread, Bwrite, Bconnection, type_id, (char *)content_name,
- content_type, storage_type->size, (char *) attach);
+ Storage* storage = new StorageN11(this, id, maxminSystem_, Bread, Bwrite, Bconnection, type_id, (char*)content_name,
+ content_type, storage_type->size, (char*)attach);
storageCreatedCallbacks(storage);
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tproperties '%p'\n\t\tBread '%f'\n",
- id, type_id, properties, Bread);
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s'\n\t\tBread '%f'\n", id, type_id, Bread);
p_storageList.push_back(storage);
* Resource *
************/
-StorageN11::StorageN11(StorageModel *model, const char* name,
- xbt_dict_t properties, lmm_system_t maxminSystem, double bread,
- double bwrite, double bconnection, const char* type_id, char *content_name,
- const char *content_type, sg_size_t size, char *attach)
-: Storage(model, name, properties,
- maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach) {
+StorageN11::StorageN11(StorageModel* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite,
+ double bconnection, const char* type_id, char* content_name, const char* content_type,
+ sg_size_t size, char* attach)
+ : Storage(model, name, maxminSystem, bread, bwrite, bconnection, type_id, content_name, content_type, size, attach)
+{
XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
}