Implement a generic resource; use it as ancestor to specific ones

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index bd6cb6c..85cfe2f 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -43,8 +43,8 @@ SG_BEGIN_DECL()
      typedef struct surf_model_description {
        const char *name;
        surf_model_t model;
-       void (*model_init) (const char *filename);
-       void (*create_ws) (void);
+       void (*model_init_preparse) (const char *filename);
+       void (*model_init_postparse) (void);
      } s_surf_model_description_t, *surf_model_description_t;
 
 XBT_PUBLIC(void) update_model_description(s_surf_model_description_t * table,
@@ -118,14 +118,6 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
 /* Generic model object */
 /***************************/
 
-/** \brief Public data available on all models
- *  \ingroup SURF_models
- *
- *  These functions are implemented by all models.
- */
-     typedef struct surf_model_public {
-     } s_surf_model_public_t, *surf_model_public_t;
-
 /** \brief Private data available on all models
  *  \ingroup SURF_models
  */
@@ -176,7 +168,6 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
                                     double max_rate);
        const void **(*get_route) (void *src, void *dst);
        int (*get_route_size) (void *src, void *dst);
-       const char *(*get_link_name) (const void *link);
        double (*get_link_bandwidth) (const void *link);
        double (*get_link_latency) (const void *link);
        int (*link_shared) (const void *link);
@@ -205,7 +196,6 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
                                               double amount, double rate);
        const void **(*get_route) (void *src, void *dst);                                   /**< Return the network link list between two workstations */
        int (*get_route_size) (void *src, void *dst);                                       /**< Return the route size between two workstations */
-       const char *(*get_link_name) (const void *link);                                    /**< Return the name of a network link */
        double (*get_link_bandwidth) (const void *link);                                    /**< Return the current bandwidth of a network link */
        double (*get_link_latency) (const void *link);                                      /**< Return the current latency of a network link */
        int (*link_shared) (const void *link);
@@ -220,7 +210,6 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
      typedef struct surf_model {
        const char *name;/**< Name of this model */
        s_surf_action_state_t states; /**< Any living action on this model */
-       const char *(*get_resource_name) (void *resource_id);/**< Return the name of a resource */
 
        e_surf_action_state_t(*action_get_state) (surf_action_t action);/**< Return the state of an action */
        double (*action_get_start_time) (surf_action_t action);/**< Return the start time of an action */
@@ -255,15 +244,19 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
        } extension;
      } s_surf_model_t;
 
-     void surf_model_init(surf_model_t 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
-     void surf_model_exit(surf_model_t model);
 
      typedef struct surf_resource {
        surf_model_t model;
+       char *name;
      } s_surf_resource_t, *surf_resource_t;
 
+XBT_PUBLIC(const char*) surf_resource_name(const void *resource);
+XBT_PUBLIC(void) surf_resource_free(void* resource);
 /**************************************/
 /* Implementations of model object */
 /**************************************/