/* 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 <stdio.h>
#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)
surf_action_t actionB = NULL;
surf_action_t actionC = NULL;
surf_action_t commAB = NULL;
- e_surf_action_state_t stateActionA;
- e_surf_action_state_t stateActionB;
- e_surf_action_state_t stateActionC;
double now = -1.0;
- surf_workstation_resource_init_CLM03(platform);
+ int workstation_id =
+ find_model_description(surf_workstation_model_description, "CLM03");
+
+ 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();
/*********************** WORKSTATION ***********************************/
- workstationA =
- surf_workstation_resource->common_public->name_service("Cpu A");
- workstationB =
- surf_workstation_resource->common_public->name_service("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\n",
- surf_workstation_resource->common_public->
- get_resource_name(workstationA), workstationA);
- DEBUG2("%s : %p\n",
- surf_workstation_resource->common_public->
- get_resource_name(workstationB), workstationB);
+ DEBUG2("%s : %p", surf_resource_name(workstationA), workstationA);
+ DEBUG2("%s : %p", surf_resource_name(workstationB), workstationB);
/* Let's do something on it */
actionA =
- surf_workstation_resource->extension_public->execute(workstationA,
- 1000.0);
+ surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
actionB =
- surf_workstation_resource->extension_public->execute(workstationB,
- 1000.0);
+ surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
actionC =
- surf_workstation_resource->extension_public->sleep(workstationB,
- 7.32);
+ surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
commAB =
- surf_workstation_resource->extension_public->
- 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 */
+ surf_solve(); /* Takes traces into account. Returns 0.0 */
do {
surf_action_t action = NULL;
- int i;
- surf_resource_t resource = NULL;
+ unsigned int iter;
+ surf_model_t model = NULL;
now = surf_get_clock();
- DEBUG1("Next Event : " "%g" "\n", now);
+ DEBUG1("Next Event : %g", now);
- xbt_dynar_foreach(resource_list, i, resource) {
- DEBUG1("\t %s actions\n", resource->common_public->name);
+ xbt_dynar_foreach(model_list, iter, model) {
+ DEBUG1("\t %s actions", model->name);
while ((action =
- xbt_swag_extract(resource->common_public->states.
- failed_action_set))) {
- DEBUG1("\t * Failed : %p\n", action);
- resource->common_public->action_free(action);
+ xbt_swag_extract(model->states.failed_action_set))) {
+ DEBUG1("\t * Failed : %p", action);
+ model->action_unref(action);
}
while ((action =
- xbt_swag_extract(resource->common_public->states.
- done_action_set))) {
- DEBUG1("\t * Done : %p\n", action);
- resource->common_public->action_free(action);
+ xbt_swag_extract(model->states.done_action_set))) {
+ DEBUG1("\t * Done : %p", action);
+ model->action_unref(action);
}
}
- } while (surf_solve()>=0.0);
+ } while (surf_solve() >= 0.0);
- DEBUG0("Simulation Terminated\n");
+ DEBUG0("Simulation Terminated");
- surf_finalize();
}
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
+
int main(int argc, char **argv)
{
- surf_init(&argc, argv); /* Initialize some common structures */
- if(argc==1) {
- fprintf(stderr,"Usage : %s platform.txt\n",argv[0]);
- return 1;
+ surf_init(&argc, argv); /* Initialize some common structures */
+ if (argc == 1) {
+ fprintf(stderr, "Usage : %s platform.txt\n", argv[0]);
+ surf_exit();
+ return 1;
}
test(argv[1]);
+
+ surf_exit();
return 0;
}
