summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
472cf0c)
and &size to manage contents
/********************************* File **************************************/
void __MSG_file_get_info(msg_file_t fd){
xbt_dynar_t info = simcall_file_get_info(fd->simdata->smx_file);
/********************************* File **************************************/
void __MSG_file_get_info(msg_file_t fd){
xbt_dynar_t info = simcall_file_get_info(fd->simdata->smx_file);
+ sg_storage_size_t *psize;
+
fd->info->content_type = xbt_dynar_pop_as(info, char *);
fd->info->storage_type = xbt_dynar_pop_as(info, char *);
fd->info->storageId = xbt_dynar_pop_as(info, char *);
fd->info->mount_point = xbt_dynar_pop_as(info, char *);
fd->info->content_type = xbt_dynar_pop_as(info, char *);
fd->info->storage_type = xbt_dynar_pop_as(info, char *);
fd->info->storageId = xbt_dynar_pop_as(info, char *);
fd->info->mount_point = xbt_dynar_pop_as(info, char *);
- fd->info->size = xbt_dynar_pop_as(info, sg_storage_size_t);
-
+ psize = xbt_dynar_pop_as(info, sg_storage_size_t*);
+ fd->info->size = *psize;
+ xbt_free(psize);
xbt_dynar_free_container(&info);
}
xbt_dynar_free_container(&info);
}
{
surf_action_t action = storage_action_execute(storage,0, LS);
action->ls_dict = NULL;
{
surf_action_t action = storage_action_execute(storage,0, LS);
action->ls_dict = NULL;
- xbt_dict_t ls_dict = xbt_dict_new_homogeneous(NULL);
+ xbt_dict_t ls_dict = xbt_dict_new_homogeneous(xbt_free);
char* key;
sg_storage_size_t size = 0;
char* key;
sg_storage_size_t size = 0;
// file
if(xbt_dynar_length(dyn) == 1){
// file
if(xbt_dynar_length(dyn) == 1){
- xbt_dict_set(ls_dict,file,&size,NULL);
+ sg_storage_size_t *psize = xbt_new(sg_storage_size_t,1);
+ *psize=size;
+ xbt_dict_set(ls_dict,file,psize,NULL);
{
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;
- sg_storage_size_t size = (sg_storage_size_t) xbt_dict_get_or_null(content_dict,path);
-
+ sg_storage_size_t size, *psize;
+ psize = (sg_storage_size_t*) xbt_dict_get_or_null(content_dict, path);
+ if (psize)
+ size = *psize;
+ else {
// if file does not exist create an empty file
// if file does not exist create an empty file
- if(!size){
- size = 0;
- xbt_dict_set(content_dict,path,&size,NULL);
+ psize = xbt_new(sg_storage_size_t,1);
+ size = 0;
+ *psize = size;
+ xbt_dict_set(content_dict,path,psize,NULL);
XBT_DEBUG("File '%s' was not found, file created.",path);
}
surf_file_t file = xbt_new0(s_surf_file_t,1);
XBT_DEBUG("File '%s' was not found, file created.",path);
}
surf_file_t file = xbt_new0(s_surf_file_t,1);
xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
xbt_dict_cursor_t cursor = NULL;
char *file;
xbt_dict_t content_dict = xbt_dict_new_homogeneous(NULL);
xbt_dict_cursor_t cursor = NULL;
char *file;
- sg_storage_size_t *size;
- xbt_dict_foreach(((storage_t)st)->content, cursor, file, size){
- xbt_dict_set(content_dict,file,(void*)size,NULL);
+ sg_storage_size_t *psize;
+
+ xbt_dict_foreach(((storage_t)st)->content, cursor, file, psize){
+ xbt_dict_set(content_dict,file,psize,NULL);
((storage_t)(action->storage))->used_size += incr; // disk usage
((surf_action_t)action)->file->size += incr; // file size
((storage_t)(action->storage))->used_size += incr; // disk usage
((surf_action_t)action)->file->size += incr; // file size
+ sg_storage_size_t *psize = xbt_new(sg_storage_size_t,1);
+ *psize = ((surf_action_t)action)->file->size;
+
xbt_dict_t content_dict = ((storage_t)(action->storage))->content;
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);
+ xbt_dict_set(content_dict,((surf_action_t)action)->file->name,psize,NULL);
}
double_update(&(GENERIC_ACTION(action).remains),
}
double_update(&(GENERIC_ACTION(action).remains),
if ((!filename) || (strcmp(filename, "") == 0))
return NULL;
if ((!filename) || (strcmp(filename, "") == 0))
return NULL;
- xbt_dict_t parse_content = xbt_dict_new_homogeneous(NULL);
+ xbt_dict_t parse_content = xbt_dict_new_homogeneous(xbt_free);
FILE *file = NULL;
file = surf_fopen(filename, "r");
FILE *file = NULL;
file = surf_fopen(filename, "r");
if (read){
if (sscanf(line,"%s %" SCNu64, path, &size) == 2) {
*used_size += size;
if (read){
if (sscanf(line,"%s %" SCNu64, path, &size) == 2) {
*used_size += size;
- xbt_dict_set(parse_content,path,(void*) size,NULL);
+ sg_storage_size_t *psize = xbt_new(sg_storage_size_t, 1);
+ *psize = size;
+ xbt_dict_set(parse_content,path,psize,NULL);
} else {
xbt_die("Be sure of passing a good format for content file.\n");
}
} else {
xbt_die("Be sure of passing a good format for content file.\n");
}
static xbt_dynar_t ws_file_get_info(void *workstation, surf_file_t fd)
{
storage_t st = find_storage_on_mount_list(workstation, fd->mount);
static xbt_dynar_t ws_file_get_info(void *workstation, surf_file_t fd)
{
storage_t st = find_storage_on_mount_list(workstation, fd->mount);
+ sg_storage_size_t *psize = xbt_new(sg_storage_size_t, 1);
+ *psize = fd->size;
xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL);
xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL);
- xbt_dynar_push_as(info, void *, (void*)fd->size);
+ xbt_dynar_push_as(info, sg_storage_size_t *, psize);
xbt_dynar_push_as(info, void *, fd->mount);
xbt_dynar_push_as(info, void *, st->generic_resource.name);
xbt_dynar_push_as(info, void *, st->type_id);
xbt_dynar_push_as(info, void *, fd->mount);
xbt_dynar_push_as(info, void *, st->generic_resource.name);
xbt_dynar_push_as(info, void *, st->type_id);