[surf] Remove one router callback

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 6677aaa..6772e4f 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -38,10 +38,6 @@ xbt_dynar_t sg_platf_bypassASroute_cb_list = NULL; // of sg_platf_bypassASroute_
 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_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                         */
 
@@ -81,10 +77,6 @@ void sg_platf_init(void) {
   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_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                         */
 
@@ -113,10 +105,6 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
   xbt_dynar_free(&sg_platf_bypassASroute_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                         */
 
@@ -164,13 +152,7 @@ void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){
     fun(h);
   }
 }
-void sg_platf_new_router(sg_platf_router_cbarg_t router) {
-  unsigned int iterator;
-  sg_platf_router_cb_t fun;
-  xbt_dynar_foreach(sg_platf_router_cb_list, iterator, fun) {
-    fun(router);
-  }
-}
+
 void sg_platf_new_link(sg_platf_link_cbarg_t link){
   unsigned int iterator;
   sg_platf_link_cb_t fun;
@@ -253,26 +235,75 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
                                      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;
@@ -515,15 +546,6 @@ void sg_platf_AS_begin_add_cb(sg_platf_AS_cb_t 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_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);
 }