From 5ab625b56b685868e0e77505f92d462eaf17e890 Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 14 May 2008 21:35:10 +0000 Subject: [PATCH 1/1] autogen commit fest (some of them being tests related and mandatory for SHA addition) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5428 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- Makefile.in | 3 +- doc/Makefile.in | 1 - examples/Makefile.in | 1 - examples/amok/Makefile.in | 11 ++-- examples/gras/Makefile.in | 1 - examples/gras/all2all/Makefile.in | 1 - examples/gras/chrono/Makefile.in | 1 - examples/gras/mmrpc/Makefile.in | 1 - .../mutual_exclusion/simple_token/Makefile.in | 1 - examples/gras/ping/Makefile.in | 1 - examples/gras/pmm/Makefile.in | 1 - examples/gras/properties/Makefile.in | 1 - examples/gras/rpc/Makefile.in | 1 - examples/gras/spawn/Makefile.in | 1 - examples/gras/synchro/Makefile.in | 1 - examples/gras/timer/Makefile.in | 1 - examples/java/Makefile.in | 1 - examples/java/basic/Makefile.in | 1 - examples/java/comm_time/Makefile.in | 1 - examples/java/ping_pong/Makefile.in | 1 - examples/java/suspend/Makefile.in | 1 - examples/msg/Makefile.in | 7 ++- examples/simdag/Makefile.in | 5 +- include/Makefile.in | 3 +- src/Makefile.in | 58 ++++++++++++++----- src/dynar_unit.c | 2 +- src/ex_unit.c | 2 +- src/simgrid_units_main.c | 9 +++ src/xbt_sha_unit.c | 52 +++++++++++++++++ testsuite/Makefile.in | 1 - tools/Makefile.in | 1 - tools/gras/Makefile.in | 1 - tools/tesh/Makefile.in | 1 - 33 files changed, 118 insertions(+), 57 deletions(-) create mode 100644 src/xbt_sha_unit.c diff --git a/Makefile.in b/Makefile.in index fa716955d0..e676fb14a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -149,7 +149,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -734,7 +733,7 @@ gramine: @MAINTAINER_MODE_TRUE@ --recursive --links --perms --times --omit-dir-times \ @MAINTAINER_MODE_TRUE@ doc/html/ scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/doc/ || true @MAINTAINER_MODE_TRUE@ scp doc/index.php doc/webcruft/robots.txt scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/ -@MAINTAINER_MODE_TRUE@ scp doc/webcruft/simgrid_modules2.png doc/webcruft/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/ +@MAINTAINER_MODE_TRUE@ scp doc/simgrid_modules2.png doc/simgrid_modules.png doc/webcruft/simgrid_logo.png doc/webcruft/simgrid_logo_small.png scm.gforge.inria.fr:/var/lib/gforge/chroot/home/groups/simgrid/htdocs/ @MAINTAINER_MODE_TRUE@ ssh scm.gforge.inria.fr "chgrp -R simgrid /var/lib/gforge/chroot/home/groups/simgrid/htdocs/" @MAINTAINER_MODE_TRUE@ ssh scm.gforge.inria.fr "chmod g+rw -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true" @MAINTAINER_MODE_TRUE@ ssh scm.gforge.inria.fr "chmod a+rX -R /var/lib/gforge/chroot/home/groups/simgrid/htdocs/* || true" diff --git a/doc/Makefile.in b/doc/Makefile.in index 67a4735eb6..8f43d3eea2 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -121,7 +121,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 74be5dc97c..6d41fd58cc 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -133,7 +133,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/amok/Makefile.in b/examples/amok/Makefile.in index aca21d1a32..5e659217ca 100644 --- a/examples/amok/Makefile.in +++ b/examples/amok/Makefile.in @@ -189,7 +189,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -279,7 +278,11 @@ AM_CFLAGS = -g ################### # saturate tests # ################### -EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml + +######### +# Cruft # +######### +EXTRA_DIST = bandwidth/bandwidth.xml saturate/saturate.xml $(TESTS) TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = $(am__append_1) $(am__append_2) $(am__append_3) \ $(am__append_4) @@ -783,10 +786,6 @@ dist-files: @for n in $(DISTFILES) ; do echo $(SRCFILE)$$n; done @echo @for n in $(DIST_SUBDIRS) ; do if [ x$$n != x. ] ; then $(MAKE) -C $$n dist-files SRCFILE=$(SRCFILE)$$n/ ; fi; done - -######### -# Cruft # -######### # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/examples/gras/Makefile.in b/examples/gras/Makefile.in index d834a4cc73..f11ed0ddd2 100644 --- a/examples/gras/Makefile.in +++ b/examples/gras/Makefile.in @@ -133,7 +133,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/all2all/Makefile.in b/examples/gras/all2all/Makefile.in index 2e0806f80b..dadbb18197 100644 --- a/examples/gras/all2all/Makefile.in +++ b/examples/gras/all2all/Makefile.in @@ -168,7 +168,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/chrono/Makefile.in b/examples/gras/chrono/Makefile.in index c54af04192..9e4558195b 100644 --- a/examples/gras/chrono/Makefile.in +++ b/examples/gras/chrono/Makefile.in @@ -162,7 +162,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/mmrpc/Makefile.in b/examples/gras/mmrpc/Makefile.in index 6fc04242f5..d86eb0be8d 100644 --- a/examples/gras/mmrpc/Makefile.in +++ b/examples/gras/mmrpc/Makefile.in @@ -169,7 +169,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/mutual_exclusion/simple_token/Makefile.in b/examples/gras/mutual_exclusion/simple_token/Makefile.in index 5e643ceb43..52fab58e61 100644 --- a/examples/gras/mutual_exclusion/simple_token/Makefile.in +++ b/examples/gras/mutual_exclusion/simple_token/Makefile.in @@ -165,7 +165,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/ping/Makefile.in b/examples/gras/ping/Makefile.in index 1f8fd4fd12..8d78926959 100644 --- a/examples/gras/ping/Makefile.in +++ b/examples/gras/ping/Makefile.in @@ -169,7 +169,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/pmm/Makefile.in b/examples/gras/pmm/Makefile.in index eb6e709ced..6f53f9ffd4 100644 --- a/examples/gras/pmm/Makefile.in +++ b/examples/gras/pmm/Makefile.in @@ -165,7 +165,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/properties/Makefile.in b/examples/gras/properties/Makefile.in index 259338ebfa..ebd44be617 100644 --- a/examples/gras/properties/Makefile.in +++ b/examples/gras/properties/Makefile.in @@ -168,7 +168,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/rpc/Makefile.in b/examples/gras/rpc/Makefile.in index 8dccaa1573..3b215fa3e4 100644 --- a/examples/gras/rpc/Makefile.in +++ b/examples/gras/rpc/Makefile.in @@ -168,7 +168,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/spawn/Makefile.in b/examples/gras/spawn/Makefile.in index 6eb4799920..3b2cb9d9c4 100644 --- a/examples/gras/spawn/Makefile.in +++ b/examples/gras/spawn/Makefile.in @@ -169,7 +169,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/synchro/Makefile.in b/examples/gras/synchro/Makefile.in index 8650932470..bbc8c5919e 100644 --- a/examples/gras/synchro/Makefile.in +++ b/examples/gras/synchro/Makefile.in @@ -162,7 +162,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/gras/timer/Makefile.in b/examples/gras/timer/Makefile.in index a22fad5f41..e969b682f9 100644 --- a/examples/gras/timer/Makefile.in +++ b/examples/gras/timer/Makefile.in @@ -160,7 +160,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/java/Makefile.in b/examples/java/Makefile.in index 8bc321e893..f2cd08a957 100644 --- a/examples/java/Makefile.in +++ b/examples/java/Makefile.in @@ -133,7 +133,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/java/basic/Makefile.in b/examples/java/basic/Makefile.in index 7dd2e24d20..c1e59e6d7e 100644 --- a/examples/java/basic/Makefile.in +++ b/examples/java/basic/Makefile.in @@ -126,7 +126,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/java/comm_time/Makefile.in b/examples/java/comm_time/Makefile.in index 2c2ae65df6..3df07c8623 100644 --- a/examples/java/comm_time/Makefile.in +++ b/examples/java/comm_time/Makefile.in @@ -126,7 +126,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/java/ping_pong/Makefile.in b/examples/java/ping_pong/Makefile.in index 5f717926c4..738fbfddab 100644 --- a/examples/java/ping_pong/Makefile.in +++ b/examples/java/ping_pong/Makefile.in @@ -126,7 +126,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/java/suspend/Makefile.in b/examples/java/suspend/Makefile.in index 98d116a2c1..4b56a7717e 100644 --- a/examples/java/suspend/Makefile.in +++ b/examples/java/suspend/Makefile.in @@ -126,7 +126,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/examples/msg/Makefile.in b/examples/msg/Makefile.in index 29e8d7c9f9..bfa16664a4 100644 --- a/examples/msg/Makefile.in +++ b/examples/msg/Makefile.in @@ -201,7 +201,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -284,7 +283,8 @@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/include AM_CFLAGS = -g EXTRA_DIST = msg_platform.xml small_platform.xml \ - sendrecv/platform_sendrecv.xml \ + small_platform_with_failures.xml jupiter_state.trace \ + link5_state.trace sendrecv/platform_sendrecv.xml \ sendrecv/deployment_sendrecv.xml \ suspend/deployment_suspend.xml \ masterslave/deployment_masterslave_forwarder.xml \ @@ -292,7 +292,8 @@ EXTRA_DIST = msg_platform.xml small_platform.xml \ gtnets/r-n200-f50-s4-2-d.xml gtnets/onelink-p.xml \ gtnets/onelink-d.xml gtnets/r-n200-f50-s4-2-p.xml \ gtnets/dogbone-d.xml gtnets/dogbone-p.xml \ - properties/deployment_properties.xml $(am__append_3) + priority/deployment_priority.xml \ + properties/deployment_properties.xml $(am__append_3) $(TESTS) TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = sendrecv/sendrecv_CLM03.tesh \ sendrecv/sendrecv_Vegas.tesh \ diff --git a/examples/simdag/Makefile.in b/examples/simdag/Makefile.in index 06208abc7f..34d1222141 100644 --- a/examples/simdag/Makefile.in +++ b/examples/simdag/Makefile.in @@ -158,7 +158,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -240,9 +239,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ INCLUDES = -I$(top_srcdir)/include AM_CFLAGS = -g -EXTRA_DIST = 2clusters.xml \ - properties/prop.xml - +EXTRA_DIST = 2clusters.xml properties/prop.xml $(TESTS) CLEANFILES = sd_test.trace TESTS_ENVIRONMENT = $(top_builddir)/tools/tesh/tesh TESTS = test_simdag.tesh test_simdag2.tesh properties/test_prop.tesh metaxml/metaxml_test.tesh diff --git a/include/Makefile.in b/include/Makefile.in index a1e4e0cc4a..0ad9159d81 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -135,7 +135,6 @@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ -MD5SUM = @MD5SUM@ MKDIR_P = @MKDIR_P@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -220,7 +219,7 @@ nobase_include_HEADERS = \ xbt/misc.h \ xbt/sysdep.h \ xbt/virtu.h \ - xbt/str.h xbt/strbuff.h \ + xbt/str.h xbt/strbuff.h xbt/hash.h \ xbt/function_types.h \ xbt/asserts.h xbt/ex.h \ xbt/log.h \ diff --git a/src/Makefile.in b/src/Makefile.in index 7e03c34349..6e63c0b4d7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -95,7 +95,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ libLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(lib_LTLIBRARIES) libgras_la_LIBADD = -am__objects_1 = snprintf.lo xbt_str.lo xbt_strbuff.lo ex.lo \ +am__objects_1 = snprintf.lo xbt_str.lo xbt_strbuff.lo xbt_sha.lo ex.lo \ xbt_virtu.lo xbt_os_time.lo asserts.lo log.lo \ xbt_log_appender_file.lo xbt_log_layout_simple.lo \ xbt_log_layout_format.lo mallocator.lo dynar.lo dict.lo \ @@ -121,14 +121,15 @@ libgras_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(libgras_la_LDFLAGS) $(LDFLAGS) -o $@ libsimgrid_la_LIBADD = am__libsimgrid_la_SOURCES_DIST = xbt/snprintf.c xbt/xbt_str.c \ - xbt/xbt_strbuff.c xbt/ex.c xbt_modinter.h gras_modinter.h \ - xbt/xbt_virtu.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 xbt/mallocator.c xbt/dynar.c \ - xbt/dict.c xbt/dict_elm.c xbt/dict_cursor.c xbt/dict_multi.c \ - xbt/heap.c xbt/fifo.c xbt/swag.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 surf/maxmin.c \ + xbt/xbt_strbuff.c xbt/xbt_sha.c xbt/ex.c xbt_modinter.h \ + gras_modinter.h xbt/xbt_virtu.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 \ + xbt/mallocator.c xbt/dynar.c xbt/dict.c xbt/dict_elm.c \ + xbt/dict_cursor.c xbt/dict_multi.c xbt/heap.c xbt/fifo.c \ + xbt/swag.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 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/network_constant.c surf/workstation.c \ @@ -212,11 +213,13 @@ am__testall_SOURCES_DIST = @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 @builddir@/simgrid_units_main.c + @builddir@/xbt_sha_unit.c @builddir@/config_unit.c \ + @builddir@/simgrid_units_main.c @GRAMINE_MODE_FALSE@am__objects_21 = cunit_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ ex_unit.$(OBJEXT) dynar_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ dict_unit.$(OBJEXT) set_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ swag_unit.$(OBJEXT) xbt_str_unit.$(OBJEXT) \ +@GRAMINE_MODE_FALSE@ xbt_sha_unit.$(OBJEXT) \ @GRAMINE_MODE_FALSE@ config_unit.$(OBJEXT) @GRAMINE_MODE_FALSE@am_testall_OBJECTS = $(am__objects_21) \ @GRAMINE_MODE_FALSE@ simgrid_units_main.$(OBJEXT) @@ -463,7 +466,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 \ @@ -634,12 +637,12 @@ libsmpi_la_LDFLAGS = $(VERSION_INFO) @SMPI_DEP@ @LD_DYNAMIC_FLAGS@ -lm \ @HAVE_JAVA_TRUE@jar_DATA = simgrid.jar @GRAMINE_MODE_FALSE@TEST_CFILES = xbt/cunit.c xbt/ex.c \ @GRAMINE_MODE_FALSE@ xbt/dynar.c xbt/dict.c xbt/set.c xbt/swag.c \ -@GRAMINE_MODE_FALSE@ xbt/xbt_str.c \ +@GRAMINE_MODE_FALSE@ xbt/xbt_str.c xbt/xbt_sha.c \ @GRAMINE_MODE_FALSE@ xbt/config.c -@GRAMINE_MODE_FALSE@TEST_UNITS = @builddir@/cunit_unit.c @builddir@/ex_unit.c \ -@GRAMINE_MODE_FALSE@ @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \ -@GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c \ +@GRAMINE_MODE_FALSE@TEST_UNITS = @builddir@/cunit_unit.c @builddir@/ex_unit.c \ +@GRAMINE_MODE_FALSE@ @builddir@/dynar_unit.c @builddir@/dict_unit.c @builddir@/set_unit.c @builddir@/swag_unit.c \ +@GRAMINE_MODE_FALSE@ @builddir@/xbt_str_unit.c @builddir@/xbt_sha_unit.c\ @GRAMINE_MODE_FALSE@ @builddir@/config_unit.c @GRAMINE_MODE_FALSE@BUILT_SOURCES = ../include/surf/simgrid_dtd.h surf/simgrid_dtd.c \ @@ -904,6 +907,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_stubs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_synchro.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sg_time.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sha.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_sha_unit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_str_unit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xbt_strbuff.Plo@am__quote@ @@ -951,6 +956,13 @@ xbt_strbuff.lo: xbt/xbt_strbuff.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_strbuff.lo `test -f 'xbt/xbt_strbuff.c' || echo '$(srcdir)/'`xbt/xbt_strbuff.c +xbt_sha.lo: xbt/xbt_sha.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sha.lo -MD -MP -MF $(DEPDIR)/xbt_sha.Tpo -c -o xbt_sha.lo `test -f 'xbt/xbt_sha.c' || echo '$(srcdir)/'`xbt/xbt_sha.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xbt_sha.Tpo $(DEPDIR)/xbt_sha.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xbt/xbt_sha.c' object='xbt_sha.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sha.lo `test -f 'xbt/xbt_sha.c' || echo '$(srcdir)/'`xbt/xbt_sha.c + ex.lo: xbt/ex.c @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ex.lo -MD -MP -MF $(DEPDIR)/ex.Tpo -c -o ex.lo `test -f 'xbt/ex.c' || echo '$(srcdir)/'`xbt/ex.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ex.Tpo $(DEPDIR)/ex.Plo @@ -1889,6 +1901,20 @@ xbt_str_unit.obj: @builddir@/xbt_str_unit.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_str_unit.obj `if test -f '@builddir@/xbt_str_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_str_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_str_unit.c'; fi` +xbt_sha_unit.o: @builddir@/xbt_sha_unit.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sha_unit.o -MD -MP -MF $(DEPDIR)/xbt_sha_unit.Tpo -c -o xbt_sha_unit.o `test -f '@builddir@/xbt_sha_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_sha_unit.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xbt_sha_unit.Tpo $(DEPDIR)/xbt_sha_unit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@builddir@/xbt_sha_unit.c' object='xbt_sha_unit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sha_unit.o `test -f '@builddir@/xbt_sha_unit.c' || echo '$(srcdir)/'`@builddir@/xbt_sha_unit.c + +xbt_sha_unit.obj: @builddir@/xbt_sha_unit.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xbt_sha_unit.obj -MD -MP -MF $(DEPDIR)/xbt_sha_unit.Tpo -c -o xbt_sha_unit.obj `if test -f '@builddir@/xbt_sha_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_sha_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_sha_unit.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xbt_sha_unit.Tpo $(DEPDIR)/xbt_sha_unit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@builddir@/xbt_sha_unit.c' object='xbt_sha_unit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xbt_sha_unit.obj `if test -f '@builddir@/xbt_sha_unit.c'; then $(CYGPATH_W) '@builddir@/xbt_sha_unit.c'; else $(CYGPATH_W) '$(srcdir)/@builddir@/xbt_sha_unit.c'; fi` + config_unit.o: @builddir@/config_unit.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT config_unit.o -MD -MP -MF $(DEPDIR)/config_unit.Tpo -c -o config_unit.o `test -f '@builddir@/config_unit.c' || echo '$(srcdir)/'`@builddir@/config_unit.c @am__fastdepCC_TRUE@ mv -f $(DEPDIR)/config_unit.Tpo $(DEPDIR)/config_unit.Po @@ -2263,6 +2289,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-jarDATA \ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/xbt_str_unit.c: xbt/xbt_str.c @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/xbt_sha_unit.c: xbt/xbt_sha.c +@GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dynar_unit.c: xbt/dynar.c @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@ @top_srcdir@/tools/sg_unit_extractor.pl $^ @GRAMINE_MODE_FALSE@@MAINTAINER_MODE_TRUE@@builddir@/dict_unit.c: xbt/dict.c diff --git a/src/dynar_unit.c b/src/dynar_unit.c index 7c451b5213..3b34ae54fa 100644 --- a/src/dynar_unit.c +++ b/src/dynar_unit.c @@ -8,7 +8,7 @@ /* GENERATED FILE, DO NOT EDIT */ /*******************************/ -# 728 "xbt/dynar.c" +# 742 "xbt/dynar.c" #define NB_ELEM 5000 diff --git a/src/ex_unit.c b/src/ex_unit.c index 6abe169985..199ecbbee4 100644 --- a/src/ex_unit.c +++ b/src/ex_unit.c @@ -8,7 +8,7 @@ /* GENERATED FILE, DO NOT EDIT */ /*******************************/ -# 187 "xbt/ex.c" +# 188 "xbt/ex.c" #include #include "xbt/ex.h" diff --git a/src/simgrid_units_main.c b/src/simgrid_units_main.c index f65097ecb5..909fdce9a3 100644 --- a/src/simgrid_units_main.c +++ b/src/simgrid_units_main.c @@ -51,6 +51,10 @@ extern xbt_test_unit_t _xbt_current_unit; void test_split_str(void); /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/xbt_sha.c */ + void test_crypto_sha(void); + /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/config.c */ void test_config_memuse(void); void test_config_validation(void); @@ -119,6 +123,11 @@ int main(int argc, char *argv[]) { xbt_test_suite_push(suite, "xbt_str_split_str", test_split_str, "test the function xbt_str_split_str"); /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/xbt_sha.c */ + suite = xbt_test_suite_by_name("hash","Various hash functions"); + xbt_test_suite_push(suite, "sha", test_crypto_sha, "Test of the sha algorithm"); + /* SGU: END FILE */ + /* SGU: BEGIN FILE xbt/config.c */ suite = xbt_test_suite_by_name("config","Configuration support"); xbt_test_suite_push(suite, "memuse", test_config_memuse, "Alloc and free a config set"); diff --git a/src/xbt_sha_unit.c b/src/xbt_sha_unit.c new file mode 100644 index 0000000000..fea298cf36 --- /dev/null +++ b/src/xbt_sha_unit.c @@ -0,0 +1,52 @@ +/*******************************/ +/* GENERATED FILE, DO NOT EDIT */ +/*******************************/ + +#include +#include "xbt.h" +/*******************************/ +/* GENERATED FILE, DO NOT EDIT */ +/*******************************/ + +# 164 "xbt/xbt_sha.c" +#include "xbt/hash.h" +#include "portable.h" /* hexa_str */ + +static char* mycmp(const char *p1, const char *p2,size_t n) { + int i; + + for (i=0; i