-/* $Id$ */
-
/* A few basic tests for the surf library */
-/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* 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 "surf/surf_resource.h"
+#include "surf/surfxml_parse.h" // for reset callback
+
+#include "xbt/log.h"
+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)
}
-void test(void);
-void test(void)
+void test(char *platform);
+void test(char *platform)
{
void *workstationA = NULL;
void *workstationB = NULL;
- surf_action_t actionA = NULL;
- 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;
+ int running;
- surf_workstation_resource_init("platform.txt");
+ xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02");
+ xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
+ parse_platform_file(platform);
/*********************** WORKSTATION ***********************************/
workstationA =
- surf_workstation_resource->common_public->name_service("Cpu A");
+ surf_workstation_resource_by_name("Cpu A");
workstationB =
- surf_workstation_resource->common_public->name_service("Cpu B");
+ surf_workstation_resource_by_name("Cpu B");
/* Let's check that those two processors exist */
- printf("%s : %p\n",
- surf_workstation_resource->common_public->
- get_resource_name(workstationA), workstationA);
- printf("%s : %p\n",
- surf_workstation_resource->common_public->
- get_resource_name(workstationB), workstationB);
+ XBT_DEBUG("%s : %p", surf_resource_name(workstationA), workstationA);
+ XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
/* Let's do something on it */
- actionA =
- surf_workstation_resource->extension_public->execute(workstationA,
- 1000.0);
- actionB =
- surf_workstation_resource->extension_public->execute(workstationB,
- 1000.0);
- actionC =
- surf_workstation_resource->extension_public->sleep(workstationB,
- 7.32);
-
- commAB =
- surf_workstation_resource->extension_public->
- communicate(workstationA, workstationB, 150.0);
-
- surf_solve(); /* Takes traces into account. Returns 0.0 */
+ surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
+ surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
+ surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
+
+ surf_workstation_model->extension.workstation.
+ communicate(workstationA, workstationB, 150.0, -1.0);
+
+ surf_solve(-1.0); /* 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;
+ running = 0;
now = surf_get_clock();
- printf("Next Event : " "%lg" "\n", now);
-
- xbt_dynar_foreach(resource_list, i, resource) {
- printf("\t %s actions\n", resource->common_public->name);
- while ((action =
- xbt_swag_extract(resource->common_public->states.
- failed_action_set))) {
- printf("\t * Failed : %p\n", action);
- resource->common_public->action_free(action);
+ XBT_DEBUG("Next Event : %g", now);
+
+ xbt_dynar_foreach(model_list, iter, model) {
+ XBT_DEBUG("\t %s actions", model->name);
+ while ((action = xbt_swag_extract(model->states.failed_action_set))) {
+ XBT_DEBUG("\t * Failed : %p", action);
+ model->action_unref(action);
+ }
+ while ((action = xbt_swag_extract(model->states.done_action_set))) {
+ XBT_DEBUG("\t * Done : %p", action);
+ model->action_unref(action);
}
- while ((action =
- xbt_swag_extract(resource->common_public->states.
- done_action_set))) {
- printf("\t * Done : %p\n", action);
- resource->common_public->action_free(action);
+ if (xbt_swag_size(model->states.running_action_set)) {
+ XBT_DEBUG("running %s", model->name);
+ running = 1;
}
}
- } while (surf_solve());
+ } while (running && surf_solve(-1.0) >= 0.0);
- printf("Simulation Terminated\n");
+ XBT_DEBUG("Simulation Terminated");
- surf_finalize();
}
+#ifdef __BORLANDC__
+#pragma argsused
+#endif
int main(int argc, char **argv)
{
- surf_init(&argc, argv); /* Initialize some common structures */
- test();
+ 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;
}
