From fcfe8a7146bbc845782f3f8730f7f4a60a7dd4e8 Mon Sep 17 00:00:00 2001 From: quasar Date: Thu, 29 Nov 2007 14:35:25 +0000 Subject: [PATCH] metaxml example modifications git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5090 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- examples/simdag/Makefile.am | 6 +- examples/simdag/Makefile.in | 42 ++--- examples/simdag/metaxml/metaxml_test.tesh | 2 +- examples/simdag/metaxml/metaxml_test2.tesh | 2 +- examples/simdag/metaxml/sd_meta.c | 60 +++++++ examples/simdag/metaxml/sd_test.c | 196 --------------------- 6 files changed, 86 insertions(+), 222 deletions(-) create mode 100644 examples/simdag/metaxml/sd_meta.c delete mode 100644 examples/simdag/metaxml/sd_test.c diff --git a/examples/simdag/Makefile.am b/examples/simdag/Makefile.am index 1d958473ca..dd11327a10 100644 --- a/examples/simdag/Makefile.am +++ b/examples/simdag/Makefile.am @@ -15,15 +15,15 @@ CLEANFILES = sd_test.trace TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = test_simdag.tesh test_simdag2.tesh properties/test_prop.tesh metaxml/metaxml_test.tesh -check_PROGRAMS = sd_test sd_test2 properties/sd_prop metaxml/sd_test +check_PROGRAMS = sd_test sd_test2 properties/sd_prop metaxml/sd_meta bin_PROGRAMS = properties_sd_prop_SOURCES = properties/sd_prop.c properties_sd_prop_LDADD = $(top_builddir)/src/libsimgrid.la -metaxml_sd_test_SOURCES = metaxml/sd_test.c -metaxml_sd_test_LDADD = $(top_builddir)/src/libsimgrid.la +metaxml_sd_meta_SOURCES = metaxml/sd_meta.c +metaxml_sd_meta_LDADD = $(top_builddir)/src/libsimgrid.la sd_test_SOURCES = sd_test.c sd_test_LDADD = $(top_builddir)/src/libsimgrid.la diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in index 4aacc06854..a1483ad574 100644 --- a/examples/simdag/Makefile.in +++ b/examples/simdag/Makefile.in @@ -45,7 +45,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ check_PROGRAMS = sd_test$(EXEEXT) sd_test2$(EXEEXT) \ - properties/sd_prop$(EXEEXT) metaxml/sd_test$(EXEEXT) + properties/sd_prop$(EXEEXT) metaxml/sd_meta$(EXEEXT) bin_PROGRAMS = DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/acmacro/dist-files.mk @@ -70,9 +70,9 @@ PROGRAMS = $(bin_PROGRAMS) am_properties_sd_prop_OBJECTS = sd_prop.$(OBJEXT) properties_sd_prop_OBJECTS = $(am_properties_sd_prop_OBJECTS) properties_sd_prop_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la -am_metaxml_sd_test_OBJECTS = sd_test.$(OBJEXT) -metaxml_sd_test_OBJECTS = $(am_metaxml_sd_test_OBJECTS) -metaxml_sd_test_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la +am_metaxml_sd_meta_OBJECTS = sd_meta.$(OBJEXT) +metaxml_sd_meta_OBJECTS = $(am_metaxml_sd_meta_OBJECTS) +metaxml_sd_meta_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la am__dirstamp = $(am__leading_dot)dirstamp am_sd_test_OBJECTS = sd_test.$(OBJEXT) sd_test_OBJECTS = $(am_sd_test_OBJECTS) @@ -93,9 +93,9 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = $(properties_sd_prop_SOURCES) $(sd_test_SOURCES) \ - $(sd_test2_SOURCES) $(metaxml_sd_test_SOURCES) + $(sd_test2_SOURCES) $(metaxml_sd_meta_SOURCES) DIST_SOURCES = $(properties_sd_prop_SOURCES) $(sd_test_SOURCES) \ - $(sd_test2_SOURCES) $(metaxml_sd_test_SOURCES) + $(sd_test2_SOURCES) $(metaxml_sd_meta_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -244,8 +244,8 @@ TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = test_simdag.tesh test_simdag2.tesh properties/test_prop.tesh metaxml/metaxml_test.tesh properties_sd_prop_SOURCES = properties/sd_prop.c properties_sd_prop_LDADD = $(top_builddir)/src/libsimgrid.la -metaxml_sd_test_SOURCES = metaxml/sd_test.c -metaxml_sd_test_LDADD = $(top_builddir)/src/libsimgrid.la +metaxml_sd_meta_SOURCES = metaxml/sd_meta.c +metaxml_sd_meta_LDADD = $(top_builddir)/src/libsimgrid.la sd_test_SOURCES = sd_test.c sd_test_LDADD = $(top_builddir)/src/libsimgrid.la sd_test2_SOURCES = sd_test2.c @@ -327,9 +327,9 @@ properties/sd_prop$(EXEEXT): $(properties_sd_prop_OBJECTS) $(properties_sd_prop_ metaxml/$(am__dirstamp): @$(MKDIR_P) metaxml @: > metaxml/$(am__dirstamp) -metaxml/sd_test$(EXEEXT): $(metaxml_sd_test_OBJECTS) $(metaxml_sd_test_DEPENDENCIES) metaxml/$(am__dirstamp) - @rm -f metaxml/sd_test$(EXEEXT) - $(LINK) $(metaxml_sd_test_OBJECTS) $(metaxml_sd_test_LDADD) $(LIBS) +metaxml/sd_meta$(EXEEXT): $(metaxml_sd_meta_OBJECTS) $(metaxml_sd_meta_DEPENDENCIES) metaxml/$(am__dirstamp) + @rm -f metaxml/sd_meta$(EXEEXT) + $(LINK) $(metaxml_sd_meta_OBJECTS) $(metaxml_sd_meta_LDADD) $(LIBS) sd_test$(EXEEXT): $(sd_test_OBJECTS) $(sd_test_DEPENDENCIES) @rm -f sd_test$(EXEEXT) $(LINK) $(sd_test_OBJECTS) $(sd_test_LDADD) $(LIBS) @@ -382,19 +382,19 @@ sd_prop.obj: properties/sd_prop.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sd_prop.obj `if test -f 'properties/sd_prop.c'; then $(CYGPATH_W) 'properties/sd_prop.c'; else $(CYGPATH_W) '$(srcdir)/properties/sd_prop.c'; fi` -metaxml/sd_test.o: metaxml/sd_test.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_test.o -MD -MP -MF $(DEPDIR)/sd_test.Tpo -c -o sd_test.o `test -f 'metaxml/sd_test.c' || echo '$(srcdir)/'`metaxml/sd_test.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sd_test.Tpo $(DEPDIR)/sd_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='metaxml/sd_test.c' object='sd_test.o' libtool=no @AMDEPBACKSLASH@ +sd_meta.o: metaxml/sd_meta.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_meta.o -MD -MP -MF $(DEPDIR)/sd_meta.Tpo -c -o sd_meta.o `test -f 'metaxml/sd_meta.c' || echo '$(srcdir)/'`metaxml/sd_meta.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sd_meta.Tpo $(DEPDIR)/sd_meta.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='metaxml/sd_meta.c' object='sd_meta.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sd_test.o `test -f 'metaxml/sd_test.c' || echo '$(srcdir)/'`metaxml/sd_test.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sd_meta.o `test -f 'metaxml/sd_meta.c' || echo '$(srcdir)/'`metaxml/sd_meta.c -metaxml/sd_test.obj: metaxml/sd_test.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_test.obj -MD -MP -MF $(DEPDIR)/sd_test.Tpo -c -o sd_test.obj `if test -f 'metaxml/sd_test.c'; then $(CYGPATH_W) 'metaxml/sd_test.c'; else $(CYGPATH_W) '$(srcdir)/metaxml/sd_test.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sd_test.Tpo $(DEPDIR)/sd_test.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='metaxml/sd_test.c' object='sd_test.obj' libtool=no @AMDEPBACKSLASH@ +sd_meta.obj: metaxml/sd_meta.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_meta.obj -MD -MP -MF $(DEPDIR)/sd_meta.Tpo -c -o sd_meta.obj `if test -f 'metaxml/sd_meta.c'; then $(CYGPATH_W) 'metaxml/sd_meta.c'; else $(CYGPATH_W) '$(srcdir)/metaxml/sd_meta.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sd_meta.Tpo $(DEPDIR)/sd_meta.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='metaxml/sd_meta.c' object='sd_meta.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sd_test.obj `if test -f 'metaxml/sd_test.c'; then $(CYGPATH_W) 'metaxml/sd_test.c'; else $(CYGPATH_W) '$(srcdir)/metaxml/sd_test.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sd_meta.obj `if test -f 'metaxml/sd_meta.c'; then $(CYGPATH_W) 'metaxml/sd_meta.c'; else $(CYGPATH_W) '$(srcdir)/metaxml/sd_meta.c'; fi` mostlyclean-libtool: diff --git a/examples/simdag/metaxml/metaxml_test.tesh b/examples/simdag/metaxml/metaxml_test.tesh index 1c9505af2b..73701149dc 100644 --- a/examples/simdag/metaxml/metaxml_test.tesh +++ b/examples/simdag/metaxml/metaxml_test.tesh @@ -2,7 +2,7 @@ p Simple test of simdag with metaxml tags -$ $SG_TEST_EXENV metaxml/sd_test ${srcdir:=.}/../platforms/metaxml.xml +$ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml > [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host: > [0.000000] [sd_test/INFO] Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000 > [0.000000] [sd_test/INFO] Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000 diff --git a/examples/simdag/metaxml/metaxml_test2.tesh b/examples/simdag/metaxml/metaxml_test2.tesh index bedde931eb..0c839e1776 100644 --- a/examples/simdag/metaxml/metaxml_test2.tesh +++ b/examples/simdag/metaxml/metaxml_test2.tesh @@ -2,7 +2,7 @@ p Simple test of simdag with metaxml tags -$ $SG_TEST_EXENV metaxml/sd_test ${srcdir:=.}/../platforms/metaxml-random.xml +$ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml-random.xml > [0.000000] [sd_test/INFO] Route between lille_2_host and lille_2_host: > [0.000000] [sd_test/INFO] Link lille_2_host: latency = 0.000007, bandwidth = 3297750.000000 > [0.000000] [sd_test/INFO] Route between lille_2_host and lyon_1_host: diff --git a/examples/simdag/metaxml/sd_meta.c b/examples/simdag/metaxml/sd_meta.c new file mode 100644 index 0000000000..79d75321a3 --- /dev/null +++ b/examples/simdag/metaxml/sd_meta.c @@ -0,0 +1,60 @@ +/* + See examples/platforms/metaxml.xml and examples/platforms/metaxml_platform.xml files for examples on how to use the cluster, foreach, set, route:multi, trace and trace:connect tags +*/ +#include +#include +#include "simdag/simdag.h" +#include "xbt/ex.h" +#include "xbt/log.h" +#include "xbt/dynar.h" +#include "xbt/dict.h" +#include "xbt/time.h" + +XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, + "Logging specific to this SimDag example"); + +int main(int argc, char **argv) { + /* initialisation of SD */ + SD_init(&argc, argv); + + /* xbt_log_control_set("sd.thres=debug"); */ + + if (argc < 2) { + INFO1("Usage: %s platform_file", argv[0]); + INFO1("example: %s sd_platform.xml", argv[0]); + exit(1); + } + + /* creation of the environment */ + const char * platform_file = argv[1]; + SD_create_environment(platform_file); + + /* test the estimation functions */ + const SD_workstation_t *workstations = SD_workstation_get_list(); + int ws_nr = SD_workstation_get_number(); + + SD_workstation_t w1 = NULL; + SD_workstation_t w2 = NULL; + const char *name1, *name2; + /* Show routes between all workstation */ + int i,j,k; + for (i=0; i -#include -#include "simdag/simdag.h" -#include "xbt/ex.h" -#include "xbt/log.h" -#include "xbt/dynar.h" -#include "xbt/dict.h" -#include "xbt/time.h" - -XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, - "Logging specific to this SimDag example"); - -int main(int argc, char **argv) { - /* initialisation of SD */ - SD_init(&argc, argv); - - /* xbt_log_control_set("sd.thres=debug"); */ - - if (argc < 2) { - INFO1("Usage: %s platform_file", argv[0]); - INFO1("example: %s sd_platform.xml", argv[0]); - exit(1); - } - - /* creation of the environment */ - const char * platform_file = argv[1]; - SD_create_environment(platform_file); - - /* test the estimation functions */ - const SD_workstation_t *workstations = SD_workstation_get_list(); - int ws_nr = SD_workstation_get_number(); - - SD_workstation_t w1 = NULL; - SD_workstation_t w2 = NULL; - const char *name1, *name2; - /* Show routes between all workstation */ - int i,j,k; - for (i=0; i