-/* 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
#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");
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;
+simgrid::surf::StorageModel *surf_storage_model = NULL;
+
+namespace simgrid {
+namespace surf {
/*************
* Callbacks *
*************/
-surf_callback(void, StoragePtr) storageCreatedCallbacks;
-surf_callback(void, StoragePtr) storageDestructedCallbacks;
-surf_callback(void, StoragePtr) storageStateChangedCallbacks;
-surf_callback(void, StorageActionPtr) storageActionStateChangedCallbacks;
+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;
/*********
* Model *
*********/
-StorageModel::StorageModel() : Model("Storage") {
+StorageModel::StorageModel()
+ : Model()
+{
p_storageList = NULL;
}
* Resource *
************/
-Storage::Storage(ModelPtr 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)
+Storage::Storage(Model *model, const char *name, xbt_dict_t props,
+ const char* type_id, const char *content_name, const char *content_type,
+ sg_size_t size)
+ : Resource(model, name)
+ , 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(ActionPtr),NULL))
+ , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL))
{
- surf_callback_emit(storageCreatedCallbacks, this);
p_content = parseContent(content_name);
- setState(SURF_RESOURCE_ON);
+ turnOn();
}
-Storage::Storage(ModelPtr 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)
- : Resource(model, name, props, lmm_constraint_new(maxminSystem, this, bconnection))
- , p_contentType(content_type)
+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, const char *content_name,
+ const char *content_type, sg_size_t size, const char *attach)
+ : Resource(model, name, lmm_constraint_new(maxminSystem, this, bconnection))
+ , 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(ActionPtr),NULL)) {
- surf_callback_emit(storageCreatedCallbacks, this);
+ , p_writeActions(xbt_dynar_new(sizeof(Action*),NULL))
+{
p_content = parseContent(content_name);
- setState(SURF_RESOURCE_ON);
+ p_attach = xbt_strdup(attach);
+ turnOn();
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_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))
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;
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;
return false;
}
-void Storage::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/)
+void Storage::updateState(tmgr_trace_iterator_t /*event_type*/, double /*value*/, double /*date*/)
{
THROW_UNIMPLEMENTED;
}
-void Storage::setState(e_surf_resource_state_t state)
-{
- Resource::setState(state);
- surf_callback_emit(storageStateChangedCallbacks, this);
+void Storage::turnOn() {
+ if (isOff()) {
+ Resource::turnOn();
+ storageStateChangedCallbacks(this, 0, 1);
+ }
+}
+void Storage::turnOff() {
+ if (isOn()) {
+ Resource::turnOff();
+ storageStateChangedCallbacks(this, 1, 0);
+ }
}
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;
return m_size;
}
+sg_size_t Storage::getFreeSize(){
+ return m_size - m_usedSize;
+}
+
+sg_size_t Storage::getUsedSize(){
+ return m_usedSize;
+}
+
/**********
* Action *
**********/
-StorageAction::StorageAction(ModelPtr model, double cost, bool failed,
- StoragePtr storage, e_surf_action_storage_type_t type)
+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), p_lsDict(NULL)
-{
+, m_type(type), p_storage(storage), p_file(NULL){
+ progress = 0;
};
-StorageAction::StorageAction(ModelPtr model, double cost, bool failed, lmm_variable_t var,
- StoragePtr storage, e_surf_action_storage_type_t 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), p_lsDict(NULL) {
+ , 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);
+ storageActionStateChangedCallbacks(this, old, state);
+}
+
+}
}
