-/* Copyright (c) 2004 - 2013. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2013. 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. */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/ex.h"
#include "xbt/dict.h"
#include "surf_private.h"
#include "storage_private.h"
#include "surf/surf_resource.h"
+#include <inttypes.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf,
"Logging specific to the SURF storage module");
#define GENERIC_LMM_ACTION(action) action->generic_lmm_action
#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size);
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size);
static int storage_action_unref(surf_action_t action);
static void storage_action_state_set(surf_action_t action, e_surf_action_state_t state);
-static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type);
+static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type);
static surf_action_t storage_action_ls(void *storage, const char* path)
{
surf_action_t action = storage_action_execute(storage,0, LS);
action->ls_dict = NULL;
- xbt_dict_t ls_dict = xbt_dict_new();
+ xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL);
char* key;
- size_t size = 0;
+ sg_storage_size_t size = 0;
xbt_dict_cursor_t cursor = NULL;
xbt_dynar_t dyn = NULL;
{
XBT_DEBUG("\tOpen file '%s'",path);
xbt_dict_t content_dict = ((storage_t)storage)->content;
- size_t size = (size_t) xbt_dict_get_or_null(content_dict,path);
+ sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path);
+
// if file does not exist create an empty file
if(!size){
+ size = 0;
xbt_dict_set(content_dict,path,&size,NULL);
XBT_DEBUG("File '%s' was not found, file created.",path);
}
static surf_action_t storage_action_close(void *storage, surf_file_t fd)
{
char *filename = fd->name;
- XBT_DEBUG("\tClose file '%s' size '%zu'",filename,fd->size);
+ XBT_DEBUG("\tClose file '%s' size '%" PRIu64 "'", filename, fd->size);
// unref write actions from storage
surf_action_storage_t write_action;
unsigned int i;
storage_action_unref((surf_action_t) write_action);
}
}
-
free(fd->name);
free(fd->mount);
xbt_free(fd);
return action;
}
-static surf_action_t storage_action_read(void *storage, size_t size,
+static surf_action_t storage_action_read(void *storage, sg_storage_size_t size,
surf_file_t fd)
{
if(size > fd->size)
return action;
}
-static surf_action_t storage_action_write(void *storage, size_t size,
+static surf_action_t storage_action_write(void *storage, sg_storage_size_t size,
surf_file_t fd)
{
char *filename = fd->name;
- XBT_DEBUG("\tWrite file '%s' size '%zu/%zu'",filename,size,fd->size);
+ XBT_DEBUG("\tWrite file '%s' size '%" PRIu64 "/%" PRIu64 "'",
+ filename, size, fd->size);
surf_action_t action = storage_action_execute(storage,size,WRITE);
action->file = fd;
return action;
}
-static surf_action_t storage_action_execute (void *storage, size_t size, e_surf_action_storage_type_t type)
+static surf_action_t storage_action_execute (void *storage, sg_storage_size_t size, e_surf_action_storage_type_t type)
{
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
- XBT_IN("(%s,%zu", surf_resource_name(STORAGE), size);
+ XBT_IN("(%s,%" PRIu64, surf_resource_name(STORAGE), size);
action =
surf_action_new(sizeof(s_surf_action_storage_t), size, surf_storage_model,
STORAGE->state_current != SURF_RESOURCE_ON);
return surf_resource_properties(surf_storage_resource_priv(storage));
}
+static xbt_dict_t storage_get_content(void *storage)
+{
+ /* 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);*/
+
+ void *st = surf_storage_resource_priv(storage);
+ xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
+ xbt_dict_cursor_t cursor = NULL;
+ char *file;
+ char *size;
+ xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
+ xbt_dict_set(content_dict,file,(void*)size,NULL);
+ }
+ return content_dict;
+}
+
static void* storage_create_resource(const char* id, const char* model,
const char* type_id, const char* content_name, const char* content_type, xbt_dict_t properties){
storage_t storage = NULL;
storage = (storage_t) surf_resource_new(sizeof(s_storage_t),
surf_storage_model, id, properties, NULL);
- storage->generic_resource.name = xbt_strdup(id);
storage->state_current = SURF_RESOURCE_ON;
storage->used_size = 0;
storage->size = 0;
surf_action_storage_t next_action = NULL;
xbt_swag_t running_actions = surf_storage_model->states.running_action_set;
- // Update the disk usage
- // Update the file size
- // For each action of type write
+
xbt_swag_foreach_safe(action, next_action, running_actions) {
if(action->type == WRITE)
{
+ // Update the disk usage
+ // Update the file size
+ // Update the storage content (with file size)
double rate = lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable);
/* Hack to avoid rounding differences between x86 and x86_64
- * (note that the next sizes are of type size_t). */
+ * (note that the next sizes are of type sg_storage_size_t). */
long incr = delta * rate + MAXMIN_PRECISION;
((storage_t)(action->storage))->used_size += incr; // disk usage
((surf_action_t)action)->file->size += incr; // file size
- }
- }
- xbt_swag_foreach_safe(action, next_action, running_actions) {
+ xbt_dict_t content_dict = ((storage_t)(action->storage))->content;
+ xbt_dict_set(content_dict,((surf_action_t)action)->file->name,(void*)(((surf_action_t)action)->file->size),NULL);
+ }
double_update(&(GENERIC_ACTION(action).remains),
lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta);
surf_storage_model->extension.storage.read = storage_action_read;
surf_storage_model->extension.storage.write = storage_action_write;
surf_storage_model->extension.storage.ls = storage_action_ls;
-
surf_storage_model->extension.storage.get_properties = storage_get_properties;
+ surf_storage_model->extension.storage.get_content = storage_get_content;
if (!storage_maxmin_system) {
storage_maxmin_system = lmm_system_new(storage_selective_update);
(void *) xbt_strdup(storage->type_id));
}
-static xbt_dict_t parse_storage_content(char *filename, size_t *used_size)
+static xbt_dict_t parse_storage_content(char *filename, sg_storage_size_t *used_size)
{
*used_size = 0;
if ((!filename) || (strcmp(filename, "") == 0))
size_t len = 0;
ssize_t read;
char path[1024];
- size_t size;
-
+ sg_storage_size_t size;
while ((read = xbt_getline(&line, &len, file)) != -1) {
if (read){
- if(sscanf(line,"%s %zu",path, &size)==2) {
+ if (sscanf(line,"%s %" SCNu64, path, &size) == 2) {
*used_size += size;
xbt_dict_set(parse_content,path,(void*) size,NULL);
} else {
