Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Starting the network module.
[simgrid.git] / testsuite / surf / surf_usage.c
index 72fd635..c3cb03b 100644 (file)
@@ -40,7 +40,8 @@ void test(void)
   xbt_maxmin_float_t now = -1.0;
 
   surf_init(); /* Initialize some common structures */
-  surf_cpu_resource_init(NULL); /* Now it is possible to use CPUs */
+  surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */
+  surf_network_resource_init("platform.txt"); /* Now it is possible to use CPUs */
 
   printf("%p \n", surf_cpu_resource);
   cpuA = surf_cpu_resource->common_public->name_service("Cpu A");
@@ -69,13 +70,17 @@ void test(void)
     printf("Next Event : " XBT_HEAP_FLOAT_T "\n", now);
     while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.failed_action_set)) {
       printf("\tFailed : %p\n", action);
+      action->resource_type->common_public->action_free(action);
     }
     while(action=xbt_swag_extract(surf_cpu_resource->common_public->states.done_action_set)) {
       printf("\tDone : %p\n", action);
+      action->resource_type->common_public->action_free(action);
     }
   } while(surf_solve());
 
   printf("Simulation Terminated\n");
+
+  surf_finalize();
 }