Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
coverage madness in examples
[simgrid.git] / examples / msg / token_ring / token_bypass.c
index 99002a2..f4eb5dc 100644 (file)
@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "surf/surfxml_parse.h"
 #include "simgrid/msg.h"
-#include "surf/surf_private.h"
 
 int host(int argc, char *argv[]);
 unsigned int task_comp_size = 50000000;
@@ -67,15 +67,17 @@ static int surf_parse_bypass_platform(void)
 
   s_sg_platf_host_cbarg_t bob = SG_PLATF_HOST_INITIALIZER;
   bob.id = "bob";
-  bob.power_peak = xbt_dynar_new(sizeof(double), NULL);
-  xbt_dynar_push_as(bob.power_peak, double, 98095000.0);
+  bob.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+  xbt_dynar_push_as(bob.speed_peak, double, 98095000.0);
   sg_platf_new_host(&bob);
+  xbt_dynar_free(&bob.speed_peak);
 
   s_sg_platf_host_cbarg_t alice = SG_PLATF_HOST_INITIALIZER;
   alice.id = "alice";
-  alice.power_peak = xbt_dynar_new(sizeof(double), NULL);
-  xbt_dynar_push_as(alice.power_peak, double, 98095000.0);
+  alice.speed_peak = xbt_dynar_new(sizeof(double), NULL);
+  xbt_dynar_push_as(alice.speed_peak, double, 98095000.0);
   sg_platf_new_host(&alice);
+  xbt_dynar_free(&alice.speed_peak);
 
   s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
   link.id = "link1";
@@ -92,7 +94,6 @@ static int surf_parse_bypass_platform(void)
 
   sg_platf_new_AS_end();
   sg_platf_end();
-  sg_platf_exit();
   return 0;
 }
 
@@ -122,9 +123,5 @@ int main(int argc, char **argv)
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-
+  return res != MSG_OK;
 }