Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / teshsuite / gras / datadesc / mk_datadesc_structs.pl

diff --git a/teshsuite/gras/datadesc/mk_datadesc_structs.pl b/teshsuite/gras/datadesc/mk_datadesc_structs.pl
index 5c9a121b0b7c2e0738545f4b8fcd6b418b34e722..cc16f5a65f1c110745ca6c0ccc99a274bfdd53d2 100755 (executable)
--- a/teshsuite/gras/datadesc/mk_datadesc_structs.pl
+++ b/teshsuite/gras/datadesc/mk_datadesc_structs.pl
@@ -25,7 +25,7 @@ print "XBT_LOG_NEW_DEFAULT_SUBCATEGORY(structs,test,\"Logs about the gigantic st
 
 print "#define READ  0\n#define WRITE 1\n#define RW    2\n\n";
   
-print "void write_read(const char *type,void *src, void *dst, gras_socket_t *sock, int direction);\n\n";
+print "void write_read(const char *type,void *src, void *dst, xbt_socket_t *sock, int direction);\n\n";
 
 my ($i,$j,$k,$l);
 my $max=scalar @types;
@@ -36,7 +36,7 @@ my $max_j=0;
 my $max_k=$max-1;
 my $max_l=0;     
 for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l) {
-    print "GRAS_DEFINE_TYPE(".$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l].",".
+    print "XBT_DEFINE_TYPE(".$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l].",".
       "struct ".$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l]." { ".
         $types[$i]." a; ".
         $types[$j]." b; ".
@@ -52,12 +52,12 @@ print "void register_structures(void);\n";
 print "void register_structures(void) {\n";
 for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l) {
     my $struct=$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l];
-    print "  gras_msgtype_declare(\"$struct\", gras_datadesc_by_symbol($struct));\n";
+    print "  gras_msgtype_declare(\"$struct\", xbt_datadesc_by_symbol($struct));\n";
 }}}}
 print "}\n";
 
-print "void test_structures(gras_socket_t *sock, int direction);\n";
-print "void test_structures(gras_socket_t *sock, int direction) {\n";
+print "void test_structures(xbt_socket_t *sock, int direction);\n";
+print "void test_structures(xbt_socket_t *sock, int direction) {\n";
 for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l) {
     my $struct=$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l];
     print "  struct $struct my_$struct = {".$val[$i]."+(".$types[$i].")1,"
@@ -66,7 +66,7 @@ for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l
                                            .$val[$l]."+(".$types[$l].")4}, my_${struct}2;\n";
 }}}}
 
-print "  XBT_INFO(\"---- Test on all possible struct having 3 fields (".(($max_i+1)*($max_j+1)*($max_k+1)*($max_l+1))." structs) ----\");\n";
+print "  XBT_INFO(\"---- Test on all possible struct having 4 fields (".(($max_i+1)*($max_j+1)*($max_k+1)*($max_l+1))." structs) ----\");\n";
 for $i (0..$max_i) { for $j (0..$max_j) { for $k (0..$max_k) { for $l (0..$max_l) {
     my $struct=$abrev[$i].$abrev[$j].$abrev[$k].$abrev[$l];
     print "  write_read(\"$struct\", &my_$struct, &my_${struct}2, sock,direction);\n";