" return retcode;\n" \
"}\n"
-const char* 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_set_channel_number(10); // GRAS_MAX_CHANNEL hardcoded since Alvin killed its definition\n"
-" MSG_create_environment(argv[1]);\n"
-"\n"
-" /* Application deployment */\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"
" return 0;\n"
"}\n";
-/**********************************************/
-/**** Generate the file for the real life *****/
-/**********************************************/
-#define RL_CODE \
-"#include <stdio.h>\n" \
-"#include <signal.h>\n" \
-"#include <gras.h>\n" \
-"\n" \
-"/* user code */\n" \
-"int %s(int argc, char *argv[]);\n" \
-"\n" \
-"int main(int argc, char *argv[]){\n" \
-" int errcode;\n" \
-"\n" \
-" errcode=%s(argc,argv);\n"\
-" \n" \
-" return errcode;\n"\
-"}\n"
/**********************************************/
/********* Parse XML deployment file **********/
}
fprintf(OUT, "\n%s\n",warning);
- fprintf(OUT, "%s", SIM_MAIN_PREEMBULE);
+ fprintf(OUT, SIM_MAIN_PREEMBULE, project);
xbt_dict_foreach(process_function_set,cursor,key,data) {
fprintf(OUT," MSG_function_register(\"%s\", launch_%s);\n",key,key);
}
free(filename);
}
+/**********************************************/
+/**** Generate the file for the real life *****/
+/**********************************************/
static void generate_rl(char *project)
{
xbt_dict_cursor_t cursor=NULL;
xbt_assert1(OUT, "Unable to open %s for writing",filename);
fprintf(OUT, "\n%s\n",warning);
- fprintf(OUT, RL_CODE, key,key);
+ fprintf(OUT, "#include <stdio.h>\n" \
+ "#include <signal.h>\n" \
+ "#include <gras.h>\n" \
+ "\n" \
+ "extern const char *_gras_procname;\n" \
+ "/* user code */\n" \
+ "int %s(int argc, char *argv[]);\n" \
+ "\n" \
+ "int main(int argc, char *argv[]){\n" \
+ " int errcode;\n" \
+ "\n" \
+ " _gras_procname = \"%s\";\n" \
+ " errcode=%s(argc,argv);\n"\
+ " \n" \
+ " return errcode;\n"\
+ "}\n",
+ key,key,key);
fprintf(OUT, "\n%s\n",warning);
fclose(OUT);
free(filename);
OUT=fopen(filename,"w");
xbt_assert1(OUT, "Unable to open %s for writing",filename);
-
+ free(filename);
+
fprintf(OUT, "############ PROJECT COMPILING AND ARCHIVING #########\n");
fprintf(OUT, "PROJECT_NAME=%s\n",project);
fprintf(OUT,
"DISTDIR=gras-$(PROJECT_NAME)\n\n"
- "SIMGRID_INSTALL_PATH?= $(shell echo \"\\\"<<<< SIMGRID_INSTALL_PATH undefined !!! >>>>\\\"\")\n"
+ "GRAS_ROOT?= $(shell echo \"\\\"<<<< GRAS_ROOT undefined !!! >>>>\\\"\")\n"
"CFLAGS = -O3 -w\n"
- "INCLUDES = -I$(SIMGRID_INSTALL_PATH)/include\n"
- "LIBS_SIM = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lsimgrid\n"
- "LIBS_RL = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lgras\n"
+ "INCLUDES = -I$(GRAS_ROOT)/include\n"
+ "LIBS_SIM = -lm -L$(GRAS_ROOT)/lib/ -lsimgrid\n"
+ "LIBS_RL = -lm -L$(GRAS_ROOT)/lib/ -lgras\n"
+ "LIBS = \n"
"\n");
fprintf(OUT, "C_FILES = ");
"all: $(BIN_FILES)\n"
"\n");
fprintf(OUT, SIM_BINARYNAME ": " SIM_OBJNAME " %s.o\n",project, project, project);
- fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_SIM) $(LDADD) -o $@ \n");
+ fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_SIM) $(LIBS) $(LDADD) -o $@ \n");
xbt_dict_foreach(process_function_set,cursor,key,data) {
fprintf(OUT, RL_BINARYNAME " : " RL_OBJNAME " %s.o\n", project, key, project, key, project);
- fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_RL) $(LDADD) -o $@ \n");
+ fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_RL) $(LIBS) $(LDADD) -o $@ \n");
}
fprintf(OUT,
"\n"
fprintf(OUT,
"INSTALL_PATH ?='$$HOME/tmp/src' ### Has to be an absolute path !!! \n"
+ "GRAS_ROOT ?='$(INSTALL_PATH)' ### Has to be an absolute path !!! \n"
"SRCDIR ?= ./\n"
"SIMGRID_URL ?=http://gcl.ucsd.edu/simgrid/dl/\n"
- "SIMGRID_VERSION ?=2.91\n"
+ "SIMGRID_VERSION ?=2.92\n"
"GRAS_PROJECT ?= %s\n"
"GRAS_PROJECT_URL ?= http://www-id.imag.fr/Laboratoire/Membres/Legrand_Arnaud/gras_test/\n"
"\n"
"\t for site in $(MACHINES) ; do \\\n"
"\t machine=`echo $$site |sed 's/^\\([^%%]*\\)%%.*$$/\\1/'`;\\\n"
"\t machine2=`echo $$site |sed 's/^\\([^%%]*\\)%%\\(.*\\)$$/\\2/'`;\\\n"
- "\t cmd_mkdir=\"\\\"sh -c 'env INSTALL_PATH=$(INSTALL_PATH) SIMGRID_INSTALL_PATH=$(INSTALL_PATH) \\\n"
+ "\t cmd_mkdir=\"\\\"sh -c 'env INSTALL_PATH=$(INSTALL_PATH) GRAS_ROOT=$(GRAS_ROOT) \\\n"
"\t SIMGRID_URL=$(SIMGRID_URL) SIMGRID_VERSION=$(SIMGRID_VERSION) GRAS_PROJECT=$(GRAS_PROJECT) \\\n"
"\t GRAS_PROJECT_URL=$(GRAS_PROJECT_URL) mkdir -p $(INSTALL_PATH) 2>&1'\\\"\";\\\n"
- "\t cmd_make=\"\\\"sh -c 'env INSTALL_PATH=$(INSTALL_PATH) SIMGRID_INSTALL_PATH=$(INSTALL_PATH) \\\n"
+ "\t cmd_make=\"\\\"sh -c 'env INSTALL_PATH=$(INSTALL_PATH) GRAS_ROOT=$(GRAS_ROOT) \\\n"
"\t SIMGRID_URL=$(SIMGRID_URL) SIMGRID_VERSION=$(SIMGRID_VERSION) GRAS_PROJECT=$(GRAS_PROJECT) \\\n"
"\t GRAS_PROJECT_URL=$(GRAS_PROJECT_URL) make -C $(INSTALL_PATH) -f "MAKEFILE_FILENAME_REMOTE" $(ACTION) 2>&1'\\\"\";\\\n"
"\t if echo $$site | grep '%%' >/dev/null ; then \\\n"
"INSTALL_PATH ?= $(shell pwd)\n"
"\n"
"compile-simgrid:\n"
+ "\tcd $$GRAS_ROOT ; \\\n"
"\tretrieved=`LANG=C;wget -N $(SIMGRID_URL)/simgrid-$(SIMGRID_VERSION).tar.gz 2>&1 | grep newer | sed 's/.*no newer.*/yes/'`; \\\n"
"\techo $$retrieved; \\\n"
"\tif test \"x$$retrieved\" = x; then \\\n"
"\t tar zxf simgrid-$(SIMGRID_VERSION).tar.gz ; \\\n"
"\t cd simgrid-$(SIMGRID_VERSION)/; \\\n"
- "\t ./configure --prefix=$(INSTALL_PATH) ; \\\n"
+ "\t ./configure --prefix=$$GRAS_ROOT ; \\\n"
"\t make all install ;\\\n"
"\tfi\n"
"\n"
"if test \"${INSTALL_PATH+set}\" != set; then \n"
" export INSTALL_PATH='`echo $HOME`/tmp/src'\n"
"fi\n"
+ "if test \"${GRAS_ROOT+set}\" != set; then \n"
+ " export GRAS_ROOT='`echo $INSTALL_PATH`'\n"
+ "fi\n"
"if test \"${SRCDIR+set}\" != set; then \n"
" export SRCDIR=./\n"
"fi\n"
project);
fprintf(OUT,
- "cmd_prolog=\"env INSTALL_PATH=$INSTALL_PATH SIMGRID_INSTALL_PATH=$INSTALL_PATH \\\n"
+ "cmd_prolog=\"env INSTALL_PATH=$INSTALL_PATH GRAS_ROOT=$GRAS_ROOT \\\n"
" SIMGRID_URL=$SIMGRID_URL SIMGRID_VERSION=$SIMGRID_VERSION GRAS_PROJECT=$GRAS_PROJECT \\\n"
- " GRAS_PROJECT_URL=$GRAS_PROJECT_URL LD_LIBRARY_PATH=$SIMGRID_INSTALL_PATH/lib/ sh -c \";\n");
+ " GRAS_PROJECT_URL=$GRAS_PROJECT_URL LD_LIBRARY_PATH=$GRAS_ROOT/lib/ sh -c \";\n");
xbt_dynar_foreach (process_list,cpt,proc) {
fprintf(OUT,"cmd=\"\\$INSTALL_PATH/gras-%s/"RL_BINARYNAME" ",project,project,proc.argv[0]);
fprintf(OUT,"%s ",proc.argv[i]);
}
fprintf(OUT,"\";\n");
- fprintf(OUT,"ssh %s \"$cmd_prolog 'export LD_LIBRARY_PATH=\\$INSTALL_PATH/lib:\\$LD_LIBRARY_PATH; echo \\\"$cmd\\\" ; $cmd 2>&1'\" > runlogs/%s_%d.log\n",proc.host,proc.host,cpt);
+ fprintf(OUT,"ssh %s \"$cmd_prolog 'export LD_LIBRARY_PATH=\\$INSTALL_PATH/lib:\\$LD_LIBRARY_PATH; echo \\\"$cmd\\\" ; $cmd 2>&1'\" > runlogs/%s_%d.log &\n",proc.host,proc.host,cpt);
}
fclose(OUT);
generate_deployment(project_name, deployment_file);
free(warning);
+ surf_finalize();
return 0;
}