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
add content type to storage structure
[simgrid.git]
/
src
/
surf
/
storage_private.h
diff --git
a/src/surf/storage_private.h
b/src/surf/storage_private.h
index
62c40a8
..
8f8aad9
100644
(file)
--- 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_
#ifndef STORAGE_PRIVATE_H_
#define STORAGE_PRIVATE_H_
@@
-11,40
+10,49
@@
typedef struct s_storage_type {
char *model;
char *content;
typedef struct s_storage_type {
char *model;
char *content;
+ char *content_type;
char *type_id;
xbt_dict_t properties;
char *type_id;
xbt_dict_t properties;
- unsigned long size;
+ size_t size;
+ size_t used_size;
} s_storage_type_t, *storage_type_t;
typedef struct s_mount {
} s_storage_type_t, *storage_type_t;
typedef struct s_mount {
- void *
id
;
+ void *
storage
;
char *name;
} s_mount_t, *mount_t;
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 s_file_info {
+ size_t size;
+ char* mount_point;
+ char* storageId;
+ char* content_type;
+} s_file_info_t, *surf_file_info_t;
typedef struct surf_file {
char *name;
typedef struct surf_file {
char *name;
- surf_stat_t content;
- const char* storage;
+ char *mount;
+ size_t size;
+ surf_file_info_t info;
} s_surf_file_t;
} s_surf_file_t;
-typedef struct storage {
- s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to intera
te
with SURF */
+typedef struct s
urf_s
torage {
+ s_surf_resource_t generic_resource; /*< Structure with generic data. Needed at begin to intera
ct
with SURF */
e_surf_resource_state_t state_current; /*< STORAGE current state (ON or OFF) */
e_surf_resource_state_t state_current; /*< STORAGE current state (ON or OFF) */
- lmm_constraint_t constraint; /* Constraint for maximum bandwidth from conne
x
ion */
+ lmm_constraint_t constraint; /* Constraint for maximum bandwidth from conne
ct
ion */
lmm_constraint_t constraint_write; /* Constraint for maximum write bandwidth*/
lmm_constraint_t constraint_read; /* Constraint for maximum write bandwidth*/
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_dict_t content; /* char * -> s_surf_file_t */
+ char* content_type;
+ size_t size;
+ size_t used_size;
+ char *type_id;
+ char *content_type;
+ xbt_dynar_t write_actions;
} s_storage_t, *storage_t;
typedef enum {
} s_storage_t, *storage_t;
typedef enum {
- READ
, WRITE, STAT, OPEN, CLOSE
+ READ
=0, WRITE, STAT, OPEN, CLOSE, LS
} e_surf_action_storage_type_t;
typedef struct surf_action_storage {
} e_surf_action_storage_type_t;
typedef struct surf_action_storage {