X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1eb32ca7e4d755fec407842b7c879499e2034136..f1b86374a5c9d3f40f72910eaa68ad5ff7bd5a93:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 96f1f215aa..7792566b0b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,18 +1,22 @@ -#AM_CPPFLAGS= -AM_CFLAGS= -g +# Copyright (c) 2004-2007. The SimGrid team. All right reserved. + +# This file is part of the SimGrid project. This is free software: +# You can redistribute and/or modify it under the terms of the +# GNU LGPL (v2.1) licence. + + #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 \ @@ -27,7 +31,10 @@ EXTRA_DIST= \ xbt/graphxml.l \ xbt/graphxml.c \ xbt/graphxml.dtd \ - xbt/context_private.h \ + xbt/xbt_context_private.h \ + xbt/xbt_context_factory.h \ + xbt/xbt_jcontext.h \ + xbt/log_private.h \ xbt/ex_interface.h \ \ surf/maxmin_private.h \ @@ -37,35 +44,39 @@ EXTRA_DIST= \ surf/workstation_private.h \ surf/surf_timer_private.h \ surf/surfxml_parse.c \ - surf/surfxml.l \ - surf/surfxml.c \ - surf/surfxml.dtd \ + surf/simgrid_dtd.l \ + surf/simgrid_dtd.c \ + surf/simgrid.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/surf/random_mgr.h \ \ + include/xbt/context.h \ include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ - include/xbt/context.h \ \ msg/private.h \ \ simdag/private.h \ \ gras/DataDesc/ddt_parse.yy.l \ + gras/Virtu/virtu_rl.h \ + gras/Virtu/virtu_sg.h \ gras/Virtu/virtu_interface.h \ + gras/Virtu/virtu_private.h \ + gras/Transport/transport_interface.h \ amok/Bandwidth/bandwidth_private.h \ - amok/amok_modinter.h + amok/amok_modinter.h \ \ - include/simix/simix.h include/simix/datatypes.h \ - simix/msg_simix_private.h \ + include/simix/simix.h include/simix/datatypes.h \ + simix/private.h \ \ - smpi/private.h smpi/smpi.h + smpi/private.h #LIBRARY_VERSION= 0:0:0 # | | | @@ -112,7 +123,7 @@ VERSION_INFO= -version-info 2:0:0 XBT_SRC=\ \ - xbt/snprintf.c xbt/xbt_str.c \ + xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c \ xbt/ex.c \ \ xbt_modinter.h gras_modinter.h \ @@ -144,22 +155,30 @@ XBT_SRC=\ xbt/graphxml_parse.c XBT_RL_SRC = \ - xbt/xbt_rl_synchro.c \ - xbt/xbt_rl_time.c + xbt/xbt_rl_synchro.c \ + xbt/xbt_rl_time.c XBT_SG_SRC = \ - xbt/xbt_sg_synchro.c \ - xbt/xbt_sg_time.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/random_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_ptask_L07.c \ + xbt/xbt_sg_stubs.c + +if CONTEXT_THREADS + SURF_SRC += xbt/xbt_os_thread.c xbt/xbt_thread_context.c +else + SURF_SRC += xbt/xbt_ucontext.c +endif GTNETS_SRC= \ surf/gtnets/gtnets_simulator.cc \ @@ -167,9 +186,9 @@ GTNETS_SRC= \ surf/gtnets/gtnets_interface.cc \ surf/network_gtnets.c -# 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 +# Separated because src/gras/rl_stubs also define the function xbt_context_mod_init() and xbt_context_mod_exit() +# so there is an implementation of these functions in the simgrid library and an implementatin in the gras library +CTX_SRC= xbt/xbt_context.c SIMIX_SRC= \ simix/smx_global.c \ @@ -183,18 +202,23 @@ SIMIX_SRC= \ SMPI_SRC= \ smpi/smpi_base.c \ - smpi/smpi_mpi.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 + msg/global.c msg/environment.c msg/deployment.c msg_mailbox.c JMSG_C_SRC = \ + xbt/xbt_jcontext.c \ java/jxbt_utilities.c java/jxbt_utilities.h \ java/jmsg.c java/jmsg.h \ java/jmsg_channel.c java/jmsg_channel.h \ java/jmsg_host.c java/jmsg_host.h \ - java/jmsg_parallel_task.c java/jmsg_parallel_task.h \ java/jmsg_process.c java/jmsg_process.h \ java/jmsg_task.c java/jmsg_task.h @@ -205,13 +229,17 @@ JMSG_JAVA_SRC = \ java/simgrid/msg/HostNotFoundException.java \ java/simgrid/msg/ProcessNotFoundException.java \ \ + java/simgrid/msg/Msg.java \ java/simgrid/msg/Process.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/MsgNative.java \ + java/simgrid/msg/DTDResolver.java \ + java/simgrid/msg/ApplicationHandler.java \ + \ + java/simgrid/msg/Sem.java + SIMDAG_SRC= simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c simdag/sd_workstation.c @@ -285,7 +313,7 @@ endif 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) \ @@ -293,23 +321,27 @@ libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) 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 = -no-undefined $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm -libsmpi_la_LDFLAGS = -no-undefined $(VERSION_INFO) @LD_DYNAMIC_FLAGS@ -lm +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 -if HAVE_JAVA -lib_LTLIBRARIES += libsimgrid4java.la +EXTRA_DIST+=$(JMSG_JAVA_SRC) -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) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm -libsimgrid4java_la_GCJFLAGS = -fjni +if HAVE_JAVA +libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library clean-local: -rm -rf .classes @@ -317,12 +349,14 @@ clean-local: jardir = $(prefix)/jar jar_DATA = simgrid.jar -simgrid.jar: $(JMSG_JAVA_SRC) +simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd [ -e .classes ] || mkdir .classes - $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC) - $(JAR) cvf simgrid.jar -C .classes .; + $(JAVAC) -d .classes $(foreach file,$(JMSG_JAVA_SRC),$(srcdir)/$(file)) + [ -e .classes/surf ] || mkdir .classes/surf + cp $(srcdir)/surf/simgrid.dtd .classes/surf + $(JAR) cvf simgrid.jar -C .classes . else -EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC) +EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC) endif if GRAMINE_MODE @@ -345,17 +379,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 \ +BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.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) @@ -363,37 +397,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 ### @@ -405,27 +450,34 @@ gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^ if MAINTAINER_MODE -surf/surfxml.c: surf/surfxml.l +surf/simgrid_dtd.c: surf/simgrid_dtd.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 $^ +surf/simgrid_dtd.l: $(srcdir)/surf/simgrid.dtd + set -e; mkdir -p surf; flexml --root-tags platform -b 1000000 -P surfxml --sysid=simgrid.dtd -S $@ -L $^ +$(top_srcdir)/include/surf/simgrid_dtd.h: $(srcdir)/surf/simgrid.dtd + set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ + mv $(top_srcdir)/include/surf/simgrid.h $@ + 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 - @echo "ERROR: src/surf/surfxml.dtd was modified, but the flexml program was not detected" +$(top_srcdir)/include/surf/simgrid_dtd.h surf/simgrid_dtd.l: $(top_srcdir)/src/surf/simgrid.dtd + @echo "ERROR: src/surf/simgrid.dtd was modified, but the flexml program was not detected" @echo "ERROR: Please install it, or if you didn't modify this file, try this:" - @echo "ERROR: touch include/surf/surfxml.h src/surf/surfxml.l" + @echo "ERROR: touch include/surf/simgrid_dtd.h src/surf/simgrid_dtd.l" @exit 1 $(top_srcdir)/include/xbt/graphxml.h xbt/graphxml.l: $(top_srcdir)/src/xbt/graphxml.dtd @echo "ERROR: src/xbt/graphxml.dtd was modified, but the flexml program was not detected"