X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1632f396f414f85f50611cad05e13c47ad06387e..d83cf3b035bac2ce84d94c5b2dcc0b8bf2f38574:/src/surf/storage_private.h diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h index 5900e8fb3d..bc02af1545 100644 --- a/src/surf/storage_private.h +++ b/src/surf/storage_private.h @@ -1,9 +1,8 @@ -/* - * storage_private.h - * - * Created on: 2 mars 2012 - * Author: navarro - */ +/* Copyright (c) 2009, 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. */ #ifndef STORAGE_PRIVATE_H_ #define STORAGE_PRIVATE_H_ @@ -21,21 +20,16 @@ typedef struct s_mount { char *name; } s_mount_t, *mount_t; -typedef struct surf_stat { /* file status structure */ - s_file_stat_t stat; - /* possible additionnal fields (e.g., popularity, last access time to know whether the file is in cache, ...) */ -} s_surf_stat_t; - typedef struct surf_file { char *name; - surf_stat_t content; const char* storage; + double size; } s_surf_file_t; typedef struct storage { - s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to interate with SURF */ + s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to interact with SURF */ e_surf_resource_state_t state_current; /*< STORAGE current state (ON or OFF) */ - lmm_constraint_t constraint; /* Constraint for maximum bandwidth from connexion */ + lmm_constraint_t constraint; /* Constraint for maximum bandwidth from connection */ lmm_constraint_t constraint_write; /* Constraint for maximum write bandwidth*/ lmm_constraint_t constraint_read; /* Constraint for maximum write bandwidth*/ xbt_dict_t content; /* char * -> s_surf_stat_t */ @@ -45,7 +39,7 @@ typedef struct storage { } s_storage_t, *storage_t; typedef enum { - READ=0, WRITE, STAT, OPEN, CLOSE, UNLINK + READ=0, WRITE, STAT, OPEN, CLOSE, UNLINK, LS } e_surf_action_storage_type_t; typedef struct surf_action_storage {