A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use homogeneous dicts which are more efficient.
[simgrid.git]
/
src
/
surf
/
storage.c
diff --git
a/src/surf/storage.c
b/src/surf/storage.c
index
14da9ab
..
a34bf83
100644
(file)
--- a/
src/surf/storage.c
+++ b/
src/surf/storage.c
@@
-1,8
+1,8
@@
-/* 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
/* 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 "xbt/ex.h"
#include "xbt/dict.h"
@@
-34,19
+34,19
@@
static xbt_dynar_t storage_list;
#define GENERIC_LMM_ACTION(action) action->generic_lmm_action
#define GENERIC_ACTION(action) GENERIC_LMM_ACTION(action).generic_action
#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, s
g_storage_s
ize_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 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, s
g_storage_s
ize_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;
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;
char* key;
- size_t size = 0;
+ s
g_storage_s
ize_t size = 0;
xbt_dict_cursor_t cursor = NULL;
xbt_dynar_t dyn = NULL;
xbt_dict_cursor_t cursor = NULL;
xbt_dynar_t dyn = NULL;
@@
-86,9
+86,11
@@
static surf_action_t storage_action_open(void *storage, const char* mount,
{
XBT_DEBUG("\tOpen file '%s'",path);
xbt_dict_t content_dict = ((storage_t)storage)->content;
{
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){
// 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);
}
xbt_dict_set(content_dict,path,&size,NULL);
XBT_DEBUG("File '%s' was not found, file created.",path);
}
@@
-115,7
+117,6
@@
static surf_action_t storage_action_close(void *storage, surf_file_t fd)
storage_action_unref((surf_action_t) write_action);
}
}
storage_action_unref((surf_action_t) write_action);
}
}
-
free(fd->name);
free(fd->mount);
xbt_free(fd);
free(fd->name);
free(fd->mount);
xbt_free(fd);
@@
-123,7
+124,7
@@
static surf_action_t storage_action_close(void *storage, surf_file_t fd)
return action;
}
return action;
}
-static surf_action_t storage_action_read(void *storage, size_t size,
+static surf_action_t storage_action_read(void *storage, s
g_storage_s
ize_t size,
surf_file_t fd)
{
if(size > fd->size)
surf_file_t fd)
{
if(size > fd->size)
@@
-132,7
+133,7
@@
static surf_action_t storage_action_read(void *storage, size_t size,
return action;
}
return action;
}
-static surf_action_t storage_action_write(void *storage, s
ize_t size,
+static surf_action_t storage_action_write(void *storage, s
g_storage_size_t size,
surf_file_t fd)
{
char *filename = fd->name;
surf_file_t fd)
{
char *filename = fd->name;
@@
-148,7
+149,7
@@
static surf_action_t storage_action_write(void *storage, size_t size,
return action;
}
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, s
g_storage_s
ize_t size, e_surf_action_storage_type_t type)
{
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
{
surf_action_storage_t action = NULL;
storage_t STORAGE = storage;
@@
-203,12
+204,12
@@
static xbt_dict_t storage_get_content(void *storage)
/*surf_action_t action = storage_action_execute(storage,0, LS);*/
void *st = surf_storage_resource_priv(storage);
/*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
(
);
+ xbt_dict_t content_dict = xbt_dict_new
_homogeneous(NULL
);
xbt_dict_cursor_t cursor = NULL;
char *file;
xbt_dict_cursor_t cursor = NULL;
char *file;
-
size_t
size;
+
char *
size;
xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
- xbt_dict_set(content_dict,file,
&
size,NULL);
+ xbt_dict_set(content_dict,file,
(void*)
size,NULL);
}
return content_dict;
}
}
return content_dict;
}
@@
-282,22
+283,23
@@
static void storage_update_actions_state(double now, double delta)
surf_action_storage_t next_action = NULL;
xbt_swag_t running_actions = surf_storage_model->states.running_action_set;
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)
{
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
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 s
g_storage_s
ize_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
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);
double_update(&(GENERIC_ACTION(action).remains),
lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable) * delta);
@@
-557,7
+559,7
@@
static void storage_parse_storage(sg_platf_storage_cbarg_t storage)
(void *) xbt_strdup(storage->type_id));
}
(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, s
g_storage_s
ize_t *used_size)
{
*used_size = 0;
if ((!filename) || (strcmp(filename, "") == 0))
{
*used_size = 0;
if ((!filename) || (strcmp(filename, "") == 0))
@@
-574,8
+576,7
@@
static xbt_dict_t parse_storage_content(char *filename, size_t *used_size)
size_t len = 0;
ssize_t read;
char path[1024];
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){
while ((read = xbt_getline(&line, &len, file)) != -1) {
if (read){