X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/20ab7b029068573eb7ac3d983782a9cb27c96cec..0119ca0d882f90e1b139b9debbf2f9ea7a2bfb7b:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 3a57627b33..014246994c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,17 +1,15 @@ -AM_CFLAGS+= -g @GTNETS_CFLAGS@ #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. # -DNDEBUG cuts asserts and logs at "trace" and "debug" levels. -# -g -ffast-math -funroll-loops -O3 -fno-strict-aliasing -# Those should be added by configure when using gcc -# fast-math is nasty when using IEEE floating point semantic -# strict-aliasing breaks my type-punning bad habit. MAINTAINERCLEANFILES=Makefile.in INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include + +bin_SCRIPTS= smpi/smpicc smpi/smpirun + EXTRA_DIST= \ \ portable.h \ @@ -40,15 +38,14 @@ EXTRA_DIST= \ surf/surfxml.c \ surf/surfxml.dtd \ surf/network_private.h \ - surf/network_dassf_private.h \ - surf/workstation_KCCFLN05_private.h \ + surf/network_gtnets_private.h \ \ include/surf/maxmin.h \ include/surf/trace_mgr.h \ include/surf/surf.h \ include/surf/surfxml_parse_private.h \ \ - include/xbt/xbt_portability.h \ + include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ include/xbt/context.h \ \ @@ -56,11 +53,15 @@ EXTRA_DIST= \ \ simdag/private.h \ \ + gras/DataDesc/ddt_parse.yy.l \ + gras/Virtu/virtu_interface.h \ amok/Bandwidth/bandwidth_private.h \ - amok/amok_modinter.h + amok/amok_modinter.h \ + \ + include/simix/simix.h include/simix/datatypes.h \ + simix/private.h \ \ - include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h + smpi/private.h #LIBRARY_VERSION= 0:0:0 # | | | @@ -113,7 +114,7 @@ XBT_SRC=\ xbt_modinter.h gras_modinter.h \ xbt/xbt_virtu.c \ \ - xbt/sysdep.c \ + xbt/xbt_os_time.c \ xbt/asserts.c \ xbt/log.c xbt/xbt_log_appender_file.c \ xbt/xbt_log_layout_simple.c xbt/xbt_log_layout_format.c \ @@ -128,7 +129,7 @@ XBT_SRC=\ xbt/set.c \ xbt/xbt_matrix.c \ \ - xbt/queue.c \ + xbt/xbt_queue.c \ \ xbt/xbt_peer.c \ \ @@ -139,21 +140,28 @@ XBT_SRC=\ xbt/graphxml_parse.c XBT_RL_SRC = \ - xbt/xbt_rl_synchro.c - + xbt/xbt_rl_synchro.c \ + xbt/xbt_rl_time.c XBT_SG_SRC = \ - xbt/xbt_sg_synchro.c + xbt/xbt_sg_synchro.c \ + xbt/xbt_sg_time.c SURF_SRC= \ surf/maxmin.c \ + surf/fair_bottleneck.c \ surf/lagrange.c \ surf/trace_mgr.c \ surf/surf.c \ surf/surfxml_parse.c \ surf/cpu.c surf/network.c surf/workstation.c \ surf/surf_timer.c \ - surf/network_dassf.c \ - surf/workstation_KCCFLN05.c + surf/workstation_KCCFLN05.c surf/workstation_ptask_L07.c + +if CONTEXT_THREADS + SURF_SRC += xbt/xbt_os_thread.c +else + SURF_SRC += xbt/xbt_os_thread_stubs.c +endif GTNETS_SRC= \ surf/gtnets/gtnets_simulator.cc \ @@ -163,7 +171,7 @@ GTNETS_SRC= \ # Separated because we don't want it in libsimgrid4java CTX_SRC= xbt/context.c -JCTX_SRC= java/jxbt_context.c java/jxbt_context.h xbt/xbt_os_thread.c +JCTX_SRC= java/jxbt_context.c java/jxbt_context.h SIMIX_SRC= \ simix/smx_global.c \ @@ -175,6 +183,15 @@ SIMIX_SRC= \ simix/smx_action.c \ simix/smx_synchro.c +SMPI_SRC= \ + smpi/smpi_base.c \ + smpi/smpi_bench.c \ + smpi/smpi_global.c \ + smpi/smpi_mpi.c \ + smpi/smpi_sender.c \ + smpi/smpi_receiver.c \ + smpi/smpi_util.c + MSG_SRC= msg/msg_config.c \ msg/task.c msg/host.c msg/m_process.c msg/gos.c \ msg/global.c msg/environment.c msg/deployment.c @@ -196,20 +213,26 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/ProcessNotFoundException.java \ \ java/simgrid/msg/Process.java \ + java/simgrid/msg/DTDResolver.java \ java/simgrid/msg/ApplicationHandler.java \ java/simgrid/msg/Channel.java \ java/simgrid/msg/Host.java \ java/simgrid/msg/Msg.java \ java/simgrid/msg/Task.java \ - java/simgrid/msg/ParallelTask.java + java/simgrid/msg/ParallelTask.java \ + \ + java/simgrid/msg/Sem.java + SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c GRAS_COMMON_SRC= \ gras/gras.c \ gras/Transport/transport.c gras/Transport/transport_private.h \ - gras/Msg/msg.c gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_private.h \ + gras/Msg/gras_msg_mod.c gras/Msg/gras_msg_types.c \ + gras/Msg/gras_msg_exchange.c gras/Msg/gras_msg_listener.c \ + gras/Msg/rpc.c gras/Msg/timer.c \ + gras/Msg/msg_interface.h gras/Msg/msg_private.h \ \ gras/Virtu/process.c gras/Virtu/gras_module.c \ \ @@ -226,17 +249,17 @@ GRAS_RL_SRC= \ gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \ \ gras/Virtu/rl_emul.c \ - gras/Virtu/rl_process.c gras/Virtu/rl_time.c \ + gras/Virtu/rl_process.c \ gras/Virtu/rl_dns.c\ \ gras/Msg/rl_msg.c - + GRAS_RL_SRC+=$(XBT_RL_SRC) GRAS_SG_SRC= gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ \ gras/Virtu/sg_emul.c \ - gras/Virtu/sg_process.c gras/Virtu/sg_time.c \ + gras/Virtu/sg_process.c \ gras/Virtu/sg_dns.c\ \ gras/Msg/sg_msg.c @@ -252,7 +275,7 @@ AMOK_SRC= \ # Deal with optional modules # ############################## -if USE_GTNETS +if HAVE_GTNETS GTNETS_USED=$(GTNETS_SRC) else GTNETS_USED= @@ -270,16 +293,30 @@ endif ### Declare the library content ### -lib_LTLIBRARIES= libsimgrid.la libgras.la +lib_LTLIBRARIES= libsimgrid.la libgras.la libsmpi.la libgras_la_SOURCES= $(XBT_SRC) $(GRAS_COMMON_SRC) $(GRAS_RL_SRC) $(AMOK_SRC) -libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(CTX_SRC) \ $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm + +# Please do not add -no-undefined to libsmpi_la_LDFLAGS: +# smpi_simulated_main is indeed defined in user code, and undef in the +# library (no idea why it works under linux, but it fails under windows) +libsmpi_la_LIBADD = libsimgrid.la +libsmpi_la_SOURCES = $(SMPI_SRC) +libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm + +# Windows users (at least, MSVC ones) need a def file. +if IS_WINDOWS +libgras_la_LDFLAGS += -Wl,--output-def,libgras.def +libsimgrid_la_LDFLAGS += -Wl,--output-def,libsimgrid.def +libsmpi_la_LDFLAGS += -Wl,--output-def,libsmpi.def +endif ## ## Java cruft @@ -290,8 +327,8 @@ lib_LTLIBRARIES += libsimgrid4java.la libsimgrid4java_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(SIMIX_SRC) $(JCTX_SRC) \ $(JMSG_C_SRC) $(MSG_SRC) \ - $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) -libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm + $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) +libsimgrid4java_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid4java_la_GCJFLAGS = -fjni clean-local: @@ -300,10 +337,10 @@ clean-local: jardir = $(prefix)/jar jar_DATA = simgrid.jar -simgrid.jar: $(JMSG_JAVA_SRC) +simgrid.jar: $(JMSG_JAVA_SRC) ./surf/surfxml.dtd [ -e .classes ] || mkdir .classes - $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) - $(JAR) cvf simgrid.jar -C .classes .; + $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) + $(JAR) cvf simgrid.jar -C .classes . ./surf/surfxml.dtd; else EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) endif @@ -328,17 +365,17 @@ TEST_CFILES=xbt/cunit.c xbt/ex.c \ xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \ xbt/xbt_str.c \ xbt/config.c -TEST_UNITS= ./cunit_unit.c ./ex_unit.c \ - ./dynar_unit.c ./dict_unit.c ./set_unit.c ./swag_unit.c \ - ./xbt_str_unit.c \ - ./config_unit.c +TEST_UNITS= @builddir@/cunit_unit.c @builddir@/ex_unit.c \ + @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \ + @builddir@/xbt_str_unit.c \ + @builddir@/config_unit.c BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \ ../include/xbt/graphxml.h xbt/graphxml.c \ gras/DataDesc/ddt_parse.yy.c \ - $(TEST_UNITS) simgrid_units_main.c + $(TEST_UNITS) @builddir@/simgrid_units_main.c -testall_SOURCES= $(TEST_UNITS) simgrid_units_main.c +testall_SOURCES= $(TEST_UNITS) @builddir@/simgrid_units_main.c testall_LDADD=libgras.la TESTS=testall TESTS_ENVIRONMENT=$(SG_TEST_EXENV) @@ -346,37 +383,48 @@ TESTS_ENVIRONMENT=$(SG_TEST_EXENV) EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE -./cunit_unit.c: xbt/cunit.c +CLEANFILES=$(TEST_UNITS) + +@builddir@/cunit_unit.c: xbt/cunit.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./ex_unit.c: xbt/ex.c +@builddir@/ex_unit.c: xbt/ex.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./xbt_str_unit.c: xbt/xbt_str.c +@builddir@/xbt_str_unit.c: xbt/xbt_str.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./dynar_unit.c: xbt/dynar.c +@builddir@/dynar_unit.c: xbt/dynar.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./dict_unit.c: xbt/dict.c +@builddir@/dict_unit.c: xbt/dict.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./set_unit.c: xbt/set.c +@builddir@/set_unit.c: xbt/set.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./swag_unit.c: xbt/swag.c +@builddir@/swag_unit.c: xbt/swag.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -./config_unit.c: xbt/config.c +@builddir@/config_unit.c: xbt/config.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -simgrid_units_main.c: $(TEST_UNITS) - @top_srcdir@/tools/sg_unit_extractor.pl xbt/cunit.c +@builddir@/simgrid_units_main.c: $(TEST_UNITS) + @top_srcdir@/tools/sg_unit_extractor.pl @srcdir@/xbt/cunit.c clean-units: - rm -f simgrid_units_main.c *_unit.c - + rm -f simgrid_units_main.c *_unit.c @srcdir@/simgrid_units_main.c @srcdir@/*_unit.c + for n in $(TEST_UNITS) ; do \ + dep=`echo $$n|sed -e 's|.c$$|.Po|' -e 's|[^/]*/||' -e 's|^|.deps/|'`; \ + echo "Removing dependency tracker of $$n ($$dep @srcdir@/$$dep)"; \ + rm -vf $$dep @srcdir@/$$dep; touch $$dep; \ + done else +if BOTBUILD_MODE +$(TEST_UNITS) simgrid_units_main.c clean-units: + @echo "WARNING: Test units not generated, but touched instead since this is a bot build." + touch $@ +else $(TEST_UNITS) simgrid_units_main.c clean-units: @echo "ERROR: Test units not generated." - @echo "ERROR: If you are using a CVS checkout, configure with the --enable-maintainer-mode flag" + @echo "ERROR: If you are using a SVN checkout, configure with the --enable-maintainer-mode flag" @echo "ERROR: If not, please report the bug to the simgrid-devel mailing list." @exit 1 - +endif endif ### @@ -390,19 +438,25 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l if MAINTAINER_MODE surf/surfxml.c: surf/surfxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ + sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ xbt/graphxml.c: xbt/graphxml.l set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ + sed 's/#include /#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)\n# ifndef __STRICT_ANSI__\n# include \n# include \n# endif\n#else\n# include \n#endif/g' -i $@ if HAVE_FLEXML surf/surfxml.l: $(srcdir)/surf/surfxml.dtd set -e; mkdir -p surf; flexml -b 1000000 -P surfxml --sysid=surfxml.dtd -S $@ -L $^ $(top_srcdir)/include/surf/surfxml.h: $(srcdir)/surf/surfxml.dtd set -e; flexml -P surfxml --sysid=surfxml.dtd -H $@ -L $^ + sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ + sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ xbt/graphxml.l: $(srcdir)/xbt/graphxml.dtd set -e; flexml -b 1000000 -P graphxml --sysid=graphxml.dtd -S $@ -L $^ $(top_srcdir)/include/xbt/graphxml.h: $(srcdir)/xbt/graphxml.dtd set -e; flexml -P graphxml --sysid=graphxml.dtd -H $@ -L $^ + sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ + sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@ else $(top_srcdir)/include/surf/surfxml.h surf/surfxml.l: $(top_srcdir)/src/surf/surfxml.dtd