X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aec1cecb47f0df15035f7d328bebf1386caf6de1..ef58c032e4bc0fa60f5297e4478aa19d4655ea4b:/testsuite/surf/surf_usage.c diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c index 3a104fb0ee..acb911930d 100644 --- a/testsuite/surf/surf_usage.c +++ b/testsuite/surf/surf_usage.c @@ -6,6 +6,10 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif #include #include "surf/surf.h" @@ -32,7 +36,6 @@ const char *string_action(e_surf_action_state_t state) } } - void test(char *platform); void test(char *platform) { @@ -49,29 +52,29 @@ void test(char *platform) e_surf_action_state_t stateActionC; double now = -1.0; - surf_cpu_resource_init_Cas01(platform); /* Now it is possible to use CPUs */ - surf_network_resource_init_CM02(platform); /* Now it is possible to use eth0 */ + surf_cpu_model_init_Cas01(platform); /* Now it is possible to use CPUs */ + surf_network_model_init_CM02(platform); /* Now it is possible to use eth0 */ /*********************** CPU ***********************************/ - DEBUG1("%p \n", surf_cpu_resource); - cpuA = surf_cpu_resource->common_public->name_service("Cpu A"); - cpuB = surf_cpu_resource->common_public->name_service("Cpu B"); + DEBUG1("%p \n", surf_cpu_model); + cpuA = surf_cpu_model->common_public->name_service("Cpu A"); + cpuB = surf_cpu_model->common_public->name_service("Cpu B"); /* Let's check that those two processors exist */ DEBUG2("%s : %p\n", - surf_cpu_resource->common_public->get_resource_name(cpuA), cpuA); + surf_cpu_model->common_public->get_resource_name(cpuA), cpuA); DEBUG2("%s : %p\n", - surf_cpu_resource->common_public->get_resource_name(cpuB), cpuB); + surf_cpu_model->common_public->get_resource_name(cpuB), cpuB); /* Let's do something on it */ - actionA = surf_cpu_resource->extension_public->execute(cpuA, 1000.0); - actionB = surf_cpu_resource->extension_public->execute(cpuB, 1000.0); - actionC = surf_cpu_resource->extension_public->sleep(cpuB, 7.32); + actionA = surf_cpu_model->extension_public->execute(cpuA, 1000.0); + actionB = surf_cpu_model->extension_public->execute(cpuB, 1000.0); + actionC = surf_cpu_model->extension_public->sleep(cpuB, 7.32); /* Use whatever calling style you want... */ - stateActionA = surf_cpu_resource->common_public->action_get_state(actionA); /* When you know actionA resource type */ - stateActionB = actionB->resource_type->common_public->action_get_state(actionB); /* If you're unsure about it's resource type */ - stateActionC = surf_cpu_resource->common_public->action_get_state(actionC); /* When you know actionA resource type */ + stateActionA = surf_cpu_model->common_public->action_get_state(actionA); /* When you know actionA model type */ + stateActionB = actionB->model_type->common_public->action_get_state(actionB); /* If you're unsure about it's model type */ + stateActionC = surf_cpu_model->common_public->action_get_state(actionC); /* When you know actionA model type */ /* And just look at the state of these tasks */ DEBUG2("actionA : %p (%s)\n", actionA, string_action(stateActionA)); @@ -79,21 +82,21 @@ void test(char *platform) DEBUG2("actionC : %p (%s)\n", actionB, string_action(stateActionC)); /*********************** Network *******************************/ - DEBUG1("%p \n", surf_network_resource); - cardA = surf_network_resource->common_public->name_service("Cpu A"); - cardB = surf_network_resource->common_public->name_service("Cpu B"); + DEBUG1("%p \n", surf_network_model); + cardA = surf_network_model->common_public->name_service("Cpu A"); + cardB = surf_network_model->common_public->name_service("Cpu B"); /* Let's check that those two processors exist */ DEBUG2("%s : %p\n", - surf_network_resource->common_public->get_resource_name(cardA), + surf_network_model->common_public->get_resource_name(cardA), cardA); DEBUG2("%s : %p\n", - surf_network_resource->common_public->get_resource_name(cardB), + surf_network_model->common_public->get_resource_name(cardB), cardB); /* Let's do something on it */ commAB = - surf_network_resource->extension_public->communicate(cardA, cardB, + surf_network_model->extension_public->communicate(cardA, cardB, 150.0,-1.0); surf_solve(); /* Takes traces into account. Returns 0.0 */ @@ -103,29 +106,29 @@ void test(char *platform) DEBUG1("Next Event : " "%g" "\n", now); DEBUG0("\t CPU actions\n"); while ((action = - xbt_swag_extract(surf_cpu_resource->common_public->states. + xbt_swag_extract(surf_cpu_model->common_public->states. failed_action_set))) { DEBUG1("\t * Failed : %p\n", action); - action->resource_type->common_public->action_free(action); + action->model_type->common_public->action_free(action); } while ((action = - xbt_swag_extract(surf_cpu_resource->common_public->states. + xbt_swag_extract(surf_cpu_model->common_public->states. done_action_set))) { DEBUG1("\t * Done : %p\n", action); - action->resource_type->common_public->action_free(action); + action->model_type->common_public->action_free(action); } DEBUG0("\t Network actions\n"); while ((action = - xbt_swag_extract(surf_network_resource->common_public->states. + xbt_swag_extract(surf_network_model->common_public->states. failed_action_set))) { DEBUG1("\t * Failed : %p\n", action); - action->resource_type->common_public->action_free(action); + action->model_type->common_public->action_free(action); } while ((action = - xbt_swag_extract(surf_network_resource->common_public->states. + xbt_swag_extract(surf_network_model->common_public->states. done_action_set))) { DEBUG1("\t * Done : %p\n", action); - action->resource_type->common_public->action_free(action); + action->model_type->common_public->action_free(action); } } while (surf_solve()>=0.0); @@ -133,6 +136,10 @@ void test(char *platform) DEBUG0("Simulation Terminated\n"); } +#ifdef __BORLANDC__ +#pragma argsused +#endif + int main(int argc, char **argv) { surf_init(&argc, argv); /* Initialize some common structures */