X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/997c8258acf2a8d11006f438a096cbd1dada7eda..b4094b990df848c60eed9c36f5a4bc57616d6eda:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 1f8eb6c639..c38ae6b509 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CFLAGS= -g +AM_CFLAGS+= -g @GTNETS_CFLAGS@ #AM_CFLAGS= -DNDEBUG # -DNLOG cuts absolutely all logs at compilation time. @@ -16,6 +16,7 @@ EXTRA_DIST= \ \ portable.h \ \ + xbt/mallocator_private.h \ xbt/dynar_private.h \ xbt/dict_private.h \ xbt/heap_private.h \ @@ -25,7 +26,8 @@ EXTRA_DIST= \ xbt/graphxml.l \ xbt/graphxml.c \ xbt/graphxml.dtd \ - xbt/context_private.h xbt/context_win32.h xbt/context_win32.c\ + xbt/context_private.h \ + xbt/ex_interface.h \ \ surf/maxmin_private.h \ surf/trace_mgr_private.h \ @@ -47,16 +49,28 @@ EXTRA_DIST= \ include/surf/surfxml_parse_private.h \ \ include/xbt/xbt_portability.h \ + include/xbt/xbt_thread.h \ include/xbt/context.h \ \ msg/private.h \ \ - gras/Transport/transport_interface.h \ + simdag/private.h \ + \ + amok/Bandwidth/bandwidth_private.h \ + amok/amok_modinter.h + +if USE_SIMIX + EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/msg_simix_private.h \ + gras_simix/Transport/gras_simix_transport_interface.h \ + gras_simix/Virtu/gras_simix_virtu_interface.h gras_simix/Virtu/gras_simix_virtu_private.h\ + gras_simix/Virtu/gras_simix_virtu_rl.h gras_simix/Virtu/gras_simix_virtu_sg.h \ + gras_simix/DataDesc/gras_simix_ddt_parse.yy.l gras_simix/DataDesc/gras_simix_ddt_parse.yy.c +else + EXTRA_DIST+=gras/Transport/transport_interface.h \ gras/Virtu/virtu_interface.h gras/Virtu/virtu_private.h\ gras/Virtu/virtu_rl.h gras/Virtu/virtu_sg.h \ - gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c \ - \ - amok/Bandwidth/bandwidth_private.h + gras/DataDesc/ddt_parse.yy.l gras/DataDesc/ddt_parse.yy.c +endif # gras_private.h @@ -73,7 +87,7 @@ EXTRA_DIST= \ # | Set to zero if current is incremented # +- Increment if interfaces have been added, removed or changed -VERSION_INFO= -release 20050627 -version-info 0:0:0 +VERSION_INFO= -version-info 1:0:0 # from `info libtool "Updating version info"` # and `info libtool "Release numbers"` # @@ -99,18 +113,19 @@ VERSION_INFO= -release 20050627 -version-info 0:0:0 # using this trick is ready for a "stable" release (say, in Debian). lib_LTLIBRARIES= libsimgrid.la libgras.la -noinst_PROGRAMS=testall COMMON_SRC=\ \ - xbt/snprintf.c \ + xbt/snprintf.c xbt/xbt_str.c \ xbt/ex.c \ \ xbt_modinter.h gras_modinter.h \ \ xbt/sysdep.c \ xbt/asserts.c \ - xbt/log.c xbt/log_default_appender.c \ + xbt/log.c xbt/xbt_log_appender_file.c \ + xbt/xbt_log_layout_simple.c xbt/xbt_log_layout_format.c \ + xbt/mallocator.c \ xbt/dynar.c \ xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c \ xbt/dict_multi.c \ @@ -119,27 +134,16 @@ COMMON_SRC=\ xbt/swag.c \ xbt/graph.c \ xbt/set.c \ - xbt/module.c \ + xbt/xbt_matrix.c \ + xbt/xbt_peer.c \ + xbt/xbt_main.c \ xbt/config.c \ xbt/cunit.c \ - xbt/graphxml_parse.c \ - \ - gras/gras.c \ - \ - gras/Transport/transport.c gras/Transport/transport_private.h \ - \ - gras/DataDesc/ddt_create.c \ - gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \ - gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \ - gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \ - gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h \ - \ - gras/Msg/msg.c gras/Msg/rpc.c gras/Msg/timer.c \ - gras/Msg/msg_interface.h gras/Msg/msg_private.h \ - \ - gras/Virtu/process.c + xbt/graphxml_parse.c RL_SRC= \ + gras/rl_stubs.c xbt/xbt_thread.c \ + \ gras/Transport/rl_transport.c \ gras/Transport/transport_plugin_file.c gras/Transport/transport_plugin_tcp.c \ \ @@ -149,34 +153,137 @@ RL_SRC= \ \ gras/Msg/rl_msg.c +RL_SIMIX_SRC= \ + gras_simix/gras_simix_rl_stubs.c xbt/xbt_thread.c \ + \ + gras_simix/Transport/gras_simix_rl_transport.c \ + gras_simix/Transport/gras_simix_transport_plugin_file.c gras_simix/Transport/gras_simix_transport_plugin_tcp.c \ + \ + gras_simix/Virtu/gras_simix_rl_emul.c \ + gras_simix/Virtu/gras_simix_rl_process.c gras_simix/Virtu/gras_simix_rl_time.c \ + gras_simix/Virtu/gras_simix_rl_dns.c\ + \ + gras_simix/Msg/gras_simix_rl_msg.c + SG_SRC= \ - xbt/context.c \ + xbt/context.c \ \ surf/maxmin.c \ + surf/lagrange.c \ surf/trace_mgr.c \ surf/surf.c \ - surf/surfxml_parse.c \ + surf/surfxml_parse.c \ surf/cpu.c surf/network.c surf/workstation.c \ - surf/surf_timer.c \ + surf/surf_timer.c \ surf/network_dassf.c \ surf/workstation_KCCFLN05.c \ \ - msg/msg_config.c \ + simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \ + simdag/sd_workstation.c + +GTNETS_SRC= \ + surf/gtnets/gtnets_simulator.cc \ + surf/gtnets/gtnets_topology.cc \ + surf/gtnets/gtnets_interface.cc \ + surf/network_gtnets.c + +if USE_GTNETS + SG_SRC+=$(GTNETS_SRC) +else + EXTRA_DIST+=$(GTNETS_SRC) +endif + +if HAVE_SDP + SG_SRC+= surf/sdp.c +else + EXTRA_DIST+=surf/sdp.c +endif + +SIMIX_SRC= \ + simix/smx_global.c \ + simix/smx_deployment.c \ + simix/smx_config.c \ + simix/smx_environment.c \ + simix/smx_host.c \ + simix/smx_process.c \ + simix/smx_action.c \ + simix/smx_synchro.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 \ - \ - gras/Transport/sg_transport.c gras/Transport/transport_plugin_sg.c \ + msg/global.c msg/environment.c msg/deployment.c + +MSG_SIMIX_SRC= msg_simix/msg_simix_config.c \ + msg_simix/msg_simix_task.c \ + msg_simix/msg_simix_host.c \ + msg_simix/msg_simix_process.c \ + msg_simix/msg_simix_gos.c \ + msg_simix/msg_simix_global.c \ + msg_simix/msg_simix_environment.c \ + msg_simix/msg_simix_deployment.c + +GRAS_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_dns.c\ \ + gras/sg_stubs.c \ gras/Msg/sg_msg.c +GRAS_SIMIX_SRC= gras_simix/Transport/gras_simix_sg_transport.c gras_simix/Transport/gras_simix_transport_plugin_sg.c \ + \ + gras_simix/Virtu/gras_simix_sg_emul.c \ + gras_simix/Virtu/gras_simix_sg_process.c gras_simix/Virtu/gras_simix_sg_time.c \ + gras_simix/Virtu/gras_simix_sg_dns.c\ + \ + gras_simix/gras_simix_sg_stubs.c \ + gras_simix/Msg/gras_simix_sg_msg.c + +if USE_SIMIX + SG_SRC+=$(SIMIX_SRC) + SG_SRC+=$(MSG_SIMIX_SRC) + SG_SRC+=$(GRAS_SIMIX_SRC) + EXTRA_DIST+=$(MSG_SRC) + COMMON_SRC+=gras_simix/gras_simix_gras.c \ + gras_simix/Transport/gras_simix_transport.c gras_simix/Transport/gras_simix_transport_private.h \ + gras_simix/Msg/gras_simix_msg.c gras_simix/Msg/gras_simix_rpc.c gras_simix/Msg/gras_simix_timer.c \ + gras_simix/Msg/gras_simix_msg_interface.h gras_simix/Msg/gras_simix_msg_private.h \ + gras_simix/Virtu/gras_simix_process.c gras_simix/Virtu/gras_simix_gras_module.c \ + \ + gras_simix/DataDesc/gras_simix_ddt_create.c \ + gras_simix/DataDesc/gras_simix_ddt_convert.c gras_simix/DataDesc/gras_simix_ddt_exchange.c \ + gras_simix/DataDesc/gras_simix_cbps.c gras_simix/DataDesc/gras_simix_datadesc.c \ + gras_simix/DataDesc/gras_simix_datadesc_interface.h gras_simix/DataDesc/gras_simix_datadesc_private.h \ + gras_simix/DataDesc/gras_simix_ddt_parse.c gras_simix/DataDesc/gras_simix_ddt_parse.yy.c gras_simix/DataDesc/gras_simix_ddt_parse.yy.h + +else + EXTRA_DIST+=$(SIMIX_SRC) + EXTRA_DIST+=$(MSG_SIMIX_SRC) + EXTRA_DIST+=$(GRAS_SIMIX_SRC) + SG_SRC+=$(MSG_SRC) + SG_SRC+=$(GRAS_SRC) + 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/Virtu/process.c gras/Virtu/gras_module.c \ + \ + gras/DataDesc/ddt_create.c \ + gras/DataDesc/ddt_convert.c gras/DataDesc/ddt_exchange.c \ + gras/DataDesc/cbps.c gras/DataDesc/datadesc.c \ + gras/DataDesc/datadesc_interface.h gras/DataDesc/datadesc_private.h \ + gras/DataDesc/ddt_parse.c gras/DataDesc/ddt_parse.yy.c gras/DataDesc/ddt_parse.yy.h +endif + AMOK_SRC= \ - amok/base.c \ - amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c + amok/amok_base.c \ + amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ + amok/PeerManagement/peermanagement.c +if GRAMINE_MODE +else ### ### Testing infrastructure ### @@ -186,16 +293,19 @@ AMOK_SRC= \ # are generated. Sorry about that. # If you add a test unit, you should regenerate simgrid_units_main.c from scratch: -# rm -f simgrid_units_main.c *_unit.c ; make testall +# make clean-units ; make testall # Suites and tests run in the given order. +noinst_PROGRAMS=testall TEST_CFILES=xbt/cunit.c xbt/ex.c \ xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \ - xbt/config.c -TEST_UNITS= cunit_unit.c ex_unit.c \ - dynar_unit.c dict_unit.c set_unit.c swag_unit.c \ - config_unit.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 BUILT_SOURCES=../include/surf/surfxml.h surf/surfxml.c \ ../include/xbt/graphxml.h xbt/graphxml.c \ @@ -209,26 +319,32 @@ TESTS=testall EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE -cunit_unit.c: xbt/cunit.c +./cunit_unit.c: xbt/cunit.c + @top_srcdir@/tools/sg_unit_extractor.pl $^ +./ex_unit.c: xbt/ex.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -ex_unit.c: xbt/ex.c +./xbt_str_unit.c: xbt/xbt_str.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -dynar_unit.c: xbt/dynar.c +./dynar_unit.c: xbt/dynar.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -dict_unit.c: xbt/dict.c +./dict_unit.c: xbt/dict.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -set_unit.c: xbt/set.c +./set_unit.c: xbt/set.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -swag_unit.c: xbt/swag.c +./swag_unit.c: xbt/swag.c @top_srcdir@/tools/sg_unit_extractor.pl $^ -config_unit.c: xbt/config.c +./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 + +clean-units: + rm -f simgrid_units_main.c *_unit.c else -$(TEST_UNITS) simgrid_units_main.c: +$(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 not, please report the bug to the simgrid-devel mailing list." @@ -242,47 +358,53 @@ endif gras/DataDesc/ddt_parse.yy.c: gras/DataDesc/ddt_parse.yy.l - @LEX@ -o$@ -Pgras_ddt_parse_ $^ + set -e;@LEX@ -o$@ -Pgras_ddt_parse_ --noline $^ if MAINTAINER_MODE surf/surfxml.c: surf/surfxml.l - @LEX@ -o$@ -Psurf_parse_ $^ + set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Psurf_parse_ --noline $^ xbt/graphxml.c: xbt/graphxml.l - @LEX@ -o$@ -Pxbt_graph_parse_ $^ + set -e;mkdir -p `dirname $@`; @LEX@ -o$@ -Pxbt_graph_parse_ --noline $^ if HAVE_FLEXML -surf/surfxml.l: surf/surfxml.dtd - set -e; cd surf; flexml -b 1000000 -P surfxml -S -L surfxml.dtd -../include/surf/surfxml.h: surf/surfxml.dtd - cd ../include/surf; flexml -P surfxml -H -L ../../src/surf/surfxml.dtd -xbt/graphxml.l: xbt/graphxml.dtd - set -e; cd xbt; flexml -b 1000000 -P graphxml -S -L graphxml.dtd -../include/xbt/graphxml.h: xbt/graphxml.dtd - cd ../include/xbt; flexml -P graphxml -H -L ../../src/xbt/graphxml.dtd +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 $^ + +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 $^ else -../include/surf/surfxml.h surf/surfxml.l: surf/surfxml.dtd +$(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" @echo "ERROR: Please install it, or if you didn't modify this file, try this:" - @echo "ERROR: touch src/include/surf/surfxml.h src/surf/surfxml.l" + @echo "ERROR: touch include/surf/surfxml.h src/surf/surfxml.l" @exit 1 -../include/xbt/graphxml.h xbt/graphxml.l: xbt/graphxml.dtd +$(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" @echo "ERROR: Please install it, or if you didn't modify this file, try this:" - @echo "ERROR: touch src/include/xbt/graphxml.h src/xbt/graphxml.l" + @echo "ERROR: touch include/xbt/graphxml.h src/xbt/graphxml.l" @exit 1 endif endif +endif ### ### Declare the library content ### +if USE_SIMIX +libgras_la_SOURCES= $(COMMON_SRC) $(RL_SIMIX_SRC) $(AMOK_SRC) +else libgras_la_SOURCES= $(COMMON_SRC) $(RL_SRC) $(AMOK_SRC) -libgras_la_LDFLAGS = $(VERSION_INFO) @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm +endif +libgras_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @GRAS_DEP@ @LD_DYNAMIC_FLAGS@ -lm libsimgrid_la_SOURCES= $(COMMON_SRC) $(SG_SRC) $(AMOK_SRC) -libsimgrid_la_LDFLAGS = $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm +libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm