From d7634a14de0e11cd4e4cc66acc0982b5b10a9110 Mon Sep 17 00:00:00 2001 From: thiery Date: Mon, 10 Jul 2006 07:52:12 +0000 Subject: [PATCH] Fix SimDag example git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2524 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/simdag/sd_test.c | 17 ++--- testsuite/simdag/Makefile | 6 +- testsuite/simdag/sd_test.c | 143 ++++++++++++++++++++++++++----------- 3 files changed, 113 insertions(+), 53 deletions(-) diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c index 006bd0836f..c104dc38e6 100644 --- a/examples/simdag/sd_test.c +++ b/examples/simdag/sd_test.c @@ -27,8 +27,9 @@ int main(int argc, char **argv) { SD_create_environment(platform_file); /* test the estimation functions (use small_platform.xml) */ - SD_workstation_t w1 = SD_workstation_get_by_name("Jupiter"); - SD_workstation_t w2 = SD_workstation_get_by_name("Ginette"); + const SD_workstation_t *workstations = SD_workstation_get_list(); + SD_workstation_t w1 = workstations[0]; + SD_workstation_t w2 = workstations[1]; const char *name1 = SD_workstation_get_name(w1); const char *name2 = SD_workstation_get_name(w2); const double computation_amount1 = 2000000; @@ -41,18 +42,18 @@ int main(int argc, char **argv) { SD_workstation_get_computation_time(w2, computation_amount2)); INFO2("Route between %s and %s:", name1, name2); - SD_link_t *route = SD_workstation_route_get_list(w1, w2); - int route_size = SD_workstation_route_get_size(w1, w2); + SD_link_t *route = SD_route_get_list(w1, w2); + int route_size = SD_route_get_size(w1, w2); for (i = 0; i < route_size; i++) { INFO3("\tLink %s: latency = %f, bandwidth = %f", SD_link_get_name(route[i]), SD_link_get_current_latency(route[i]), SD_link_get_current_bandwidth(route[i])); } - INFO2("Route latency = %f, route bandwidth = %f", SD_workstation_route_get_latency(w1, w2), - SD_workstation_route_get_bandwidth(w1, w2)); + INFO2("Route latency = %f, route bandwidth = %f", SD_route_get_current_latency(w1, w2), + SD_route_get_current_bandwidth(w1, w2)); INFO4("Communication time for %f bytes between %s and %s: %f", communication_amount12, name1, name2, - SD_workstation_route_get_communication_time(w1, w2, communication_amount12)); + SD_route_get_communication_time(w1, w2, communication_amount12)); INFO4("Communication time for %f bytes between %s and %s: %f", communication_amount21, name2, name1, - SD_workstation_route_get_communication_time(w2, w1, communication_amount21)); + SD_route_get_communication_time(w2, w1, communication_amount21)); xbt_free(route); /* creation of the tasks and their dependencies */ diff --git a/testsuite/simdag/Makefile b/testsuite/simdag/Makefile index c735476bcf..d1d1b96c43 100644 --- a/testsuite/simdag/Makefile +++ b/testsuite/simdag/Makefile @@ -12,12 +12,12 @@ NO_PRAYER_FOR_THE_WICKED = -w -O2 WARNINGS = $(REASONABLY_CAREFUL_DUDE) CFLAGS = -g $(WARNINGS) -INCLUDES = -I../../include -I../../src/include +INCLUDES = -I$(INSTALL_PATH)/include DEFS = -L$(INSTALL_PATH)/lib LIBS = -lm -lsimgrid all: sd_test -sd_test: sd_test.o ../../src/simdag/global.o ../../src/simdag/link.o ../../src/simdag/task.o ../../src/simdag/workstation.o +sd_test: sd_test.o %: %.o $(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS) $(LDADD) -o $@ @@ -26,6 +26,6 @@ sd_test: sd_test.o ../../src/simdag/global.o ../../src/simdag/link.o ../../src $(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c -o $@ $< clean: - rm -f *.o *~ ../../src/simdag/*.o ../../src/simdag/*.~ + rm -f *.o *~ .SUFFIXES: .PHONY : clean diff --git a/testsuite/simdag/sd_test.c b/testsuite/simdag/sd_test.c index f4719f119e..9104e61615 100644 --- a/testsuite/simdag/sd_test.c +++ b/testsuite/simdag/sd_test.c @@ -2,15 +2,20 @@ #include #include "simdag/simdag.h" #include "xbt/ex.h" +#include "xbt/log.h" + +XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, + "Logging specific to this SimDag example"); int main(int argc, char **argv) { - + int i; + /* initialisation of SD */ SD_init(&argc, argv); if (argc < 2) { - printf ("Usage: %s platform_file\n", argv[0]); - printf ("example: %s msg_platform.xml\n", argv[0]); + INFO1("Usage: %s platform_file", argv[0]); + INFO1("example: %s sd_platform.xml", argv[0]); exit(1); } @@ -18,6 +23,36 @@ int main(int argc, char **argv) { char * platform_file = argv[1]; SD_create_environment(platform_file); + /* test the estimation functions (use small_platform.xml) */ + const SD_workstation_t *workstations = SD_workstation_get_list(); + SD_workstation_t w1 = workstations[0]; + SD_workstation_t w2 = workstations[1]; + const char *name1 = SD_workstation_get_name(w1); + const char *name2 = SD_workstation_get_name(w2); + const double computation_amount1 = 2000000; + const double computation_amount2 = 1000000; + const double communication_amount12 = 2000000; + const double communication_amount21 = 3000000; + INFO3("Computation time for %f flops on %s: %f", computation_amount1, name1, + SD_workstation_get_computation_time(w1, computation_amount1)); + INFO3("Computation time for %f flops on %s: %f", computation_amount2, name2, + SD_workstation_get_computation_time(w2, computation_amount2)); + + INFO2("Route between %s and %s:", name1, name2); + SD_link_t *route = SD_route_get_list(w1, w2); + int route_size = SD_route_get_size(w1, w2); + for (i = 0; i < route_size; i++) { + INFO3("\tLink %s: latency = %f, bandwidth = %f", SD_link_get_name(route[i]), + SD_link_get_current_latency(route[i]), SD_link_get_current_bandwidth(route[i])); + } + INFO2("Route latency = %f, route bandwidth = %f", SD_route_get_current_latency(w1, w2), + SD_route_get_current_bandwidth(w1, w2)); + INFO4("Communication time for %f bytes between %s and %s: %f", communication_amount12, name1, name2, + SD_route_get_communication_time(w1, w2, communication_amount12)); + INFO4("Communication time for %f bytes between %s and %s: %f", communication_amount21, name2, name1, + SD_route_get_communication_time(w2, w1, communication_amount21)); + xbt_free(route); + /* creation of the tasks and their dependencies */ SD_task_t taskA = SD_task_create("Task A", NULL, 10.0); SD_task_t taskB = SD_task_create("Task B", NULL, 40.0); @@ -31,56 +66,66 @@ int main(int argc, char **argv) { SD_task_dependency_add(NULL, NULL, taskD, taskC); /* SD_task_dependency_add(NULL, NULL, taskA, taskD); /\* deadlock */ -/* xbt_ex_t ex; */ + xbt_ex_t ex; -/* TRY { */ -/* SD_task_dependency_add(NULL, NULL, taskA, taskA); /\* shouldn't work and must raise an exception *\/ */ -/* xbt_assert0(0, "Hey, I can add a dependency between Task A and Task A!"); */ -/* } */ -/* CATCH (ex) { */ -/* } */ + TRY { + SD_task_dependency_add(NULL, NULL, taskA, taskA); /* shouldn't work and must raise an exception */ + xbt_assert0(0, "Hey, I can add a dependency between Task A and Task A!"); + } + CATCH (ex) { + } -/* TRY { */ -/* SD_task_dependency_add(NULL, NULL, taskA, taskB); /\* shouldn't work and must raise an exception *\/ */ -/* xbt_assert0(0, "Oh oh, I can add an already existing dependency!"); */ -/* } */ -/* CATCH (ex) { */ -/* } */ - -/* SD_task_dependency_remove(taskA, taskB); */ - -/* TRY { */ -/* SD_task_dependency_remove(taskC, taskA); /\* shouldn't work and must raise an exception *\/ */ -/* xbt_assert0(0, "Dude, I can remove an unknown dependency!"); */ -/* } */ -/* CATCH (ex) { */ -/* } */ - -/* TRY { */ -/* SD_task_dependency_remove(taskC, taskC); /\* shouldn't work and must raise an exception *\/ */ -/* xbt_assert0(0, "Wow, I can remove a dependency between Task C and itself!"); */ -/* } */ -/* CATCH (ex) { */ -/* } */ + TRY { + SD_task_dependency_add(NULL, NULL, taskA, taskB); /* shouldn't work and must raise an exception */ + xbt_assert0(0, "Oh oh, I can add an already existing dependency!"); + } + CATCH (ex) { + } + + SD_task_dependency_remove(taskA, taskB); + + TRY { + SD_task_dependency_remove(taskC, taskA); /* shouldn't work and must raise an exception */ + xbt_assert0(0, "Dude, I can remove an unknown dependency!"); + } + CATCH (ex) { + } + + TRY { + SD_task_dependency_remove(taskC, taskC); /* shouldn't work and must raise an exception */ + xbt_assert0(0, "Wow, I can remove a dependency between Task C and itself!"); + } + CATCH (ex) { + } /* if everything is ok, no exception is forwarded or rethrown by main() */ /* watch points */ - /* SD_task_watch(taskB, SD_DONE);*/ + SD_task_watch(taskD, SD_DONE); + SD_task_watch(taskB, SD_DONE); + SD_task_unwatch(taskD, SD_DONE); - /* let's launch the simulation! */ + /* scheduling parameters */ - int workstation_number = 2; - SD_workstation_t *workstation_list = SD_workstation_get_list(); - double computation_amount[] = {100, 200}; + const int workstation_number = 2; + const SD_workstation_t workstation_list[] = {w1, w2}; + double computation_amount[] = {computation_amount1, computation_amount2}; double communication_amount[] = { - 0, 30, - 20, 0 + 0, communication_amount12, + communication_amount21, 0 }; - double rate = 1; + double rate = -1.0; + + /* estimated time */ + SD_task_t task = taskD; + INFO2("Estimated time for '%s': %f", SD_task_get_name(task), + SD_task_get_execution_time(task, workstation_number, workstation_list, + computation_amount, communication_amount, rate)); + + /* let's launch the simulation! */ SD_task_schedule(taskA, workstation_number, workstation_list, computation_amount, communication_amount, rate); @@ -91,13 +136,27 @@ int main(int argc, char **argv) { SD_task_schedule(taskD, workstation_number, workstation_list, computation_amount, communication_amount, rate); - printf("Launching simulation...\n"); - SD_simulate(100); + SD_task_t *changed_tasks; + + changed_tasks = SD_simulate(-1.0); + xbt_assert0(changed_tasks[0] == taskD && + changed_tasks[1] == taskB && + changed_tasks[2] == taskC && + changed_tasks[3] == NULL, + "Unexpected simulation results"); + + xbt_free(changed_tasks); + + DEBUG0("Destroying tasks..."); SD_task_destroy(taskA); SD_task_destroy(taskB); SD_task_destroy(taskC); SD_task_destroy(taskD); + + DEBUG0("Tasks destroyed. Exiting SimDag..."); + SD_exit(); return 0; } + -- 2.20.1