Extract the routing logic into its own object.

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 85cfe2f..1cb37e5 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -28,7 +28,10 @@ SG_BEGIN_DECL()
  *
  * \see e_surf_action_state_t
  */
-     typedef struct surf_action *surf_action_t;
+typedef struct surf_action *surf_action_t;
+/** @Brief Specify that we use that action */
+XBT_PUBLIC(void) surf_action_ref(surf_action_t action);
+
 
 /** \brief Model datatype
  *  \ingroup SURF_models
@@ -117,6 +120,8 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
 /***************************/
 /* Generic model object */
 /***************************/
+     typedef struct s_routing s_routing_t, *routing_t;
+     XBT_PUBLIC_DATA(routing_t) used_routing;
 
 /** \brief Private data available on all models
  *  \ingroup SURF_models
@@ -164,10 +169,9 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
       *  Public functions specific to the network model
       */
      typedef struct surf_network_model_extension_public {
-       surf_action_t(*communicate) (void *src, void *dst, double size,
-                                    double max_rate);
-       const void **(*get_route) (void *src, void *dst);
-       int (*get_route_size) (void *src, void *dst);
+       surf_action_t(*communicate) (const char *src_name,const char *dst_name,int src, int dst, double size,
+           double rate);
+       xbt_dynar_t (*get_route) (int src, int dst);
        double (*get_link_bandwidth) (const void *link);
        double (*get_link_latency) (const void *link);
        int (*link_shared) (const void *link);
@@ -188,14 +192,13 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
        surf_action_t(*communicate) (void *workstation_src,                                 /**< Execute a communication amount between two workstations */
                                     void *workstation_dst, double size,
                                     double max_rate);
+       xbt_dynar_t(*get_route)(void *workstation_src,void *workstation_dst);               /**< Get the list of links between two ws */
 
        surf_action_t(*execute_parallel_task) (int workstation_nb,                          /**< Execute a parallel task on several workstations */
                                               void **workstation_list,
                                               double *computation_amount,
                                               double *communication_amount,
                                               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 */
        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);
@@ -211,22 +214,22 @@ XBT_PUBLIC(int) find_model_description(s_surf_model_description_t * table,
        const char *name;/**< Name of this model */
        s_surf_action_state_t states; /**< Any living action on this model */
 
-       e_surf_action_state_t(*action_get_state) (surf_action_t action);/**< Return the state of an action */
+       e_surf_action_state_t(*action_state_get) (surf_action_t action);/**< Return the state of an action */
+       void (*action_state_set) (surf_action_t action,
+                                    e_surf_action_state_t state); /**< Change an action state*/
+
        double (*action_get_start_time) (surf_action_t action);/**< Return the start time of an action */
        double (*action_get_finish_time) (surf_action_t action);/**< Return the finish time of an action */
-       void (*action_use) (surf_action_t action);/**< Set an action used */
-       int (*action_free) (surf_action_t action);/**< Free an action */
+       int (*action_unref) (surf_action_t action);/**< Specify that we don't use that action anymore */
        void (*action_cancel) (surf_action_t action);/**< Cancel a running action */
        void (*action_recycle) (surf_action_t action);/**< Recycle an action */
-       void (*action_change_state) (surf_action_t action,
-                                    e_surf_action_state_t state);
-                                                                 /**< Change an action state*/
-       void (*action_set_data) (surf_action_t action, void *data);/**< Set the user data of an action */
+       void (*action_data_set) (surf_action_t action, void *data);/**< Set the user data of an action */
        void (*suspend) (surf_action_t action);/**< Suspend an action */
        void (*resume) (surf_action_t action);/**< Resume a suspended action */
        int (*is_suspended) (surf_action_t action);/**< Return whether an action is suspended */
        void (*set_max_duration) (surf_action_t action, double duration);/**< Set the max duration of an action*/
        void (*set_priority) (surf_action_t action, double priority);/**< Set the priority of an action */
+
        xbt_dict_t(*get_properties) (void *resource_id);/**< Return the properties dictionary */
        xbt_dict_t resource_set;
 
@@ -610,7 +613,7 @@ XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_bandwidth;
 XBT_PUBLIC_DATA(xbt_dict_t) trace_connect_list_latency;
 
 
-XBT_PUBLIC_DATA(double) get_cpu_power(const char *power);
+XBT_PUBLIC(double) get_cpu_power(const char *power);
 
 
 SG_END_DECL()