Making a surf workstation model using csdp. How simple isn't it ? :)

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

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 43ba290..2669c58 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -252,10 +252,10 @@ static void update_actions_state(double now, double delta)
     deltap = delta;
     if (action->latency > 0) {
       if (action->latency > deltap) {
-       surf_double_update(&(action->latency), deltap);
+       double_update(&(action->latency), deltap);
        deltap = 0.0;
       } else {
-       surf_double_update(&(deltap), action->latency);
+       double_update(&(deltap), action->latency);
        action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) {
@@ -266,10 +266,10 @@ static void update_actions_state(double now, double delta)
                                     action->lat_current);
       }
     }
-    surf_double_update(&(action->generic_action.remains),
+    double_update(&(action->generic_action.remains),
                       lmm_variable_getvalue(action->variable) * deltap);
     if (action->generic_action.max_duration != NO_MAX_DURATION)
-      surf_double_update(&(action->generic_action.max_duration), delta);
+      double_update(&(action->generic_action.max_duration), delta);
 
     /*   if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
 
@@ -949,7 +949,7 @@ static void parse_file(const char *file)
     if(!ROUTE(i,i).size) {
       if(!loopback)
        loopback = network_link_new(xbt_strdup("__MSG_loopback__"), 
-                                  498.00, NULL, 0.000015, NULL, 
+                                  498000000, NULL, 0.000015, NULL, 
                                   SURF_NETWORK_LINK_ON, NULL,
                                   SURF_NETWORK_LINK_FATPIPE);
       ROUTE(i,i).size=1;
@@ -1042,3 +1042,15 @@ void surf_workstation_resource_init_KCCFLN05(const char *filename)
 
   xbt_dynar_push(resource_list, &surf_workstation_resource);
 }
+
+void surf_workstation_resource_init_KCCFLN05_proportionnal(const char *filename)
+{
+  xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
+  xbt_assert0(!surf_network_resource, "network resource type already defined");
+  resource_init_internal();
+  parse_file(filename);
+
+  surf_workstation_resource->common_public->name = "Workstation KCCFLN05 (proportionnal)";
+  use_sdp_solver=1;
+  xbt_dynar_push(resource_list, &surf_workstation_resource);
+}