X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d5836a5d0f7d04b47a0eb9c6bab4d793e2c61ea0..fd28ea3d66eee426ac29108bc8a5d4f017dc326d:/examples/gras_stub_generator?ds=sidebyside

diff --git a/examples/gras_stub_generator b/examples/gras_stub_generator
index 0914718d07..84a1c8b18e 100755
--- a/examples/gras_stub_generator
+++ b/examples/gras_stub_generator
@@ -9,8 +9,9 @@
 # under the terms of the license (GNU LGPL) which comes with this package.
   
 use strict;
-use warnings;
-
+eval qq{
+  use warnings;
+}; # warnings not defined in 5.00503/sun4-solaris
 
 sub usage {
     my ($msg)=@_;
@@ -48,6 +49,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 +60,22 @@ print OUT "\n$warn\n";
 
 foreach (keys %process) {
     print OUT<<EOF
-int launch_$_(int argc, char *argv[]) {
-  if (gras_process_init()) exit(1);
-  $_(argc,argv);
-  if (gras_process_exit()) exit(1);
-
-  return 0;
+int launch_$_(int argc, char **argv) {
+  char **myargv=argv;
+  int myargc=argc;
+  int i;
+  int retcode;
+    
+  if (gras_log) {
+    myargv=malloc((argc+1) * sizeof(char**));
+    for (i=0; i<argc; i++)
+      myargv[i] = argv[i];
+    myargv[myargc++] = gras_log;
+  }
+  retcode = $_(myargc,myargv);
+  if (myargv != argv)
+    free(myargv);
+  return retcode;
 }
 
 EOF
@@ -72,13 +85,34 @@ print OUT "\n$warn\n";
 
 print OUT <<EOF
 int main (int argc,char *argv[]) {
+  int i,j;
+
+  /* Save the gras-log argument of real command line to pass it to all processes */
+  for (i=1; i<argc; i++) {
+    if (!strncmp(argv[i],"--gras-log=",strlen("--gras-log="))) {
+      if (gras_log) {
+	 char *tmp=malloc(strlen(gras_log)+strlen(argv[i])+2);
+	 sprintf(tmp,"%s %s",gras_log, argv[i]);
+	 free(gras_log);
+	 gras_log=tmp;
+      } else {
+         gras_log = strdup(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 */
+    }
+  }
 
   if (argc != 3) {
-    fprintf(stderr, "Usage: %s platform_file application_description.txt\\n",argv[0]);
+    fprintf(stderr, "Usage: %s platform_file application_description.txt [--gras-log=...]\\n",argv[0]);
     exit(1);
   }
 
-  /*  Simulation setting */
+  /*  Simulation setup */
   MSG_global_init();
   MSG_set_verbosity(MSG_SILENT);
   MSG_set_channel_number(GRAS_MAX_CHANNEL);
@@ -97,6 +131,10 @@ print OUT <<EOF
   /*  Run the simulation */
   MSG_main();
 
+  /* cleanup the place */
+  MSG_clean();
+  if (gras_log)
+    free(gras_log);
   return 0;
 }
 $warn
@@ -123,11 +161,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;
 }