From: quasar <quasar@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 29 Nov 2007 15:15:54 +0000 (+0000)
Subject: metaxml example modifications
X-Git-Tag: v3.3~755
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/bb06f72a8720cfdbd5534a578797a1c4dfa9eb32

metaxml example modifications

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

diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in
index 822911aa06..b696ba0b2a 100644
--- a/examples/simdag/Makefile.in
+++ b/examples/simdag/Makefile.in
@@ -370,14 +370,14 @@ 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
+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
+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@
diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index 5e972d83c3..713181776f 100644
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -1150,6 +1150,7 @@ static void parse_route_set_endpoints(void)
   surf_parse_get_double(&impact_on_dst_with_other_send,
 			A_surfxml_route_impact_on_dst_with_other_send);
 
+  
   route_action = A_surfxml_route_action;
   route_link_list = xbt_dynar_new(sizeof(char *), &free_string);
 
@@ -1159,7 +1160,7 @@ static void parse_route_set_route(void)
 {
   char* name;
   if (src_id != -1 && dst_id != -1) {
-    name = bprintf("%x#%x#%lf#%lf#%lf#%lf",src_id, dst_id,impact_on_src,
+    name = bprintf("%d#%d#%lf#%lf#%lf#%lf",src_id, dst_id,impact_on_src,
 	      impact_on_dst, impact_on_src_with_other_recv,
 	      impact_on_dst_with_other_send);