xbt_lib_t file_lib;
xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL; //Routing for storagelevel
-int ROUTING_STORAGE_HOST_LEVEL;
-int SURF_STORAGE_LEVEL;
+int ROUTING_STORAGE_LEVEL = -1; //Routing for storagelevel
+int ROUTING_STORAGE_HOST_LEVEL = -1;
+int SURF_STORAGE_LEVEL = -1;
xbt_lib_t storage_type_lib;
-int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level
+int ROUTING_STORAGE_TYPE_LEVEL = -1; //Routing for storage_type level
simgrid::surf::StorageModel *surf_storage_model = NULL;
namespace simgrid {
* Callbacks *
*************/
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*)> storageDestructedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
-simgrid::xbt::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)> storageActionStateChangedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageCreatedCallbacks;
+simgrid::xbt::signal<void(Storage*)> storageDestructedCallbacks;
+simgrid::xbt::signal<void(Storage*, int, int)> storageStateChangedCallbacks; // signature: wasOn, isOn
+simgrid::xbt::signal<void(StorageAction*, Action::State, Action::State)> storageActionStateChangedCallbacks;
/*********
* Model *
StorageModel::~StorageModel(){
lmm_system_free(maxminSystem_);
-
surf_storage_model = NULL;
-
xbt_dynar_free(&p_storageList);
}
progress = 0;
}
-void StorageAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t old = getState();
+void StorageAction::setState(Action::State state){
+ Action::State old = getState();
Action::setState(state);
storageActionStateChangedCallbacks(this, old, state);
}