metaxml example modifications

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5092 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in
index a1483ad..822911a 100644 (file)
--- a/examples/simdag/Makefile.in
+++ b/examples/simdag/Makefile.in
@@ -67,13 +67,13 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 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_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_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_sd_test_OBJECTS = sd_test.$(OBJEXT)
 sd_test_OBJECTS = $(am_sd_test_OBJECTS)
 sd_test_DEPENDENCIES = $(top_builddir)/src/libsimgrid.la
@@ -92,10 +92,11 @@ CCLD = $(CC)
 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_meta_SOURCES)
-DIST_SOURCES = $(properties_sd_prop_SOURCES) $(sd_test_SOURCES) \
-       $(sd_test2_SOURCES) $(metaxml_sd_meta_SOURCES)
+SOURCES = $(metaxml_sd_meta_SOURCES) $(properties_sd_prop_SOURCES) \
+       $(sd_test_SOURCES) $(sd_test2_SOURCES)
+DIST_SOURCES = $(metaxml_sd_meta_SOURCES) \
+       $(properties_sd_prop_SOURCES) $(sd_test_SOURCES) \
+       $(sd_test2_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -318,18 +319,18 @@ clean-checkPROGRAMS:
          echo " rm -f $$p $$f"; \
          rm -f $$p $$f ; \
        done
-properties/$(am__dirstamp):
-       @$(MKDIR_P) properties
-       @: > properties/$(am__dirstamp)
-properties/sd_prop$(EXEEXT): $(properties_sd_prop_OBJECTS) $(properties_sd_prop_DEPENDENCIES) properties/$(am__dirstamp)
-       @rm -f properties/sd_prop$(EXEEXT)
-       $(LINK) $(properties_sd_prop_OBJECTS) $(properties_sd_prop_LDADD) $(LIBS)
 metaxml/$(am__dirstamp):
        @$(MKDIR_P) metaxml
        @: > metaxml/$(am__dirstamp)
 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)
+properties/$(am__dirstamp):
+       @$(MKDIR_P) properties
+       @: > properties/$(am__dirstamp)
+properties/sd_prop$(EXEEXT): $(properties_sd_prop_OBJECTS) $(properties_sd_prop_DEPENDENCIES) properties/$(am__dirstamp)
+       @rm -f properties/sd_prop$(EXEEXT)
+       $(LINK) $(properties_sd_prop_OBJECTS) $(properties_sd_prop_LDADD) $(LIBS)
 sd_test$(EXEEXT): $(sd_test_OBJECTS) $(sd_test_DEPENDENCIES) 
        @rm -f sd_test$(EXEEXT)
        $(LINK) $(sd_test_OBJECTS) $(sd_test_LDADD) $(LIBS)
@@ -343,6 +344,7 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_meta.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_prop.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sd_test2.Po@am__quote@
@@ -368,6 +370,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
 
+metaxml/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_meta.o `test -f 'metaxml/sd_meta.c' || echo '$(srcdir)/'`metaxml/sd_meta.c
+
+metaxml/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_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`
+
 sd_prop.o: properties/sd_prop.c
 @am__fastdepCC_TRUE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sd_prop.o -MD -MP -MF $(DEPDIR)/sd_prop.Tpo -c -o sd_prop.o `test -f 'properties/sd_prop.c' || echo '$(srcdir)/'`properties/sd_prop.c
 @am__fastdepCC_TRUE@   mv -f $(DEPDIR)/sd_prop.Tpo $(DEPDIR)/sd_prop.Po
@@ -382,21 +398,6 @@ 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`
 
-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_meta.o `test -f 'metaxml/sd_meta.c' || echo '$(srcdir)/'`metaxml/sd_meta.c
-
-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_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:
        -rm -f *.lo
 
@@ -580,6 +581,7 @@ clean-generic:
 
 distclean-generic:
        -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+       -rm -f metaxml/$(am__dirstamp)
        -rm -f properties/$(am__dirstamp)
 
 maintainer-clean-generic:

diff --git a/examples/simdag/metaxml/metaxml_test.tesh b/examples/simdag/metaxml/metaxml_test.tesh
index 7370114..901faaf 100644 (file)
--- a/examples/simdag/metaxml/metaxml_test.tesh
+++ b/examples/simdag/metaxml/metaxml_test.tesh
@@ -59,18 +59,3 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
 > [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_1_host:
 > [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
 > [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on nancy_0_host: 0.001620
-> [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on lille_1_host: 0.000810
-> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 1.500600
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task D'
-> [863309.428714] [sd_kernel/INFO] Task 'Task D' done
-> [863309.428714] [sd_kernel/INFO] Executing task 'Task B'
-> [863309.428714] [sd_kernel/INFO] Executing task 'Task C'
-> [1438849.000343] [sd_kernel/INFO] Task 'Task B' done
-> [1438849.000343] [sd_task/INFO] Watch point reached with task 'Task B'!
-> [1438849.000343] [sd_kernel/INFO] Simulation finished
-> [1438849.000343] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 863309.428714
-> [1438849.000343] [sd_test/INFO] Task 'Task B' start time: 863309.428714, finish time: 1438849.000343
-
-

diff --git a/examples/simdag/metaxml/metaxml_test2.tesh b/examples/simdag/metaxml/metaxml_test2.tesh
index 0c839e1..eef6be4 100644 (file)
--- a/examples/simdag/metaxml/metaxml_test2.tesh
+++ b/examples/simdag/metaxml/metaxml_test2.tesh
@@ -161,17 +161,3 @@ $ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml-random.xml
 > [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000007, bandwidth = 3297750.000000
 > [0.000000] [sd_test/INFO] Route between lyon_2_host and lyon_2_host:
 > [0.000000] [sd_test/INFO]    Link lyon_2_host: latency = 0.000007, bandwidth = 3297750.000000
-> [0.000000] [sd_test/INFO] Computation time for 2000000.000000 flops on lille_2_host: 0.011885
-> [0.000000] [sd_test/INFO] Computation time for 1000000.000000 flops on lyon_1_host: 0.004046
-> [0.000000] [sd_test/INFO] Estimated time for 'Task D': 54.826318
-> [0.000000] [sd_kernel/INFO] Starting simulation...
-> [0.000000] [sd_kernel/INFO] Executing task 'Task D'
-> [90.971131] [sd_kernel/INFO] Task 'Task D' done
-> [90.971131] [sd_kernel/INFO] Executing task 'Task B'
-> [90.971131] [sd_kernel/INFO] Executing task 'Task C'
-> [151.618557] [sd_kernel/INFO] Task 'Task B' done
-> [151.618557] [sd_task/INFO] Watch point reached with task 'Task B'!
-> [151.618557] [sd_kernel/INFO] Simulation finished
-> [151.618557] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 90.971131
-> [151.618557] [sd_test/INFO] Task 'Task B' start time: 90.971131, finish time: 151.618557
-