X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6ad35ac6e43974e007dc2f81978e669c206d740..6f8ebb23a6f40061a1582065cdf8ae8368903570:/tools/gras/stub_generator.c diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index eb5de727f0..d3eb67fc64 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -10,6 +10,7 @@ #include"xbt/sysdep.h" #include"xbt/dict.h" +#include"xbt/dynar.h" #include"xbt/error.h" #include "surf/surf_parse.h" #include "surf/surf.h" @@ -30,6 +31,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator"); #define MAKEFILE_FILENAME_AM "%s.Makefile.am" #define MAKEFILE_FILENAME_LOCAL "%s.Makefile.local" #define MAKEFILE_FILENAME_REMOTE "%s.Makefile.remote" +#define DEPLOYMENT "%s.deploy.sh" char *warning = NULL; @@ -65,21 +67,22 @@ const char *SIM_PREEMBULE = " 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); // GRAS_MAX_CHANNEL hardcoded since Alvin killed its definition\n" \ +" MSG_create_environment(argv[1]);\n" \ +"\n" \ +" /* Application deployment */\n" const char *SIM_MAIN_POSTEMBULE = "\n" "\n" @@ -95,35 +98,59 @@ const char *SIM_MAIN_POSTEMBULE = "\n" " return 0;\n" "}\n"; -/**********************************************/ -/**** Generate the file for the real life *****/ -/**********************************************/ -#define RL_CODE \ -"#include \n" \ -"#include \n" \ -"#include \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 **********/ /**********************************************/ xbt_dict_t process_function_set = NULL; +xbt_dynar_t process_list = NULL; +xbt_dict_t machine_set = NULL; + +typedef struct s_process_t { + int argc; + char **argv; + char *host; +} s_process_t; + +static void s_process_free(void *process) +{ + int i; + for(i=0;i<((s_process_t*)process)->argc; i++) + free(((s_process_t*)process)->argv[i]); + free(((s_process_t*)process)->host); +} + +static int parse_argc = -1 ; +static char **parse_argv = NULL; static void parse_process_init(void) -{ +{ + parse_argc = 0 ; + parse_argv = NULL; + parse_argc++; + parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_process_function); +} + +static void parse_argument(void) +{ + parse_argc++; + parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *)); + parse_argv[(parse_argc) - 1] = xbt_strdup(A_argument_value); +} + +static void parse_process_finalize(void) +{ + s_process_t process; void *p = (void *) 1234; + xbt_dict_set(process_function_set, A_process_function, p, NULL); + xbt_dict_set(machine_set, A_process_host, p, NULL); + process.argc=parse_argc; + process.argv=parse_argv; + process.host=strdup(A_process_host); + xbt_dynar_push(process_list,&process); } static void generate_sim(char *project) @@ -154,7 +181,7 @@ static void generate_sim(char *project) } 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); } @@ -163,6 +190,9 @@ static void generate_sim(char *project) free(filename); } +/**********************************************/ +/**** Generate the file for the real life *****/ +/**********************************************/ static void generate_rl(char *project) { xbt_dict_cursor_t cursor=NULL; @@ -179,7 +209,23 @@ static void generate_rl(char *project) 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 \n" \ + "#include \n" \ + "#include \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); @@ -250,8 +296,7 @@ static void generate_makefile_am(char *project, char *deployment) fclose(OUT); } - -static void generate_makefile(char *project, char *deployment) +static void generate_makefile_local(char *project, char *deployment) { xbt_dict_cursor_t cursor=NULL; char *key = NULL; @@ -264,23 +309,46 @@ static void generate_makefile(char *project, char *deployment) 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" "CFLAGS = -O3 -w\n" "INCLUDES = -I$(SIMGRID_INSTALL_PATH)/include\n" - "LIBS = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lsimgrid\n" - "\n" - "C_FILES = _chrono_multiplier.c _chrono_simulator.c chrono.c\n" - "BIN_FILES = chrono_multiplier chrono_simulator\n" + "LIBS_SIM = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lsimgrid\n" + "LIBS_RL = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lgras\n" + "LIBS = \n" + "\n"); + + fprintf(OUT, "C_FILES = "); + fprintf(OUT, SIM_SOURCENAME" ",project); + xbt_dict_foreach(process_function_set,cursor,key,data) { + fprintf(OUT, RL_SOURCENAME " ",project, key); + } + fprintf(OUT, "%s.c\n", project); + + fprintf(OUT,"OBJ_FILES = \n"); + + fprintf(OUT, "BIN_FILES = "); + + fprintf(OUT, SIM_BINARYNAME " ",project); + xbt_dict_foreach(process_function_set,cursor,key,data) { + fprintf(OUT, RL_BINARYNAME " ", project, key); + } + fprintf(OUT, "\n"); + + fprintf(OUT, "\n" "all: $(BIN_FILES)\n" "\n"); - fprintf(OUT, SIM_BINARYNAME ": " SIM_OBJNAME " %s.c\n",project, project, project); + fprintf(OUT, SIM_BINARYNAME ": " SIM_OBJNAME " %s.o\n",project, project, project); + 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.c\n", project, key, project, key, project); + fprintf(OUT, RL_BINARYNAME " : " RL_OBJNAME " %s.o\n", project, key, project, key, project); + fprintf(OUT, "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) $^ $(LIBS_RL) $(LIBS) $(LDADD) -o $@ \n"); } fprintf(OUT, "\n" @@ -290,7 +358,8 @@ static void generate_makefile(char *project, char *deployment) "%%.o: %%.c\n" "\t$(CC) $(INCLUDES) $(DEFS) $(CFLAGS) -c -o $@ $<\n" "\n" - "distdir: $(C_FILES) $(PROJECT_NAME).Makefile\n" + "DIST_FILES= $(C_FILES) "MAKEFILE_FILENAME_LOCAL" "MAKEFILE_FILENAME_REMOTE"\n" + "distdir: $(DIST_FILES)\n" "\trm -rf $(DISTDIR)\n" "\tmkdir -p $(DISTDIR)\n" "\tcp $^ $(DISTDIR)\n" @@ -299,11 +368,186 @@ static void generate_makefile(char *project, char *deployment) "\ttar c $(DISTDIR) | gzip -c > $(DISTDIR).tar.gz\n" "\n" "clean:\n" - "\trm -f $(BIN_FILES) *.o *~\n" + "\trm -f $(BIN_FILES) $(OBJ_FILES) *~\n" "\trm -rf $(DISTDIR)\n" "\n" ".SUFFIXES:\n" - ".PHONY : clean\n"); + ".PHONY : clean\n" + "\n", project, project); + + fprintf(OUT, "############ REMOTE COMPILING #########\n"); + fprintf(OUT, + "MACHINES ?= "); + xbt_dict_foreach(machine_set,cursor,key,data) { + fprintf(OUT, "%s ",key); + } + fprintf(OUT,"\n"); + + fprintf(OUT, + "INSTALL_PATH ?='$$HOME/tmp/src' ### Has to be an absolute path !!! \n" + "SIMGRID_INSTALL_PATH ?='$(INSTALL_PATH)' ### Has to be an absolute path !!! \n" + "SRCDIR ?= ./\n" + "SIMGRID_URL ?=http://gcl.ucsd.edu/simgrid/dl/\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" + "remote:\n" + "\t@echo;echo \"----[ Compile the package on remote hosts ]----\"\n" + "\t@test -e $(SRCDIR)/buildlogs/ || mkdir -p $(SRCDIR)/buildlogs/\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=$(SIMGRID_INSTALL_PATH) \\\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=$(SIMGRID_INSTALL_PATH) \\\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" + "\t echo \"----[ Compile on $$machine2 (behind $$machine) ]----\";\\\n" + "\t else \\\n" + "\t machine=$$site;\\\n" + "\t echo \"----[ Compile on $$machine ]----\";\\\n" + "\t fi;\\\n" + "\t if echo $$site | grep '%%' >/dev/null ; then \\\n" + "\t if ssh $$machine \"ssh -A $$machine2 $$cmd_mkdir\" 2>&1 > $(SRCDIR)/buildlogs/$$site.log;\\\n" + "\t then true; else failed=1;echo \"Failed (check $(SRCDIR)/buildlogs/$$site.log)\"; fi;\\\n" + "\t else \\\n" + "\t if ssh $$machine \"eval $$cmd_mkdir\" 2>&1 > $(SRCDIR)/buildlogs/$$site.log ;\\\n" + "\t then true; else failed=1;echo \"Failed (check $(SRCDIR)/buildlogs/$$site.log)\"; fi; \\\n" + "\t fi;\\\n" + "\t echo \"-- Copy the data over\"; \\\n" + "\t scp "MAKEFILE_FILENAME_REMOTE" $$site:$(INSTALL_PATH) ;\\\n" + "\t echo \"-- Compiling... (the output gets into $(SRCDIR)/buildlogs/$$site.log)\"; \\\n" + "\t if echo $$site | grep '%%' >/dev/null ; then \\\n" + "\t if ssh $$machine \"ssh -A $$machine2 $$cmd_make\" 2>&1 >> $(SRCDIR)/buildlogs/$$site.log;\\\n" + "\t then echo \"Sucessful\"; else failed=1;echo \"Failed (check $(SRCDIR)/buildlogs/$$site.log)\"; fi;echo; \\\n" + "\t else \\\n" + "\t if ssh $$machine \"eval $$cmd_make\" 2>&1 >> $(SRCDIR)/buildlogs/$$site.log ;\\\n" + "\t then echo \"Sucessful\"; else failed=1;echo \"Failed (check $(SRCDIR)/buildlogs/$$site.log)\"; fi;echo; \\\n" + "\t fi;\\\n" + "\t done;\n",project,project,project); + + fclose(OUT); +} + +static void generate_makefile_remote(char *project, char *deployment) +{ + xbt_dict_cursor_t cursor=NULL; + char *key = NULL; + void *data = NULL; + char *filename = NULL; + FILE *OUT = NULL; + + filename = xbt_new(char,strlen(project) + strlen(MAKEFILE_FILENAME_REMOTE)); + sprintf(filename,MAKEFILE_FILENAME_REMOTE, project); + + OUT=fopen(filename,"w"); + xbt_assert1(OUT, "Unable to open %s for writing",filename); + + fprintf(OUT, + "INSTALL_PATH ?= $(shell pwd)\n" + "\n" + "compile-simgrid:\n" + "\tcd $$SIMGRID_INSTALL_PATH ; \\\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=$$SIMGRID_INSTALL_PATH ; \\\n" + "\t make all install ;\\\n" + "\tfi\n" + "\n" + "compile-gras: compile-simgrid\n" + "\tnot_retrieved=`LANG=C;wget -N $(GRAS_PROJECT_URL)/gras-$(GRAS_PROJECT).tar.gz 2>&1 | grep newer | sed 's/.*no newer.*/yes/'`; \\\n" + "\techo $$not_retrieved; \\\n" + "\tif test \"x$$not_retrieved\" != xyes; then \\\n" + "\t tar zxf gras-$(GRAS_PROJECT).tar.gz ; \\\n" + "\t make -C gras-$(GRAS_PROJECT)/ -f $(GRAS_PROJECT).Makefile.local all ; \\\n" + "\tfi\n" + "\n" + "clean-simgrid:\n" + "\trm -rf simgrid-$(SIMGRID_VERSION)*\n" + "clean-gras clean-gras-$(GRAS_PROJECT):\n" + "\trm -rf gras-$(GRAS_PROJECT)*\n" + "clean: clean-simgrid clean-gras-$(GRAS_PROJECT)\n" + "\n" + ".PHONY: clean clean-simgrid clean-gras clean-gras-$(GRAS_PROJECT) \\\n" + " compile-simgrid compile-gras\n" + ); + fclose(OUT); +} + + +static void generate_deployment(char *project, char *deployment) +{ + xbt_dict_cursor_t cursor=NULL; + char *key = NULL; + void *data = NULL; + char *filename = NULL; + FILE *OUT = NULL; + + int cpt,i; + s_process_t proc; + + filename = xbt_new(char,strlen(project) + strlen(DEPLOYMENT)); + sprintf(filename,DEPLOYMENT, project); + + OUT=fopen(filename,"w"); + xbt_assert1(OUT, "Unable to open %s for writing",filename); + + fprintf(OUT, "#!/bin/sh\n"); + fprintf(OUT, "############ DEPLOYMENT FILE #########\n"); + fprintf(OUT, + "if test \"${MACHINES+set}\" != set; then \n" + " export MACHINES='"); + xbt_dict_foreach(machine_set,cursor,key,data) { + fprintf(OUT, "%s ",key); + } + fprintf(OUT, + "';\n" + "fi\n" + "if test \"${INSTALL_PATH+set}\" != set; then \n" + " export INSTALL_PATH='`echo $HOME`/tmp/src'\n" + "fi\n" + "if test \"${SIMGRID_INSTALL_PATH+set}\" != set; then \n" + " export SIMGRID_INSTALL_PATH='`echo $INSTALL_PATH`'\n" + "fi\n" + "if test \"${SRCDIR+set}\" != set; then \n" + " export SRCDIR=./\n" + "fi\n" + "if test \"${SIMGRID_URL+set}\" != set; then \n" + " export SIMGRID_URL=http://gcl.ucsd.edu/simgrid/dl/\n" + "fi\n" + "if test \"${SIMGRID_VERSION+set}\" != set; then \n" + " export SIMGRID_VERSION=2.91\n" + "fi\n" + "if test \"${GRAS_PROJECT+set}\" != set; then \n" + " export GRAS_PROJECT=%s\n" + "fi\n" + "if test \"${GRAS_PROJECT_URL+set}\" != set; then \n" + " export GRAS_PROJECT_URL=http://www-id.imag.fr/Laboratoire/Membres/Legrand_Arnaud/gras_test/\n" + "fi\n" + "\n" + "test -e runlogs/ || mkdir -p runlogs/\n", + project); + + fprintf(OUT, + "cmd_prolog=\"env INSTALL_PATH=$INSTALL_PATH SIMGRID_INSTALL_PATH=$SIMGRID_INSTALL_PATH \\\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"); + + xbt_dynar_foreach (process_list,cpt,proc) { + fprintf(OUT,"cmd=\"\\$INSTALL_PATH/gras-%s/"RL_BINARYNAME" ",project,project,proc.argv[0]); + for(i=1;i&1'\" > runlogs/%s_%d.log &\n",proc.host,proc.host,cpt); + } + fclose(OUT); } @@ -325,8 +569,12 @@ int main(int argc, char *argv[]) deployment_file = argv[2]; process_function_set = xbt_dict_new(); + process_list = xbt_dynar_new(sizeof(s_process_t),s_process_free); + machine_set = xbt_dict_new(); STag_process_fun = parse_process_init; + ETag_argument_fun = parse_argument; + ETag_process_fun = parse_process_finalize; surf_parse_open(deployment_file); if(surf_parse()) xbt_assert1(0,"Parse error in %s",deployment_file); surf_parse_close(); @@ -350,9 +598,11 @@ int main(int argc, char *argv[]) generate_sim(project_name); generate_rl(project_name); - generate_makefile_am(project_name, deployment_file); generate_makefile_local(project_name, deployment_file); + generate_makefile_remote(project_name, deployment_file); + generate_deployment(project_name, deployment_file); free(warning); + surf_finalize(); return 0; }