From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 24 Jun 2008 14:03:35 +0000 (+0000)
Subject: Add the flatifier update the Makefile accordingly.
X-Git-Tag: v3.3~305
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2f5f41cd822689e734e3992cab93d5a99a894df8

Add the flatifier update the Makefile accordingly.


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

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 5f2dd44756..7e0cec5ba1 100644
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -112,7 +112,7 @@ EXTRA_DIST += gras/empty_main/empty_main.xml \
 noinst_PROGRAMS+=\
   gras/empty_main/empty_main_function \
   gras/empty_main/empty_main_simulator
-  
+
 gras_empty_main_empty_main_simulator_SOURCES= gras/empty_main/empty_main.c gras/empty_main/_empty_main_simulator.c
 gras_empty_main_empty_main_function_SOURCES=  gras/empty_main/empty_main.c gras/empty_main/_empty_main_function.c
 
@@ -133,7 +133,7 @@ EXTRA_DIST += gras/small_sleep/small_sleep.xml \
 noinst_PROGRAMS+=\
   gras/small_sleep/small_sleep_function \
   gras/small_sleep/small_sleep_simulator
-  
+
 gras_small_sleep_small_sleep_simulator_SOURCES= gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_simulator.c
 gras_small_sleep_small_sleep_function_SOURCES=  gras/small_sleep/small_sleep.c gras/small_sleep/_small_sleep_function.c
 
@@ -168,6 +168,38 @@ noinst_PROGRAMS += simdag/platforms/basic_parsing_test
 simdag_platforms_basic_parsing_test_SOURCES = simdag/platforms/basic_parsing_test.c
 simdag_platforms_basic_parsing_test_LDADD = $(LDADD_SG)
 TESTS += simdag/platforms/basic_parsing_test.tesh
+XFAIL_TESTS += simdag/platforms/basic_parsing_test_failing.tesh
+
+noinst_PROGRAMS += simdag/platforms/flatifier
+simdag_platforms_flatifier_SOURCES = simdag/platforms/flatifier.c
+simdag_platforms_flatifier_LDADD = $(LDADD_SG)
+TESTS += simdag/platforms/flatifier.tesh
+
+EXTRA_DIST      += simdag/platforms/one_cluster_foreach.xml \
+                   simdag/platforms/one_cluster_one_host_random.xml \
+                   simdag/platforms/one_cluster_one_host.xml \
+                   simdag/platforms/one_cluster_properties_foreach.xml \
+                   simdag/platforms/one_cluster_properties_override.xml \
+                   simdag/platforms/one_cluster.xml \
+                   simdag/platforms/one_host_availability.xml \
+                   simdag/platforms/one_host_properties.xml \
+                   simdag/platforms/one_host_state_file.xml \
+                   simdag/platforms/one_host_state_off.xml \
+                   simdag/platforms/one_host_state_on.xml \
+                   simdag/platforms/one_host_trace_file.xml \
+                   simdag/platforms/one_host_trace_inside.xml \
+                   simdag/platforms/one_host.xml \
+                   simdag/platforms/one_link_availability.xml \
+                   simdag/platforms/one_link_fatpipe.xml \
+                   simdag/platforms/one_link_shared.xml \
+                   simdag/platforms/one_link_state_file.xml \
+                   simdag/platforms/route_override.xml \
+                   simdag/platforms/three_hosts_non_symmetric_route.xml \
+                   simdag/platforms/two_clusters_symmetric.xml \
+                   simdag/platforms/two_clusters.xml \
+                   simdag/platforms/two_hosts_multi_hop.xml \
+                   simdag/platforms/two_hosts_one_link.xml
+
 
 # from L.C. Canon
 noinst_PROGRAMS += simdag/basic0 \
diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 3746230baa..c4298fafbc 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -1,14 +1,21 @@
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster_foreach.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster_one_host_random.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster_one_host.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster_properties_foreach.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_availability.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_properties.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_file.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_off.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_state_on.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_trace_inside.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_availability.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_fatpipe.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_shared.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_link_state_file.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms three_hosts_non_symmetric_route.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_clusters_symmetric.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_clusters.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_hosts_multi_hop.xml
 $ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms two_hosts_one_link.xml
-
-
diff --git a/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
new file mode 100644
index 0000000000..12f91c4be7
--- /dev/null
+++ b/teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
@@ -0,0 +1,2 @@
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_cluster_properties_override.xml
+$ simdag/platforms/basic_parsing_test --surf-path=simdag/platforms one_host_trace_file.xml
diff --git a/teshsuite/simdag/platforms/flatifier.c b/teshsuite/simdag/platforms/flatifier.c
new file mode 100644
index 0000000000..e696ab0bf7
--- /dev/null
+++ b/teshsuite/simdag/platforms/flatifier.c
@@ -0,0 +1,117 @@
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+#include <math.h>
+
+
+#include "simdag/simdag.h"
+#include "xbt/log.h"
+#include "xbt/dict.h"
+
+XBT_LOG_NEW_DEFAULT_CATEGORY(validator,
+			     "Logging specific to this SimDag example");
+
+static int name_compare_hosts(const void *n1, const void *n2)
+{
+  char name1[80], name2[80];
+  strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *)n1)));
+  strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *)n2)));
+
+  return strcmp(name1,name2);
+}
+
+static int name_compare_links(const void *n1, const void *n2)
+{
+  char name1[80], name2[80];
+  strcpy(name1, SD_link_get_name(*((SD_link_t *)n1)));
+  strcpy(name2, SD_link_get_name(*((SD_link_t *)n2)));
+
+  return strcmp(name1,name2);
+}
+
+int main(int argc, char **argv) {
+  char *platformFile=NULL;
+  int totalHosts, totalLinks, tmp_length;
+  int i,j,k;
+  xbt_dict_t props = NULL;
+  xbt_dict_cursor_t cursor=NULL;
+  char *key,*data;
+
+  const SD_workstation_t *hosts;
+  const SD_link_t *links, *tmp;
+
+  SD_init(&argc, argv);
+
+  platformFile = argv[1];
+  DEBUG1("%s",platformFile);
+  SD_create_environment(platformFile);
+
+  printf ("<?xml version='1.0'?>\n");
+  printf ("<!DOCTYPE platform SYSTEM \"simgrid.dtd\">\n");
+  printf ("<platform version=\"2\">\n");
+ 
+  totalHosts = SD_workstation_get_number();
+  hosts = SD_workstation_get_list();
+  qsort((void *)hosts, totalHosts, sizeof(SD_workstation_t),
+	name_compare_hosts);
+  
+  for (i=0;i<totalHosts;i++){
+    printf("  <host id=\"%s\" power=\"%.0f\"", 
+	   SD_workstation_get_name(hosts[i]),
+	   SD_workstation_get_power(hosts[i]));
+    props = SD_workstation_get_properties(hosts[i]);
+    if (xbt_dict_length(props)>0) {
+      printf(">\n");
+      xbt_dict_foreach(props,cursor,key,data) {
+	printf("    <prop id=\"%s\" value=\"%s\"/>\n",key,data);
+      }
+      printf("  </host>\n");
+    } else {
+      printf("/>\n");
+    }
+  }
+
+  totalLinks = SD_link_get_number();
+  links = SD_link_get_list();
+  qsort((void *)links, totalLinks, sizeof(SD_link_t),
+	name_compare_links);
+  
+  for (i=0;i<totalLinks;i++){
+    printf("  <link id=\"");
+
+    printf("%s\" bandwidth=\"%.0f\" latency=\"%.9f\"", 
+	   SD_link_get_name(links[i]),
+	   SD_link_get_current_bandwidth(links[i]),
+	   SD_link_get_current_latency(links[i]));
+    if (SD_link_get_sharing_policy(links[i])== SD_LINK_SHARED) {
+      printf("/>\n"); 
+    } else {
+      printf(" sharing_policy=\"FATPIPE\"/>\n");
+    }
+  }
+
+  for (i=0;i<totalHosts;i++){
+    for (j=0;j<totalHosts;j++){
+      tmp = SD_route_get_list(hosts[i],hosts[j]);
+      if (tmp){
+	printf ("  <route src=\"%s\" dst=\"%s\">\n    ",
+		SD_workstation_get_name(hosts[i]),
+		SD_workstation_get_name(hosts[j]));
+      
+	tmp_length = SD_route_get_size(hosts[i],hosts[j]);
+	for (k=0; k<tmp_length;k++){
+	  printf("<link:ctn id=\"%s\"/>", SD_link_get_name(tmp[k]));
+	}
+	printf("\n  </route>\n");
+      }
+    }
+  }
+  printf("</platform>\n");
+  SD_exit();
+  
+  return 0;
+}
+
+
diff --git a/teshsuite/simdag/platforms/flatifier.tesh b/teshsuite/simdag/platforms/flatifier.tesh
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/teshsuite/simdag/platforms/flatifier.tesh
@@ -0,0 +1 @@
+