X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51022ee04ab58f07c6ee48dec454c63c96de4f76..0f5509273af174fc845f00268eb6430cf22d8ee0:/tools/gras/stub_generator.c diff --git a/tools/gras/stub_generator.c b/tools/gras/stub_generator.c index cdd863cea1..8e0cb51e16 100644 --- a/tools/gras/stub_generator.c +++ b/tools/gras/stub_generator.c @@ -8,11 +8,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include"xbt/sysdep.h" -#include"xbt/dict.h" -#include"xbt/dynar.h" -#include"xbt/error.h" -#include "surf/surf_parse.h" +#include "xbt/sysdep.h" +#include "xbt/log.h" +#include "surf/surfxml_parse.h" #include "surf/surf.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen,gras,"Stub generator"); @@ -67,22 +65,6 @@ 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"; - const char *SIM_MAIN_POSTEMBULE = "\n" "\n" " MSG_launch_application(argv[2]);\n" @@ -97,25 +79,7 @@ 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 **********/ @@ -198,7 +162,22 @@ static void generate_sim(char *project) } fprintf(OUT, "\n%s\n",warning); - fprintf(OUT, "%s", SIM_MAIN_PREEMBULE); + fprintf(OUT, "%s", "int main (int argc,char *argv[]) {\n" + "\n" + " /* Simulation setup */\n" + " MSG_global_init(&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"); + fprintf(OUT, + " MSG_paje_output(\"%s.trace\");\n" + " MSG_set_channel_number(XBT_MAX_CHANNEL); /* Using at most 10 channel (ports) per host. Change it here if needed */\n" + " MSG_create_environment(argv[1]);\n" + "\n" + " /* Application deployment */\n", + project); xbt_dict_foreach(process_function_set,cursor,key,data) { fprintf(OUT," MSG_function_register(\"%s\", launch_%s);\n",key,key); } @@ -207,6 +186,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; @@ -223,7 +205,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); @@ -307,16 +305,18 @@ static void generate_makefile_local(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_SIM = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lsimgrid\n" - "LIBS_RL = -lm -L$(SIMGRID_INSTALL_PATH)/lib/ -lgras\n" + "GRAS_ROOT?= $(shell echo \"\\\"<<<< GRAS_ROOT undefined !!! >>>>\\\"\")\n" + "CFLAGS = -O3 -w -g\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 = "); @@ -341,10 +341,10 @@ static void generate_makefile_local(char *project, char *deployment) "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" @@ -362,15 +362,22 @@ static void generate_makefile_local(char *project, char *deployment) "\n" "dist: clean distdir\n" "\ttar c $(DISTDIR) | gzip -c > $(DISTDIR).tar.gz\n" - "\n" + "\n", project, project); + + fprintf(OUT, "clean:\n" - "\trm -f $(BIN_FILES) $(OBJ_FILES) *~\n" + "\trm -f $(BIN_FILES) $(OBJ_FILES) *~ %s.o " SIM_OBJNAME, project, project); + xbt_dict_foreach(process_function_set,cursor,key,data) { + fprintf(OUT, " " RL_OBJNAME, project, key); + } + fprintf(OUT, + "\n" "\trm -rf $(DISTDIR)\n" "\n" ".SUFFIXES:\n" ".PHONY : clean\n" - "\n", project, project); - + "\n"); + fprintf(OUT, "############ REMOTE COMPILING #########\n"); fprintf(OUT, "MACHINES ?= "); @@ -381,9 +388,10 @@ static void generate_makefile_local(char *project, char *deployment) 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" @@ -393,10 +401,10 @@ static void generate_makefile_local(char *project, char *deployment) "\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" @@ -429,9 +437,6 @@ static void generate_makefile_local(char *project, char *deployment) 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; @@ -445,12 +450,13 @@ static void generate_makefile_remote(char *project, char *deployment) "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" @@ -506,6 +512,9 @@ static void generate_deployment(char *project, char *deployment) "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" @@ -526,9 +535,9 @@ static void generate_deployment(char *project, char *deployment) 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]); @@ -536,7 +545,7 @@ static void generate_deployment(char *project, char *deployment) 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); @@ -594,5 +603,6 @@ int main(int argc, char *argv[]) generate_deployment(project_name, deployment_file); free(warning); + surf_exit(); return 0; }