-/* Copyright (c) 2009, 2013. The SimGrid Team.
+/* Copyright (c) 2009, 2012-2013. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
char *content_type;
char *type_id;
xbt_dict_t properties;
- size_t size;
- size_t used_size;
+ sg_storage_size_t size;
} s_storage_type_t, *storage_type_t;
typedef struct s_mount {
typedef struct surf_file {
char *name;
char *mount;
- size_t size;
+ sg_storage_size_t size;
} s_surf_file_t;
+<<<<<<< HEAD
+typedef struct storage {
+ //FIXME:s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to interact with SURF */
+||||||| merged common ancestors
+typedef struct storage {
+ s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to interact with SURF */
+=======
typedef struct surf_storage {
s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to interact with SURF */
+>>>>>>> 045db1657e870c721be490b411868f4181a12ced
e_surf_resource_state_t state_current; /*< STORAGE current state (ON or OFF) */
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_file_t */
+ xbt_dict_t content;
char* content_type;
- size_t size;
- size_t used_size;
+ sg_storage_size_t size;
+ sg_storage_size_t used_size;
char *type_id;
xbt_dynar_t write_actions;
+ xbt_dict_t properties;
} s_storage_t, *storage_t;
typedef enum {
} e_surf_action_storage_type_t;
typedef struct surf_action_storage {
- s_surf_action_lmm_t generic_lmm_action;
+ //FIXME:s_surf_action_lmm_t generic_lmm_action;
e_surf_action_storage_type_t type;
void *storage;
} s_surf_action_storage_t, *surf_action_storage_t;