X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8092ea60f159017ed79fe804bc2cde24a3e8816..cfefa1074ef398523f1c20916403757d4016718a:/tools/gras/stub_generator.c diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index f6445cf6ee..da7fb8aebd 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -9,7 +9,8 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/sysdep.h" -#include "surf/surf_parse.h" +#include "xbt/log.h" +#include "surf/surf_parse_private.h" #include "surf/surf.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator"); @@ -162,10 +163,9 @@ static void generate_sim(char *project) fprintf(OUT, "\n%s\n",warning); fprintf(OUT, "%s", "int main (int argc,char *argv[]) {\n" - " int i,j;\n" "\n" " /* Simulation setup */\n" - " MSG_global_init_args(&argc,argv);\n" + " MSG_global_init(&argc,argv);\n" " if (argc != 3) {\n" " fprintf(stderr, \"Usage: %s platform_file application_description.txt [--gras-log=...]\\n\",argv[0]);\n" " exit(1);\n" @@ -173,7 +173,7 @@ static void generate_sim(char *project) "\n"); fprintf(OUT, " MSG_paje_output(\"%s.trace\");\n" - " MSG_set_channel_number(10); /* Using at most 10 channel (ports) per host. Change it here if needed */\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" "\n" " /* Application deployment */\n", @@ -437,9 +437,6 @@ static void generate_makefile_local(char *project, char *deployment) static void generate_makefile_remote(char *project, char *deployment) { - xbt_dict_cursor_t cursor=NULL; - char *key = NULL; - void *data = NULL; char *filename = NULL; FILE *OUT = NULL; @@ -606,6 +603,6 @@ int main(int argc, char *argv[]) generate_deployment(project_name, deployment_file); free(warning); - surf_finalize(); + surf_exit(); return 0; }