X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fa53b835dfc3ee0e2483784d644e26134e7d9d9..a5df3137d0c7edb988478158a8237c0e849c8594:/tools/gras/stub_generator.c

diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index 628c28a9bd..4b7a570f8d 100644
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -19,6 +19,7 @@
 #include "xbt/log.h"
 #include "surf/surfxml_parse.h"
 #include "surf/surf.h"
+#include "portable.h" /* Needed for the time of the SIMIX convertion */
 
 #include <stdarg.h>
 
@@ -279,13 +280,13 @@ const char *SIM_PREEMBULE =
 
 const char *SIM_MAIN_POSTEMBULE = "\n"
 "\n"
-"  MSG_launch_application(argv[2]);\n"
+"  gras_launch_application(argv[2]);\n"
 "\n"
 "  /*  Run the simulation */\n"
-"  MSG_main();\n"
+"  gras_main();\n"
 "\n"
 "  /* cleanup the place */\n"
-"  MSG_clean();\n"
+"  gras_clean();\n"
 "  if (gras_log)\n"
 "    free(gras_log);\n"
 "  return 0;\n"
@@ -408,21 +409,19 @@ static void generate_sim(char *project)
 	fprintf(OUT, "%s", "int main (int argc,char *argv[]) {\n"
 	"\n" 
 	"  /*  Simulation setup */\n" 
-	"  MSG_global_init(&argc,argv);\n" 
+	"  gras_global_init(&argc,argv);\n"
 	"  if (argc != 3) {\n" 
 	"    fprintf(stderr, \"Usage: %s platform.xml deployment.xml [--gras-log=...]\\n\",argv[0]);\n" 
 	"    exit(1);\n" 
 	"  }\n"
 	"\n");
-	fprintf(OUT, 
-	"  MSG_paje_output(\"%s.trace\");\n" 
-	"  MSG_set_channel_number(XBT_MAX_CHANNEL); /* Using at most 10 channel (ports) per host. Change it here if needed */\n" 
-	"  MSG_create_environment(argv[1]);\n" 
+	fprintf(OUT,
+	"  gras_create_environment(argv[1]);\n" 
 	"\n" 
-	"  /*  Application deployment */\n",
-	project);
+	"  /*  Application deployment */\n"
+	);
 	xbt_dict_foreach(process_function_set,cursor,key,data) {
-		fprintf(OUT,"  MSG_function_register(\"%s\", launch_%s);\n",key,key);
+		fprintf(OUT,"  gras_function_register(\"%s\", launch_%s);\n",key,key);
 	}
 	fprintf(OUT, "%s", SIM_MAIN_POSTEMBULE);
 	fclose(OUT);
@@ -457,7 +456,7 @@ static void generate_rl(char *project)
                  "#include <signal.h>\n" \
                  "#include <gras.h>\n" \
                  "\n" \
-                 "extern const char * XBT_PUBLIC_DATA _gras_procname;\n" \
+                 "XBT_PUBLIC_DATA(const char *) _gras_procname;\n" \
                  "/* user code */\n" \
                  "int %s(int argc, char *argv[]);\n" \
                  "\n" \