Merge branch 'master' into hypervisor

[simgrid.git] / src / surf / storage_private.h

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index d55fc6c..3079245 100644 (file)
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -1,20 +1,18 @@
-/*
- * 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_
 
 typedef struct s_storage_type {
   char *model;
-  xbt_dict_t content; /* char * -> s_surf_stat_t */
+  char *content;
   char *type_id;
   xbt_dict_t properties;
   unsigned long size;
-  unsigned long used_size;
 } s_storage_type_t, *storage_type_t;
 
 typedef struct s_mount {
@@ -39,15 +37,20 @@ typedef struct storage {
   lmm_constraint_t constraint;          /* Constraint for maximum bandwidth from connexion */
   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 */
+  unsigned long size;
+  unsigned long used_size;
+  xbt_dynar_t write_actions;
 } s_storage_t, *storage_t;
 
 typedef enum {
-  READ, WRITE, STAT, OPEN, CLOSE
+  READ=0, WRITE, STAT, OPEN, CLOSE, UNLINK, LS
 } e_surf_action_storage_type_t;
 
 typedef struct surf_action_storage {
   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;
 
 #endif /* STORAGE_PRIVATE_H_ */