Add functions action_get_start_time() and action_get_finish_time() to Surf

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 738a096..f6d18b4 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -8,12 +8,12 @@
 #include "network_private.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
                                "Logging specific to the SURF network module");
 
 surf_network_resource_t surf_network_resource = NULL;
 
-static xbt_dict_t network_link_set = NULL;
+xbt_dict_t network_link_set = NULL;
 xbt_dict_t network_card_set = NULL;
 
 int card_number = 0;
@@ -311,7 +311,8 @@ static void update_actions_state(double now, double delta)
        action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) 
-       lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
+       lmm_update_variable_weight(maxmin_system, action->variable, 
+                                  action->lat_current);
     }
     surf_double_update(&(action->generic_action.remains),
        lmm_variable_getvalue(action->variable) * deltap);
@@ -457,6 +458,31 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   return (surf_action_t) action;
 }
 
+/* returns an array of network_link_CM02_t */
+static const void** get_route(void *src, void *dst) {
+  network_card_CM02_t card_src = src;
+  network_card_CM02_t card_dst = dst;
+  return (const void**) ROUTE(card_src->id, card_dst->id);
+}
+
+static int get_route_size(void *src, void *dst) {
+  network_card_CM02_t card_src = src;
+  network_card_CM02_t card_dst = dst;
+  return ROUTE_SIZE(card_src->id, card_dst->id);
+}
+
+static const char *get_link_name(const void *link) {
+  return ((network_link_CM02_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+  return ((network_link_CM02_t) link)->bw_current;
+}
+
+static double get_link_latency(const void *link) {
+  return ((network_link_CM02_t) link)->lat_current;  
+}
+
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_CM02_t) action)->suspended = 1;
@@ -468,7 +494,7 @@ static void action_resume(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,
                             ((surf_action_network_CM02_t) action)->variable, 
-                            action->lat_current);
+                            ((surf_action_network_CM02_t) action)->lat_current);
   ((surf_action_network_CM02_t) action)->suspended = 0;
 }
 
@@ -541,6 +567,10 @@ static void surf_network_resource_init_internal(void)
       get_resource_name;
   surf_network_resource->common_public->action_get_state =
       surf_action_get_state;
+  surf_network_resource->common_public->action_get_start_time =
+      surf_action_get_start_time;
+  surf_network_resource->common_public->action_get_finish_time =
+      surf_action_get_finish_time;
   surf_network_resource->common_public->action_free = action_free;
   surf_network_resource->common_public->action_use = action_use;
   surf_network_resource->common_public->action_cancel = action_cancel;
@@ -564,6 +594,11 @@ static void surf_network_resource_init_internal(void)
   surf_cpu_resource->common_public->set_max_duration = action_set_max_duration;
 
   surf_network_resource->extension_public->communicate = communicate;
+  surf_network_resource->extension_public->get_route = get_route;
+  surf_network_resource->extension_public->get_route_size = get_route_size;
+  surf_network_resource->extension_public->get_link_name = get_link_name;
+  surf_network_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
+  surf_network_resource->extension_public->get_link_latency = get_link_latency;
 
   network_link_set = xbt_dict_new();
   network_card_set = xbt_dict_new();