X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5f5acb91cd8c443b96649b17bacf716c6a4e826..fade06d89df37668a5c860369f303336b982d9e0:/tools/gras/unix_stub_generator.c

diff --git a/tools/gras/unix_stub_generator.c b/tools/gras/unix_stub_generator.c
index 2fee052b3f..4642ef30f0 100644
--- a/tools/gras/unix_stub_generator.c
+++ b/tools/gras/unix_stub_generator.c
@@ -1,5 +1,3 @@
-/* 	$Id$	 */
-
 /* gras_stub_generator - creates the main() to use a GRAS program           */
 
 /* Copyright (c) 2003-2007 Martin Quinson, Arnaud Legrand, Malek Cherier.   */
@@ -58,21 +56,19 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(stubgen);
 #define MAKEFILE_FILENAME_REMOTE  "%s.Makefile.remote"
 #define DEPLOYMENT  "%s.deploy.sh"
 
-char *warning = NULL;
-
 /**********************************************/
 /**** Generate the file for the simulator *****/
 /**********************************************/
 
 const char *SIM_PREEMBULE =
-  "/* specific to Borland Compiler */\n"
-  "#ifdef __BORLANDC__\n"
-  "#pragma hdrstop\n"
-  "#endif\n\n"
-  "#include <stdlib.h>\n"
-  "#include <stdio.h>\n"
-  "#include \"msg/msg.h\"\n"
-  "#include <gras.h>\n" "\n" "char *gras_log=NULL;\n";
+    "/* specific to Borland Compiler */\n"
+    "#ifdef __BORLANDC__\n"
+    "#pragma hdrstop\n"
+    "#endif\n\n"
+    "#include <stdlib.h>\n"
+    "#include <stdio.h>\n"
+    "#include \"msg/msg.h\"\n"
+    "#include <gras.h>\n" "\n" "char *gras_log=NULL;\n";
 
 
 #define SIM_LAUNCH_FUNC  \
@@ -95,15 +91,15 @@ const char *SIM_PREEMBULE =
 "}\n"
 
 const char *SIM_MAIN_POSTEMBULE = "\n"
-  "\n"
-  "  gras_launch_application(argv[2]);\n"
-  "\n"
-  "  /*  Run the simulation */\n"
-  "  gras_main();\n"
-  "\n"
-  "  /* cleanup the place */\n"
-  "  gras_clean();\n"
-  "  if (gras_log)\n" "    free(gras_log);\n" "  return 0;\n" "}\n";
+    "\n"
+    "  gras_launch_application(argv[2]);\n"
+    "\n"
+    "  /*  Run the simulation */\n"
+    "  gras_main();\n"
+    "\n"
+    "  /* cleanup the place */\n"
+    "  gras_clean();\n"
+    "  if (gras_log)\n" "    free(gras_log);\n" "  return 0;\n" "}\n";
 
 
 
@@ -122,7 +118,7 @@ void generate_sim(char *project)
 
   FICOUT = fopen(filename, "w");
 
-  xbt_assert1(FICOUT, "Unable to open %s for writing", filename);
+  xbt_assert(FICOUT, "Unable to open %s for writing", filename);
 
   fprintf(FICOUT, "%s\n", warning);
   fprintf(FICOUT, "%s", SIM_PREEMBULE);
@@ -158,7 +154,8 @@ void generate_sim(char *project)
           "  gras_create_environment(argv[1]);\n"
           "\n" "  /*  Application deployment */\n");
   xbt_dict_foreach(process_function_set, cursor, key, data) {
-    fprintf(FICOUT, "  gras_function_register(\"%s\", launch_%s);\n", key, key);
+    fprintf(FICOUT, "  gras_function_register(\"%s\", launch_%s);\n", key,
+            key);
   }
   fprintf(FICOUT, "%s", SIM_MAIN_POSTEMBULE);
   fclose(FICOUT);
@@ -178,12 +175,13 @@ void generate_rl(char *project)
 
   xbt_dict_foreach(process_function_set, cursor, key, data) {
     filename =
-      xbt_new(char, strlen(project) + strlen(RL_SOURCENAME) + strlen(key));
+        xbt_new(char,
+                strlen(project) + strlen(RL_SOURCENAME) + strlen(key));
 
     sprintf(filename, RL_SOURCENAME, project, key);
 
     FICOUT = fopen(filename, "w");
-    xbt_assert1(FICOUT, "Unable to open %s for writing", filename);
+    xbt_assert(FICOUT, "Unable to open %s for writing", filename);
 
     fprintf(FICOUT, "\n%s\n", warning);
     fprintf(FICOUT, "/* specific to Borland Compiler */\n"
@@ -226,7 +224,7 @@ void generate_makefile_am(char *project, char *deployment)
   sprintf(filename, MAKEFILE_FILENAME_AM, project);
 
   FICOUT = fopen(filename, "w");
-  xbt_assert1(FICOUT, "Unable to open %s for writing", filename);
+  xbt_assert(FICOUT, "Unable to open %s for writing", filename);
 
   fprintf(FICOUT, "# AUTOMAKE variable definition\n");
   fprintf(FICOUT, "INCLUDES= @CFLAGS_SimGrid@\n\n");
@@ -290,11 +288,12 @@ void generate_makefile_local(char *project, char *deployment)
   char *filename = NULL;
   FILE *FICOUT = NULL;
 
-  filename = xbt_new(char, strlen(project) + strlen(MAKEFILE_FILENAME_LOCAL));
+  filename =
+      xbt_new(char, strlen(project) + strlen(MAKEFILE_FILENAME_LOCAL));
   sprintf(filename, MAKEFILE_FILENAME_LOCAL, project);
 
   FICOUT = fopen(filename, "w");
-  xbt_assert1(FICOUT, "Unable to open %s for writing", filename);
+  xbt_assert(FICOUT, "Unable to open %s for writing", filename);
   free(filename);
 
   fprintf(FICOUT,
@@ -325,7 +324,8 @@ void generate_makefile_local(char *project, char *deployment)
   }
   fprintf(FICOUT, "\n");
 
-  fprintf(FICOUT, "OBJ_FILES = $(patsubst %%.c,%%.o,$(PRECIOUS_C_FILES))\n");
+  fprintf(FICOUT,
+          "OBJ_FILES = $(patsubst %%.c,%%.o,$(PRECIOUS_C_FILES))\n");
 
   fprintf(FICOUT, "BIN_FILES = ");
 
@@ -352,13 +352,13 @@ void generate_makefile_local(char *project, char *deployment)
           deployment);
 
   fprintf(FICOUT, "\n## Generate the binaries\n");
-  fprintf(FICOUT, SIM_BINARYNAME ": " SIM_OBJNAME " $(OBJ_FILES)\n", project,
-          project);
+  fprintf(FICOUT, SIM_BINARYNAME ": " SIM_OBJNAME " $(OBJ_FILES)\n",
+          project, project);
   fprintf(FICOUT,
           "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_SIM) $(LIBS) $(LDADD) -o $@ \n");
   xbt_dict_foreach(process_function_set, cursor, key, data) {
-    fprintf(FICOUT, RL_BINARYNAME " : " RL_OBJNAME " $(OBJ_FILES)\n", project,
-            key, project, key);
+    fprintf(FICOUT, RL_BINARYNAME " : " RL_OBJNAME " $(OBJ_FILES)\n",
+            project, key, project, key);
     fprintf(FICOUT,
             "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_RL) $(LIBS) $(LDADD) -o $@ \n");
   }
@@ -371,7 +371,7 @@ void generate_makefile_local(char *project, char *deployment)
           "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c -o $@ $<\n" "\n");
 
   fprintf(FICOUT,
-          "## Rules for tarballs and cleaning\n"
+          "## Rules for tarballs and cleaning\n"
           "DIST_FILES= $(EXTRA_DIST) $(GENERATED_C_FILES) $(PRECIOUS_C_FILES) "
           MAKEFILE_FILENAME_LOCAL " " /*MAKEFILE_FILENAME_REMOTE */ "\n"
           "distdir: $(DIST_FILES)\n" "\trm -rf $(DISTDIR)\n"