mv surf_parse -> surfxml_parse

[simgrid.git] / tools / gras / stub_generator.c

diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c
index 1446f91..8e0cb51 100644 (file)
--- a/tools/gras/stub_generator.c
+++ b/tools/gras/stub_generator.c
@@ -8,11 +8,9 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include"xbt/sysdep.h"
-#include"xbt/dict.h"
-#include"xbt/dynar.h"
-#include"xbt/error.h"
-#include "surf/surf_parse.h"
+#include "xbt/sysdep.h"
+#include "xbt/log.h"
+#include "surf/surfxml_parse.h"
 #include "surf/surf.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator");
@@ -67,23 +65,6 @@ const char *SIM_PREEMBULE =
 "  return retcode;\n" \
 "}\n"
 
-#define SIM_MAIN_PREEMBULE \
-"int main (int argc,char *argv[]) {\n" \
-"  int i,j;\n" \
-"\n" \
-"  /*  Simulation setup */\n" \
-"  MSG_global_init_args(&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" \
-"  }\n" \
-"\n" \
-"  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_create_environment(argv[1]);\n" \
-"\n" \
-"  /*  Application deployment */\n"
-
 const char *SIM_MAIN_POSTEMBULE = "\n"
 "\n"
 "  MSG_launch_application(argv[2]);\n"
@@ -181,7 +162,22 @@ static void generate_sim(char *project)
   }
   fprintf(OUT, "\n%s\n",warning);
 
-  fprintf(OUT, SIM_MAIN_PREEMBULE, project);
+  fprintf(OUT, "%s", "int main (int argc,char *argv[]) {\n" 
+                     "\n" 
+                    "  /*  Simulation setup */\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" 
+                     "  }\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" 
+          "\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);
   }
@@ -441,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;
 
@@ -610,6 +603,6 @@ int main(int argc, char *argv[])
   generate_deployment(project_name, deployment_file);
 
   free(warning);
-  surf_finalize();
+  surf_exit();
   return 0;
 }