X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/773715423764e9f35aacb24b982b6b43598bd40e..3d845df082d79ab89649c1a8829eea201ae01085:/src/surf/storage_interface.cpp

diff --git a/src/surf/storage_interface.cpp b/src/surf/storage_interface.cpp
index b51503c796..073a6efc91 100644
--- a/src/surf/storage_interface.cpp
+++ b/src/surf/storage_interface.cpp
@@ -1,28 +1,43 @@
+/* Copyright (c) 2013-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
 #include "storage_interface.hpp"
 #include "surf_private.h"
+#include "xbt/file.h" /* xbt_getline */
 
-#define __STDC_FORMAT_MACROS
-
-extern "C" {
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf,
                                 "Logging specific to the SURF storage module");
-}
 
+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;
 xbt_lib_t storage_type_lib;
 int ROUTING_STORAGE_TYPE_LEVEL; //Routing for storage_type level
-
 xbt_dynar_t mount_list = NULL;
-StorageModelPtr surf_storage_model = NULL;
+StorageModel *surf_storage_model = NULL;
+
+/*************
+ * Callbacks *
+ *************/
+
+surf_callback(void, Storage*) storageCreatedCallbacks;
+surf_callback(void, Storage*) storageDestructedCallbacks;
+surf_callback(void, Storage*, e_surf_resource_state_t, e_surf_resource_state_t) storageStateChangedCallbacks;
+surf_callback(void, StorageAction*, e_surf_action_state_t, e_surf_action_state_t) storageActionStateChangedCallbacks;
 
 /*********
  * Model *
  *********/
 
-StorageModel::StorageModel() : Model("Storage") {
+StorageModel::StorageModel()
+	: Model()
+{
+  p_storageList = NULL;
 }
 
 StorageModel::~StorageModel(){
@@ -37,18 +52,45 @@ StorageModel::~StorageModel(){
  * Resource *
  ************/
 
-Storage::Storage(const char* type_id, char *content_name, char *content_type, sg_size_t size)
-:  p_content(parseContent(content_name)), p_contentType(content_type),
-   m_size(size), m_usedSize(0), p_typeId(xbt_strdup(type_id)), p_writeActions(xbt_dynar_new(sizeof(ActionPtr),NULL))
+Storage::Storage(Model *model, const char *name, xbt_dict_t props,
+                 const char* type_id, char *content_name, char *content_type,
+                 sg_size_t size)
+ : Resource(model, name, props)
+ , 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_stateCurrent = SURF_RESOURCE_ON;
+  surf_callback_emit(storageCreatedCallbacks, this);
+  p_content = parseContent(content_name);
+  setState(SURF_RESOURCE_ON);
+}
+
+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, props, 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)) {
+  surf_callback_emit(storageCreatedCallbacks, this);
+  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);
   xbt_dict_free(&p_content);
   xbt_dynar_free(&p_writeActions);
   free(p_typeId);
   free(p_contentType);
+  free(p_attach);
 }
 
 xbt_dict_t Storage::parseContent(char *filename)
@@ -57,12 +99,13 @@ xbt_dict_t Storage::parseContent(char *filename)
   if ((!filename) || (strcmp(filename, "") == 0))
     return NULL;
 
-  xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free);
+  xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free_f);
   FILE *file = NULL;
 
   file = surf_fopen(filename, "r");
-  xbt_assert(file != NULL, "Cannot open file '%s' (path=%s)", filename,
-              xbt_str_join(surf_path, ":"));
+  if (file == NULL)
+    xbt_die("Cannot open file '%s' (path=%s)", filename,
+            xbt_str_join(surf_path, ":"));
 
   char *line = NULL;
   size_t len = 0;
@@ -70,10 +113,9 @@ xbt_dict_t Storage::parseContent(char *filename)
   char path[1024];
   sg_size_t size;
 
-
   while ((read = xbt_getline(&line, &len, file)) != -1) {
     if (read){
-    if(sscanf(line,"%s %llu", path, &size) == 2) {
+      if(sscanf(line,"%s %llu", path, &size) == 2) {
         m_usedSize += size;
         sg_size_t *psize = xbt_new(sg_size_t, 1);
         *psize = size;
@@ -99,10 +141,16 @@ void Storage::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, d
   THROW_UNIMPLEMENTED;
 }
 
+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);
+}
+
 xbt_dict_t Storage::getContent()
 {
   /* For the moment this action has no cost, but in the future we could take in account access latency of the disk */
-  /*surf_action_t action = storage_action_execute(storage,0, LS);*/
 
   xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
   xbt_dict_cursor_t cursor = NULL;
@@ -119,25 +167,33 @@ sg_size_t Storage::getSize(){
   return m_size;
 }
 
-StorageLmm::StorageLmm(lmm_system_t maxminSystem, double bread, double bwrite, double bconnection,
-	     const char* type_id, char *content_name, char *content_type, sg_size_t size)
- :  ResourceLmm(), Storage(type_id, content_name, content_type, size) {
-  XBT_DEBUG("Create resource with Bconnection '%f' Bread '%f' Bwrite '%f' and Size '%llu'", bconnection, bread, bwrite, size);
+sg_size_t Storage::getFreeSize(){
+  return m_size - m_usedSize;
+}
 
-  p_constraint = lmm_constraint_new(maxminSystem, this, bconnection);
-  p_constraintRead  = lmm_constraint_new(maxminSystem, this, bread);
-  p_constraintWrite = lmm_constraint_new(maxminSystem, this, bwrite);
+sg_size_t Storage::getUsedSize(){
+  return m_usedSize;
 }
 
 /**********
  * Action *
  **********/
-StorageAction::StorageAction(StoragePtr storage, e_surf_action_storage_type_t type)
-: m_type(type), p_storage(storage), p_file(NULL), p_lsDict(NULL)
-{
+StorageAction::StorageAction(Model *model, double cost, bool failed,
+                             Storage *storage, e_surf_action_storage_type_t type)
+: Action(model, cost, failed)
+, m_type(type), p_storage(storage), p_file(NULL){
+  progress = 0;
 };
 
-StorageActionLmm::StorageActionLmm(StorageLmmPtr storage, e_surf_action_storage_type_t type)
-  : StorageAction(storage, type) {
+StorageAction::StorageAction(Model *model, double cost, bool failed, lmm_variable_t var,
+                             Storage *storage, e_surf_action_storage_type_t type)
+  : Action(model, cost, failed, var)
+  , m_type(type), p_storage(storage), p_file(NULL){
+  progress = 0;
 }
 
+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);
+}