Fix surf_storage execution

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 0c10a2d..7ec4c48 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -93,6 +93,8 @@ typedef struct surf_action {
 #ifdef HAVE_TRACING
   char *category;               /**< tracing category for categorized resource utilization monitoring */
 #endif
+  void* file;        /**< m_file_t for storage model */
+  size_t read_write;
 } s_surf_action_t;
 
 typedef struct surf_action_lmm {
@@ -333,7 +335,9 @@ static inline void *surf_workstation_resource_by_name(const char *name){
        return xbt_lib_get_or_null(host_lib, name, SURF_WKS_LEVEL);
 }
 static inline void *surf_network_resource_by_name(const char *name){
-       return xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL);
+    network_element_t net_elm = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
+    if(!net_elm) net_elm = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+       return net_elm;
 }
 static inline void *surf_storage_resource_by_name(const char *name){
     return xbt_lib_get_or_null(storage_lib, name, SURF_STORAGE_LEVEL);
@@ -366,7 +370,7 @@ typedef struct s_content {
   char *group;
   char *date;
   char *time;
-  int size;
+  size_t size;
 } s_content_t, *content_t;
 
 /**