A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make it work on win32; use the portable errno on socks; fix a bug revealed by the...
[simgrid.git]
/
examples
/
gras_stub_generator
diff --git
a/examples/gras_stub_generator
b/examples/gras_stub_generator
index
9830a96
..
5edd69e
100755
(executable)
--- 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;
# 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)=@_;
sub usage {
my ($msg)=@_;
@@
-60,13
+61,21
@@
print OUT "\n$warn\n";
foreach (keys %process) {
print OUT<<EOF
int launch_$_(int argc, char **argv) {
foreach (keys %process) {
print OUT<<EOF
int launch_$_(int argc, char **argv) {
-
+ char **myargv=argv;
+ int myargc=argc;
+ int i;
+ int retcode;
+
if (gras_log) {
if (gras_log) {
- argv=realloc(argv,++argc * sizeof(char**));
- argv[argc-1] = gras_log;
+ myargv=malloc((argc+1) * sizeof(char**));
+ for (i=0; i<argc; i++)
+ myargv[i] = argv[i];
+ myargv[myargc++] = gras_log;
}
}
- $_(argc,argv);
- return 0;
+ retcode = $_(myargc,myargv);
+ if (myargv != argv)
+ free(myargv);
+ return retcode;
}
EOF
}
EOF
@@
-78,10
+87,17
@@
print OUT <<EOF
int main (int argc,char *argv[]) {
int i,j;
int main (int argc,char *argv[]) {
int i,j;
- /*
* Save the gras-log argument
*/
+ /*
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="))) {
for (i=1; i<argc; i++) {
if (!strncmp(argv[i],"--gras-log=",strlen("--gras-log="))) {
- gras_log = argv[i];
+ 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];
}
for (j=i+1; j<argc; j++) {
argv[j-1] = argv[j];
}
@@
-99,7
+115,7
@@
int main (int argc,char *argv[]) {
/* Simulation setup */
MSG_global_init();
MSG_set_verbosity(MSG_SILENT);
/* Simulation setup */
MSG_global_init();
MSG_set_verbosity(MSG_SILENT);
- MSG_set_channel_number(
GRAS_MAX_CHANNEL);
+ MSG_set_channel_number(
10); // GRAS_MAX_CHANNEL hardcoded since Alvin killed its definition
MSG_create_environment(argv[1]);
/* Application deployment */
MSG_create_environment(argv[1]);
/* Application deployment */
@@
-115,6
+131,10
@@
print OUT <<EOF
/* Run the simulation */
MSG_main();
/* Run the simulation */
MSG_main();
+ /* cleanup the place */
+ MSG_clean();
+ if (gras_log)
+ free(gras_log);
return 0;
}
$warn
return 0;
}
$warn