Add functions action_get_start_time() and action_get_finish_time() to Surf

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

diff --git a/src/surf/network_dassf.c b/src/surf/network_dassf.c
index 559abbe..8046397 100644 (file)
--- a/src/surf/network_dassf.c
+++ b/src/surf/network_dassf.c
@@ -7,13 +7,10 @@
 
 #include "network_dassf_private.h"
 
-#define SG_TCP_CTE_GAMMA 20000.0
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(network_dassf, surf,
-                               "Logging specific to the SURF network module");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
 
 /* 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; */
 
 static int card_number = 0;
@@ -413,6 +410,31 @@ static surf_action_t communicate(void *src, void *dst, double size, double rate)
   return (surf_action_t) action;
 }
 
+/* returns a NULL-terminated array of network_link_DASSF_t */
+static const void** get_route(void *src, void *dst) {
+  network_card_DASSF_t card_src = src;
+  network_card_DASSF_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_DASSF_t card_src = src;
+  network_card_DASSF_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_DASSF_t) link)->name;
+}
+
+static double get_link_bandwidth(const void *link) {
+  return ((network_link_DASSF_t) link)->bw_current;
+}
+
+static double get_link_latency(const void *link) {
+  return ((network_link_DASSF_t) link)->lat_current;  
+}
+
 static void action_suspend(surf_action_t action)
 {
   ((surf_action_network_DASSF_t) action)->suspended = 1;
@@ -490,6 +512,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_cancel = action_cancel;
   surf_network_resource->common_public->action_recycle = action_recycle;
@@ -511,6 +537,11 @@ static void surf_network_resource_init_internal(void)
   surf_network_resource->common_public->is_suspended = action_is_suspended;
 
   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();