-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
+INCLUDES= -I$(top_srcdir)/include -I$(top_srcdir)/src/include
EXTRA_DIST= \
\
portable.h \
include/surf/surf.h \
include/surf/surfxml_parse_private.h \
\
- include/xbt/xbt_portability.h \
- include/xbt/xbt_thread.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_interface.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
-endif
-
-# gras_private.h
+ \
+ include/simix/simix.h include/simix/datatypes.h \
+ simix/msg_simix_private.h \
+ \
+ smpi/private.h smpi/smpi.h
#LIBRARY_VERSION= 0:0:0
# | | |
# | Set to zero if current is incremented
# +- Increment if interfaces have been added, removed or changed
-VERSION_INFO= -version-info 1:0:0
+VERSION_INFO= -version-info 2:0:0
# from `info libtool "Updating version info"`
# and `info libtool "Release numbers"`
#
# It modifies the library name, and you thus cannot say that a library
# using this trick is ready for a "stable" release (say, in Debian).
-lib_LTLIBRARIES= libsimgrid.la libgras.la
-COMMON_SRC=\
+################################################
+# Declaration of the different modules content #
+################################################
+
+XBT_SRC=\
\
xbt/snprintf.c xbt/xbt_str.c \
xbt/ex.c \
\
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/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/graph.c \
xbt/set.c \
xbt/xbt_matrix.c \
+ \
+ xbt/xbt_queue.c \
+ \
xbt/xbt_peer.c \
+ \
xbt/xbt_main.c \
+ \
xbt/config.c \
xbt/cunit.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 \
- \
- gras/Virtu/rl_emul.c \
- gras/Virtu/rl_process.c gras/Virtu/rl_time.c \
- gras/Virtu/rl_dns.c\
- \
- gras/Msg/rl_msg.c
+XBT_RL_SRC = \
+ xbt/xbt_rl_synchro.c \
+ xbt/xbt_rl_time.c
+XBT_SG_SRC = \
+ xbt/xbt_sg_synchro.c \
+ xbt/xbt_sg_time.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 \
- \
+SURF_SRC= \
surf/maxmin.c \
surf/lagrange.c \
surf/trace_mgr.c \
surf/cpu.c surf/network.c surf/workstation.c \
surf/surf_timer.c \
surf/network_dassf.c \
- surf/workstation_KCCFLN05.c \
- \
- simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \
- simdag/sd_workstation.c
+ surf/workstation_KCCFLN05.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 \
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
+# Separated because we don't want it in libsimgrid4java
+CTX_SRC= xbt/context.c
+JCTX_SRC= java/jxbt_context.c java/jxbt_context.h
SIMIX_SRC= \
simix/smx_global.c \
simix/smx_action.c \
simix/smx_synchro.c
+SMPI_SRC= \
+ smpi/smpi_base.c \
+ smpi/smpi_mpi.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_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 \
+JMSG_C_SRC = \
+ 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
+
+JMSG_JAVA_SRC = \
+ java/simgrid/msg/MsgException.java \
+ java/simgrid/msg/JniException.java \
+ java/simgrid/msg/NativeException.java \
+ java/simgrid/msg/HostNotFoundException.java \
+ java/simgrid/msg/ProcessNotFoundException.java \
\
- 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 \
+ 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
+
+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 \
\
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
+
+GRAS_RL_SRC= \
+ gras/rl_stubs.c xbt/xbt_os_thread.c \
+ \
+ gras/Transport/rl_transport.c \
+ 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_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_dns.c\
+ \
+ gras/Msg/sg_msg.c
+
+GRAS_SG_SRC+=$(XBT_SG_SRC)
AMOK_SRC= \
amok/amok_base.c \
amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \
amok/PeerManagement/peermanagement.c
+##############################
+# Deal with optional modules #
+##############################
+
+if HAVE_GTNETS
+ GTNETS_USED=$(GTNETS_SRC)
+else
+ GTNETS_USED=
+ 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
+###
+
+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) \
+ $(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 = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+
+
+##
+## Java cruft
+
+if HAVE_JAVA
+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) @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
+libsimgrid4java_la_GCJFLAGS = -fjni
+
+clean-local:
+ -rm -rf .classes
+
+jardir = $(prefix)/jar
+jar_DATA = simgrid.jar
+
+simgrid.jar: $(JMSG_JAVA_SRC)
+ [ -e .classes ] || mkdir .classes
+ $(JAVAC) -sourcepath java -d .classes $(JMSG_JAVA_SRC)
+ $(JAR) cvf simgrid.jar -C .classes .;
+else
+EXTRA_DIST += $(JCTX_SRC) $(JMSG_C_SRC) $(MSG_SRC)
+endif
+
if GRAMINE_MODE
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/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= @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
+CLEANFILES=$(TEST_UNITS)
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)
EXTRA_DIST+=$(testall_SOURCES)
if MAINTAINER_MODE
-./cunit_unit.c: xbt/cunit.c
+@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 $^
-./ex_unit.c: xbt/ex.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
$(TEST_UNITS) simgrid_units_main.c clean-units:
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)
-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 = -no-undefined $(VERSION_INFO) @GTNETS_LDFLAGS@ @SIMGRID_DEP@ @LD_DYNAMIC_FLAGS@ -lm
-
-
-
include $(top_srcdir)/acmacro/dist-files.mk
