From a5030ee44e0b07c5ce1775ea36cead3c875d89a8 Mon Sep 17 00:00:00 2001 From: donassbr Date: Thu, 26 Apr 2007 08:54:40 +0000 Subject: [PATCH 1/1] Changes to test gras_simix. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3451 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/gras/emul.h | 7 ++++++- tools/gras/stub_generator.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/include/gras/emul.h b/include/gras/emul.h index 8a0028d37f..843478c870 100644 --- a/include/gras/emul.h +++ b/include/gras/emul.h @@ -14,7 +14,12 @@ #include "xbt/misc.h" /* SG_BEGIN_DECL */ SG_BEGIN_DECL() - +XBT_PUBLIC(void) gras_global_init(int *argc, char **argv); +XBT_PUBLIC(void) gras_create_environment(const char *file); +XBT_PUBLIC(void) gras_function_register(const char *name, void* code); +XBT_PUBLIC(void) gras_launch_application(const char *file); +XBT_PUBLIC(void) gras_clean(void); +XBT_PUBLIC(void) gras_main(void); /** @addtogroup GRAS_emul * @brief Code execution "emulation" and "virtualization". * diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index 628c28a9bd..0c5f099a78 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -279,13 +279,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 +408,21 @@ 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" + " //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" + " gras_create_environment(argv[1]);\n" "\n" " /* Application deployment */\n", project); 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); -- 2.20.1