Windows version of rand_r() and drand48()functions.

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

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 379cf32..78e3360 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,7 +10,7 @@
 #include "portable.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
-#include "network_private.h"
+#include "network_common.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                "Logging specific to the SURF workstation module");
@@ -159,7 +159,7 @@ static void update_actions_state(double now, double delta)
 
 static void update_resource_state(void *id,
                                  tmgr_trace_event_t event_type,
-                                 double value)
+                                 double value, double date)
 {
   THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
 }
@@ -305,6 +305,11 @@ static double get_link_latency(const void *link)
   return surf_network_model->extension_public->get_link_latency(link);
 }
 
+static int link_shared(const void *link)
+{
+  return surf_network_model->extension_public->get_link_latency(link);
+}
+
 static void finalize(void)
 {
   xbt_dict_free(&workstation_set);
@@ -408,6 +413,9 @@ static void surf_workstation_model_init_internal(void)
       get_link_bandwidth;
   surf_workstation_model->extension_public->get_link_latency =
       get_link_latency;
+  surf_workstation_model->extension_public->link_shared =
+      link_shared;
+
   workstation_set = xbt_dict_new();
 }
 
@@ -428,9 +436,8 @@ void surf_workstation_model_init_CLM03(const char *filename)
   surf_cpu_model_init_Cas01(filename);
   surf_network_model_init_CM02(filename);
   update_model_description(surf_workstation_model_description,
-                             surf_workstation_model_description_size,
-                             "CLM03",
-                             (surf_model_t) surf_workstation_model);
+                          "CLM03",
+                          (surf_model_t) surf_workstation_model);
   xbt_dynar_push(model_list, &surf_workstation_model);
 }
 
@@ -442,9 +449,8 @@ void surf_workstation_model_init_compound(const char *filename)
   surf_workstation_model_init_internal();
 
   update_model_description(surf_workstation_model_description,
-                             surf_workstation_model_description_size,
-                             "compound",
-                             (surf_model_t) surf_workstation_model);
+                          "compound",
+                          (surf_model_t) surf_workstation_model);
 
   xbt_dynar_push(model_list, &surf_workstation_model);
 }