X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5ad9531aeffe7130cb9a83488f11b181519651d0..a0a65d723d4b060b6676e028cffb7af41869c4a8:/examples/gras_stub_generator

diff --git a/examples/gras_stub_generator b/examples/gras_stub_generator
index 9670c753ea..ff8a6b6e4d 100755
--- a/examples/gras_stub_generator
+++ b/examples/gras_stub_generator
@@ -48,6 +48,8 @@ $warn
 #include <msg.h>
 #include <gras.h>
 
+char *gras_log=NULL;
+    
 EOF
  ;
 foreach (keys %process) { print OUT "int $_(int argc,char *argv[]);\n";        }
@@ -57,12 +59,19 @@ print OUT "\n$warn\n";
 
 foreach (keys %process) {
     print OUT<<EOF
-int launch_$_(int argc, char *argv[]) {
+int launch_$_(int argc, char **argv) {
+  char **myargv=argv;
+  int i;
     
-  if (gras_process_init()) exit(1);
+  if (gras_log) {
+    myargv=malloc((argc+1) * sizeof(char**));
+    for (i=0; i<argc; i++)
+      myargv[i] = argv[i];
+    myargv[argc++] = gras_log;
+  }
   $_(argc,argv);
-  if (gras_process_exit()) exit(1);
-
+  if (myargv != argv)
+    free(myargv);
   return 0;
 }
 
@@ -73,14 +82,25 @@ print OUT "\n$warn\n";
 
 print OUT <<EOF
 int main (int argc,char *argv[]) {
-    
-  if (argc < 3) {
-    fprintf(stderr, "Usage: %s platform_file application_description.txt [extra args]\\n",argv[0]);
-    exit(1);
+  int i,j;
+
+  /** Save the gras-log argument */
+  for (i=1; i<argc; i++) {
+    if (!strncmp(argv[i],"--gras-log=",strlen("--gras-log="))) {
+      gras_log = argv[i];
+      for (j=i+1; j<argc; j++) {
+	argv[j-1] = argv[j];
+      } 
+      argv[j-1] = NULL;
+      argc--;
+      i--; /* compensate effect of next loop incrementation */
+    }
   }
 
-  /* GRAS setup */
-  gras_init(&argc, argv);
+  if (argc != 3) {
+    fprintf(stderr, "Usage: %s platform_file application_description.txt [--gras-log=...]\\n",argv[0]);
+    exit(1);
+  }
 
   /*  Simulation setup */
   MSG_global_init();
@@ -127,11 +147,7 @@ $warn
 int main(int argc, char *argv[]){
   int errcode;
 
-  gras_init(&argc,argv);
-  gras_process_init();
   errcode=$pname(argc,argv);
-  gras_process_exit();
-  gras_exit();
  
   return errcode;
 }