Finalize properties on AS.

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

diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h
index e714b8d..399bc2a 100644 (file)
--- a/src/surf/surf_private.h
+++ b/src/surf/surf_private.h
@@ -30,6 +30,7 @@ extern double sg_gtnets_jitter;
 extern int sg_gtnets_jitter_seed;
 #endif
 
 extern int sg_gtnets_jitter_seed;
 #endif
 

+extern xbt_dict_t watched_hosts_lib;

 
 extern const char *surf_action_state_names[6];
 
 
 extern const char *surf_action_state_names[6];
 


@@ -62,6 +63,7 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions,
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve) (lmm_system_t));
                                       size_t offset,
                                       lmm_system_t sys,
                                       void (*solve) (lmm_system_t));

+double generic_share_resources_lazy(double now, surf_model_t model);

 
 /* Generic functions common to all models */
 void surf_action_init(void);
 
 /* Generic functions common to all models */
 void surf_action_init(void);


@@ -79,6 +81,21 @@ void surf_action_lmm_heap_insert(xbt_heap_t heap, surf_action_lmm_t action,
     double key, enum heap_action_type hat);
 void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
 
     double key, enum heap_action_type hat);
 void surf_action_lmm_heap_remove(xbt_heap_t heap,surf_action_lmm_t action);
 

+void surf_action_cancel(surf_action_t action);
+int surf_action_unref(surf_action_t action);
+void surf_action_suspend(surf_action_t action);
+void surf_action_resume(surf_action_t action);
+int surf_action_is_suspended(surf_action_t action);
+void surf_action_set_max_duration(surf_action_t action, double duration);
+void surf_action_set_priority(surf_action_t action, double priority);
+#ifdef HAVE_TRACING
+void surf_action_set_category(surf_action_t action,
+                                    const char *category);
+#endif
+double surf_action_get_remains(surf_action_t action);
+void generic_update_action_remaining_lazy( surf_action_lmm_t action, double now);
+void generic_update_actions_state_lazy(double now, double delta, surf_model_t model);
+void generic_update_actions_state_full(double now, double delta, surf_model_t model);

 
 FILE *surf_fopen(const char *name, const char *mode);
 
 
 FILE *surf_fopen(const char *name, const char *mode);
 


@@ -94,7 +111,7 @@ double net_action_get_remains(surf_action_t action);
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 int net_get_link_latency_limited(surf_action_t action);
 #endif
 #ifdef HAVE_LATENCY_BOUND_TRACKING
 int net_get_link_latency_limited(surf_action_t action);
 #endif

-void net_action_set_max_duration(surf_action_t action, double duration);
+

 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other
 /*
  * Returns the initial path. On Windows the initial path is
  * the current directory for the current process in the other


@@ -115,6 +132,7 @@ typedef struct s_routing_edge {
   e_surf_network_element_type_t rc_type;
   int id;
   char *name;
   e_surf_network_element_type_t rc_type;
   int id;
   char *name;

+  xbt_dict_t properties;

 } s_network_element_t;
 
 /*
 } s_network_element_t;
 
 /*


@@ -137,12 +155,6 @@ typedef struct s_model_type {
   void (*end) (AS_t as);
 } s_routing_model_description_t, *routing_model_description_t;
 
   void (*end) (AS_t as);
 } s_routing_model_description_t, *routing_model_description_t;
 

-typedef struct s_route {
-  xbt_dynar_t link_list;
-  sg_routing_edge_t src_gateway;
-  sg_routing_edge_t dst_gateway;
-} s_route_t, *route_t;
-

 /* This enum used in the routing structure helps knowing in which situation we are. */
 typedef enum {
   SURF_ROUTING_NULL = 0,   /**< Undefined type                                   */
 /* This enum used in the routing structure helps knowing in which situation we are. */
 typedef enum {
   SURF_ROUTING_NULL = 0,   /**< Undefined type                                   */


@@ -152,7 +164,7 @@ typedef enum {
 
 typedef struct s_as {
   xbt_dynar_t index_network_elm;
 
 typedef struct s_as {
   xbt_dynar_t index_network_elm;

-  xbt_dict_t bypassRoutes;             /* store bypass routes */
+  xbt_dict_t bypassRoutes;    /* store bypass routes */

   routing_model_description_t model_desc;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;
   routing_model_description_t model_desc;
   e_surf_routing_hierarchy_t hierarchy;
   char *name;


@@ -161,10 +173,10 @@ typedef struct s_as {
   sg_routing_edge_t net_elem;
   xbt_dynar_t link_up_down_list;
 
   sg_routing_edge_t net_elem;
   xbt_dynar_t link_up_down_list;
 

-  void (*get_route_and_latency) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, route_t into, double *latency);
+  void (*get_route_and_latency) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, sg_platf_route_cbarg_t into, double *latency);

 
   xbt_dynar_t(*get_onelink_routes) (AS_t as);
 
   xbt_dynar_t(*get_onelink_routes) (AS_t as);

-  route_t(*get_bypass_route) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, double *lat);
+  sg_platf_route_cbarg_t(*get_bypass_route) (AS_t as, sg_routing_edge_t src, sg_routing_edge_t dst, double *lat);

   void (*finalize) (AS_t as);
 
 
   void (*finalize) (AS_t as);
 
 


@@ -174,12 +186,10 @@ typedef struct s_as {
    * Of course, only the routing model of this AS is informed, not every ones */
   int (*parse_PU) (AS_t as, sg_routing_edge_t elm); /* A host or a router, whatever */
   int (*parse_AS) (AS_t as, sg_routing_edge_t elm);
    * Of course, only the routing model of this AS is informed, not every ones */
   int (*parse_PU) (AS_t as, sg_routing_edge_t elm); /* A host or a router, whatever */
   int (*parse_AS) (AS_t as, sg_routing_edge_t elm);

-  void (*parse_route) (AS_t as, const char *src,
-                     const char *dst, route_t route);
-  void (*parse_ASroute) (AS_t as, const char *src,
-                       const char *dst, route_t route);
-  void (*parse_bypassroute) (AS_t as, const char *src,
-                           const char *dst, route_t e_route);
+  void (*parse_route) (AS_t as, sg_platf_route_cbarg_t route);
+  void (*parse_ASroute) (AS_t as, sg_platf_route_cbarg_t route);
+  void (*parse_bypassroute) (AS_t as, sg_platf_route_cbarg_t e_route);
+

 } s_as_t;
 
 struct s_routing_platf {
 } s_as_t;
 
 struct s_routing_platf {


@@ -193,7 +203,7 @@ XBT_PUBLIC(void) routing_model_create(void *loopback);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) storage_register_callbacks(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);
 XBT_PUBLIC(void) routing_exit(void);
 XBT_PUBLIC(void) storage_register_callbacks(void);
 XBT_PUBLIC(void) routing_register_callbacks(void);

-XBT_PUBLIC(void) generic_free_route(route_t route); // FIXME rename to routing_route_free
+XBT_PUBLIC(void) generic_free_route(sg_platf_route_cbarg_t route); // FIXME rename to routing_route_free

  // FIXME: make previous function private to routing again?
 
 
  // FIXME: make previous function private to routing again?