cosmetics in Storage

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

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index 8b64c56..4023e02 100644 (file)
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -28,10 +28,10 @@ namespace surf {
  * Callbacks *
  *************/
 
-surf_callback(void, simgrid::surf::Storage*) storageCreatedCallbacks;
-surf_callback(void, simgrid::surf::Storage*) storageDestructedCallbacks;
-surf_callback(void, simgrid::surf::Storage*, e_surf_resource_state_t, e_surf_resource_state_t) storageStateChangedCallbacks;
-surf_callback(void, simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t) storageActionStateChangedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Storage*)> storageCreatedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Storage*)> storageDestructedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Storage*, e_surf_resource_state_t, e_surf_resource_state_t)> storageStateChangedCallbacks;
+simgrid::surf::signal<void(simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)> storageActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -56,14 +56,14 @@ StorageModel::~StorageModel(){
  ************/
 
 Storage::Storage(Model *model, const char *name, xbt_dict_t props,
-                 const char* type_id, char *content_name, char *content_type,
+                 const char* type_id, const char *content_name, const char *content_type,
                  sg_size_t size)
  : Resource(model, name)
- , p_contentType(content_type)
+ , PropertyHolder(props)
+ , p_contentType(xbt_strdup(content_type))
  , m_size(size), m_usedSize(0)
  , p_typeId(xbt_strdup(type_id))
  , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL))
- , p_properties(props)
 {
   p_content = parseContent(content_name);
   setState(SURF_RESOURCE_ON);
@@ -71,34 +71,26 @@ Storage::Storage(Model *model, const char *name, xbt_dict_t props,
 
 Storage::Storage(Model *model, const char *name, xbt_dict_t props,
                  lmm_system_t maxminSystem, double bread, double bwrite,
-                 double bconnection, const char* type_id, char *content_name,
-                 char *content_type, sg_size_t size, char *attach)
- :  Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
- , p_contentType(content_type)
- , m_size(size), m_usedSize(0)
- , p_typeId(xbt_strdup(type_id))
- , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL))
- , p_properties(props)
+                 double bconnection, const char* type_id, const char *content_name,
+                 const char *content_type, sg_size_t size, const char *attach)
+ : Storage(model, name, props, type_id, content_name, content_type, size)
 {
-  p_content = parseContent(content_name);
   p_attach = xbt_strdup(attach);
-  setState(SURF_RESOURCE_ON);
   XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
   p_constraintRead  = lmm_constraint_new(maxminSystem, this, bread);
   p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite);
 }
 
 Storage::~Storage(){
-  surf_callback_emit(storageDestructedCallbacks, this);
+  storageDestructedCallbacks(this);
   xbt_dict_free(&p_content);
-  xbt_dict_free(&p_properties);
   xbt_dynar_free(&p_writeActions);
   free(p_typeId);
   free(p_contentType);
   free(p_attach);
 }
 
-xbt_dict_t Storage::parseContent(char *filename)
+xbt_dict_t Storage::parseContent(const char *filename)
 {
   m_usedSize = 0;
   if ((!filename) || (strcmp(filename, "") == 0))
@@ -150,7 +142,7 @@ void Storage::setState(e_surf_resource_state_t state)
 {
   e_surf_resource_state_t old = Resource::getState();
   Resource::setState(state);
-  surf_callback_emit(storageStateChangedCallbacks, this, old, state);
+  storageStateChangedCallbacks(this, old, state);
 }
 
 xbt_dict_t Storage::getContent()
@@ -180,13 +172,6 @@ sg_size_t Storage::getUsedSize(){
   return m_usedSize;
 }
 
-xbt_dict_t Storage::getProperties()
-{
-       if (p_properties==NULL)
-               p_properties = xbt_dict_new();
-       return p_properties;
-}
-
 /**********
  * Action *
  **********/
@@ -207,7 +192,7 @@ StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variabl
 void StorageAction::setState(e_surf_action_state_t state){
   e_surf_action_state_t old = getState();
   Action::setState(state);
-  surf_callback_emit(storageActionStateChangedCallbacks, this, old, state);
+  storageActionStateChangedCallbacks(this, old, state);
 }
 
 }