X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f93abc6448737e66b30c1eb5f4d341dc518d6d00..7a4e264744a18d8953c3bd5e4a1df05f5d6088b9:/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am index 02fdd3e44c..32c5006278 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,7 +22,6 @@ EXTRA_DIST= \ portable.h \ \ xbt/mallocator_private.h \ - xbt/dynar_private.h \ xbt/dict_private.h \ xbt/heap_private.h \ xbt/fifo_private.h \ @@ -31,9 +30,6 @@ EXTRA_DIST= \ xbt/graphxml.l \ xbt/graphxml.c \ xbt/graphxml.dtd \ - xbt/xbt_context_private.h \ - xbt/xbt_context_factory.h \ - xbt/xbt_jcontext.h \ xbt/log_private.h \ xbt/ex_interface.h \ xbt/backtrace_linux.c xbt/backtrace_windows.c xbt/backtrace_dummy.c \ @@ -41,23 +37,27 @@ EXTRA_DIST= \ surf/maxmin_private.h \ surf/trace_mgr_private.h \ surf/surf_private.h \ - surf/cpu_private.h \ - surf/workstation_private.h \ - surf/surf_timer_private.h \ surf/surfxml_parse.c \ surf/simgrid_dtd.l \ surf/simgrid_dtd.c \ surf/simgrid.dtd \ surf/network_private.h \ surf/network_gtnets_private.h \ + surf/gtnets/gtnets_interface.h \ + surf/gtnets/gtnets_simulator.h \ + surf/gtnets/gtnets_topology.h \ + surf/cpu_ti_private.h \ \ + include/surf/surf_resource.h \ + include/surf/datatypes.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/surf/surf_resource_lmm.h \ \ - include/xbt/context.h \ + include/xbt/wine_dbghelp.h \ include/xbt/xbt_os_time.h \ include/xbt/xbt_os_thread.h \ \ @@ -76,9 +76,15 @@ EXTRA_DIST= \ amok/amok_modinter.h \ \ include/simix/simix.h include/simix/datatypes.h \ + include/simix/context.h \ simix/private.h \ + simix/smx_context_private.h \ + simix/smx_context_java.h \ \ - smpi/private.h + smpi/private.h \ + smpi/smpi_coll_private.h \ + smpi/smpi_mpi_dt_private.h \ + smpi/README #LIBRARY_VERSION= 0:0:0 # | | | @@ -125,7 +131,7 @@ VERSION_INFO= -version-info 2:0:0 XBT_SRC=\ \ - xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c \ + xbt/snprintf.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c \ xbt/ex.c \ \ xbt_modinter.h gras_modinter.h \ @@ -164,22 +170,26 @@ XBT_SG_SRC = \ xbt/xbt_sg_time.c SURF_SRC= \ + surf/surf_model.c \ + surf/surf_action.c \ + surf/surf_routing.c \ + surf/surf_config.c \ surf/maxmin.c \ - surf/fair_bottleneck.c \ + surf/fair_bottleneck.c \ surf/lagrange.c \ surf/trace_mgr.c \ - surf/random_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/cpu.c surf/network.c surf/network_constant.c surf/workstation.c \ + surf/surf_model_timer.c \ surf/workstation_ptask_L07.c \ + surf/cpu_ti.c \ + surf/cpu_im.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 + SURF_SRC += xbt/xbt_os_thread.c endif GTNETS_SRC= \ @@ -188,19 +198,22 @@ GTNETS_SRC= \ surf/gtnets/gtnets_interface.cc \ surf/network_gtnets.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 \ simix/smx_deployment.c \ - simix/smx_config.c \ simix/smx_environment.c \ simix/smx_host.c \ simix/smx_process.c \ + simix/smx_context.c \ simix/smx_action.c \ - simix/smx_synchro.c + simix/smx_synchro.c \ + simix/smx_network.c + +if CONTEXT_THREADS + SURF_SRC += simix/smx_context_thread.c +else + SURF_SRC += simix/smx_context_sysv.c +endif SMPI_SRC= \ smpi/smpi_base.c \ @@ -209,20 +222,24 @@ SMPI_SRC= \ smpi/smpi_mpi.c \ smpi/smpi_sender.c \ smpi/smpi_receiver.c \ - smpi/smpi_util.c + smpi/smpi_util.c \ + smpi/smpi_coll.c \ + smpi/smpi_mpi_dt.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/msg_mailbox.c + msg/global.c msg/environment.c msg/deployment.c msg/msg_mailbox.c \ + msg/msg_actions.c JMSG_C_SRC = \ - xbt/xbt_jcontext.c \ + simix/smx_context_java.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_process.c java/jmsg_process.h \ - java/jmsg_task.c java/jmsg_task.h + java/jmsg_task.c java/jmsg_task.h \ + java/jmsg_application_handler.c java/jmsg_application_handler.h JMSG_JAVA_SRC = \ java/simgrid/msg/MsgException.java \ @@ -301,13 +318,6 @@ else EXTRA_DIST+=$(GTNETS_SRC) endif -if HAVE_SDP - SDP_SRC= surf/sdp.c -else - SDP_SRC= - EXTRA_DIST+=surf/sdp.c -endif - ### ### Declare the library content ### @@ -317,9 +327,8 @@ 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 -libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) $(SDP_SRC) \ - $(SIMIX_SRC) $(CTX_SRC) \ - $(MSG_SRC) $(SIMDAG_SRC) \ +libsimgrid_la_SOURCES = $(XBT_SRC) $(SURF_SRC) $(GTNETS_USED) \ + $(SIMIX_SRC) $(MSG_SRC) $(SIMDAG_SRC) \ $(GRAS_COMMON_SRC) $(GRAS_SG_SRC) $(AMOK_SRC) libsimgrid_la_LDFLAGS = -no-undefined $(VERSION_INFO) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm # -Wl,--entry -Wl,simgrid_version @@ -347,9 +356,9 @@ if HAVE_JAVA libsimgrid_la_SOURCES += $(JMSG_C_SRC) # add the binding support to the library clean-local: - -rm -rf .classes + -rm -rf .classes simgrid.jar -jardir = $(prefix)/jar +jardir = $(prefix)/jar jar_DATA = simgrid.jar simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd @@ -359,7 +368,7 @@ simgrid.jar: $(JMSG_JAVA_SRC) $(srcdir)/surf/simgrid.dtd cp $(srcdir)/surf/simgrid.dtd .classes/surf $(JAR) cvf simgrid.jar -C .classes . else -EXTRA_DIST+=$(JMSG_C_SRC) $(MSG_SRC) +EXTRA_DIST+=$(JMSG_C_SRC) $(JMSG_JAVA_SRC) $(MSG_SRC) endif if GRAMINE_MODE @@ -380,11 +389,11 @@ else noinst_PROGRAMS=testall 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/xbt_str.c xbt/xbt_sha.c \ xbt/config.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 \ +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@/xbt_strbuff_unit.c @builddir@/xbt_sha_unit.c\ @builddir@/config_unit.c BUILT_SOURCES=../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \ @@ -402,21 +411,8 @@ EXTRA_DIST+=$(testall_SOURCES) if MAINTAINER_MODE CLEANFILES=$(TEST_UNITS) -@builddir@/cunit_unit.c: xbt/cunit.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/ex_unit.c: xbt/ex.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/xbt_str_unit.c: xbt/xbt_str.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/dynar_unit.c: xbt/dynar.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/dict_unit.c: xbt/dict.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/set_unit.c: xbt/set.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/swag_unit.c: xbt/swag.c - @top_srcdir@/tools/sg_unit_extractor.pl $^ -@builddir@/config_unit.c: xbt/config.c +$(TEST_UNITS): xbt/cunit.c xbt/ex.c xbt/xbt_str.c xbt/xbt_strbuff.c xbt/xbt_sha.c\ + xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c xbt/config.c @top_srcdir@/tools/sg_unit_extractor.pl $^ @builddir@/simgrid_units_main.c: $(TEST_UNITS) @@ -464,8 +460,9 @@ if HAVE_FLEXML 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 + rm -f $(top_srcdir)/include/surf/simgrid.h set -e; flexml --root-tags platform -P surfxml --sysid=simgrid.dtd -H $@ -L $^ - mv $(top_srcdir)/include/surf/simgrid.h $@ + if test -e $(top_srcdir)/include/surf/simgrid.h ; then mv $(top_srcdir)/include/surf/simgrid.h $@ ; fi sed 's/extern *\([^ ]*[ \*]*\)/XBT_PUBLIC_DATA(\1) /' -i $@ sed 's/XBT_PUBLIC_DATA(\([^)]*\)) *\([^(]*\)(/XBT_PUBLIC(\1) \2(/' -i $@