Make HostL07 behave more like the regular Host

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

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 996c771..4720735 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,6 +6,7 @@
 
 #include "storage_interface.hpp"
 #include "surf_private.h"
+#include "xbt/file.h" /* xbt_getline */
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf,
                                 "Logging specific to the SURF storage module");
@@ -33,7 +34,9 @@ surf_callback(void, StorageAction*, e_surf_action_state_t, e_surf_action_state_t
  * Model *
  *********/
 
-StorageModel::StorageModel() : Model("Storage") {
+StorageModel::StorageModel()
+       : Model()
+{
   p_storageList = NULL;
 }
 
@@ -58,7 +61,6 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t props,
  , p_typeId(xbt_strdup(type_id))
  , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL))
 {
-  surf_callback_emit(storageCreatedCallbacks, this);
   p_content = parseContent(content_name);
   setState(SURF_RESOURCE_ON);
 }
@@ -72,7 +74,6 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t props,
  , m_size(size), m_usedSize(0)
  , p_typeId(xbt_strdup(type_id))
  , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL)) {
-  surf_callback_emit(storageCreatedCallbacks, this);
   p_content = parseContent(content_name);
   p_attach = xbt_strdup(attach);
   setState(SURF_RESOURCE_ON);