X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..3bf26d5f8bcf8154aff251b7dca4174468e0971e:/testsuite/surf/surf_usage2.c diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c index 8be876df57..eda5f21c4d 100644 --- a/testsuite/surf/surf_usage2.c +++ b/testsuite/surf/surf_usage2.c @@ -13,7 +13,8 @@ #include "surf/surf.h" #include "xbt/log.h" -XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, + "Messages specific for surf example"); const char *string_action(e_surf_action_state_t state); const char *string_action(e_surf_action_state_t state) @@ -48,16 +49,21 @@ void test(char *platform) int running; int workstation_id = - find_model_description(surf_workstation_model_description, "CLM03"); + find_model_description(surf_workstation_model_description, "CLM03"); - surf_workstation_model_description[workstation_id].model_init_preparse(platform); + surf_workstation_model_description[workstation_id]. + model_init_preparse(platform); parse_platform_file(platform); - if (surf_workstation_model_description[workstation_id].model_init_postparse) - surf_workstation_model_description[workstation_id].model_init_postparse(); + if (surf_workstation_model_description[workstation_id]. + model_init_postparse) + surf_workstation_model_description[workstation_id]. + model_init_postparse(); /*********************** WORKSTATION ***********************************/ - workstationA = surf_model_resource_by_name(surf_workstation_model,"Cpu A"); - workstationB = surf_model_resource_by_name(surf_workstation_model,"Cpu B"); + workstationA = + surf_model_resource_by_name(surf_workstation_model, "Cpu A"); + workstationB = + surf_model_resource_by_name(surf_workstation_model, "Cpu B"); /* Let's check that those two processors exist */ DEBUG2("%s : %p", surf_resource_name(workstationA), workstationA); @@ -65,16 +71,18 @@ void test(char *platform) /* Let's do something on it */ actionA = - surf_workstation_model->extension.workstation.execute(workstationA, 1000.0); + surf_workstation_model->extension.workstation.execute(workstationA, + 1000.0); actionB = - surf_workstation_model->extension.workstation.execute(workstationB, 1000.0); + surf_workstation_model->extension.workstation.execute(workstationB, + 1000.0); actionC = - surf_workstation_model->extension.workstation.sleep(workstationB, 7.32); + surf_workstation_model->extension.workstation.sleep(workstationB, + 7.32); commAB = - surf_workstation_model->extension.workstation.communicate(workstationA, - workstationB, 150.0, - -1.0); + surf_workstation_model->extension.workstation. + communicate(workstationA, workstationB, 150.0, -1.0); surf_solve(); /* Takes traces into account. Returns 0.0 */ do { @@ -88,13 +96,11 @@ void test(char *platform) xbt_dynar_foreach(model_list, iter, model) { DEBUG1("\t %s actions", model->name); - while ((action = - xbt_swag_extract(model->states.failed_action_set))) { + while ((action = xbt_swag_extract(model->states.failed_action_set))) { DEBUG1("\t * Failed : %p", action); model->action_unref(action); } - while ((action = - xbt_swag_extract(model->states.done_action_set))) { + while ((action = xbt_swag_extract(model->states.done_action_set))) { DEBUG1("\t * Done : %p", action); model->action_unref(action); }