Remove old function surf_model_resource_by_name.

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index af144b6..2eac72d 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -14,6 +14,24 @@
 #include "portable.h"
 #include "xbt/config.h"
 #include "surf/datatypes.h"
+#include "xbt/lib.h"
+
+xbt_lib_t host_lib;
+int ROUTING_HOST_LEVEL; //Routing level
+int    SURF_CPU_LEVEL;         //Surf cpu level
+int SURF_WKS_LEVEL;            //Surf workstation level
+int SIMIX_HOST_LEVEL;  //Simix level
+int    MSG_HOST_LEVEL;         //Msg level
+int    SD_HOST_LEVEL;          //Simdag level
+int    COORD_HOST_LEVEL;       //Coordinates level
+
+xbt_lib_t link_lib;
+int SD_LINK_LEVEL;             //Simdag level
+int SURF_LINK_LEVEL;   //Surf level
+
+xbt_lib_t as_router_lib;
+int ROUTING_ASR_LEVEL; //Routing level
+int COORD_ASR_LEVEL;   //Coordinates level
 
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
@@ -279,12 +297,8 @@ typedef struct surf_model {
   int (*get_latency_limited) (surf_action_t action);     /**< Return 1 if action is limited by latency, 0 otherwise */
 #endif
 
-  xbt_dict_t resource_set;
-
-
   surf_model_private_t model_private;
 
-
   union extension {
     s_surf_model_extension_cpu_t cpu;
     s_surf_model_extension_network_t network;
@@ -295,8 +309,15 @@ typedef struct surf_model {
 surf_model_t surf_model_init(void);
 void surf_model_exit(surf_model_t model);
 
-void *surf_model_resource_by_name(surf_model_t model, const char *name);
-#define surf_model_resource_set(model) (model)->resource_set
+static inline void *surf_cpu_resource_by_name(const char *name) {
+       return xbt_lib_get_or_null(host_lib, name, SURF_CPU_LEVEL);
+}
+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);
+}
 
 typedef struct surf_resource {
   surf_model_t model;