From: Arnaud Giersch Date: Wed, 30 Jan 2013 16:15:42 +0000 (+0100) Subject: Merge branch 'v3_9_x' X-Git-Tag: v3_9_90~592^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fbbc5d9c3b45d6be495f0b7f85ce84547c173567?hp=373ed09fef634fb125c5039bbc722fbe49e93120 Merge branch 'v3_9_x' --- diff --git a/.gitignore b/.gitignore index 5c2ec2a6e5..b60eef05d2 100644 --- a/.gitignore +++ b/.gitignore @@ -256,6 +256,149 @@ teshsuite/smpi/split teshsuite/smpi/struct_test teshsuite/smpi/ttest01 teshsuite/smpi/vector_test +teshsuite/smpi/mpich-test/*/*.out +teshsuite/smpi/mpich-test/*/*.stdo +teshsuite/smpi/mpich-test/coll/allgatherf +teshsuite/smpi/mpich-test/coll/allred +teshsuite/smpi/mpich-test/coll/allred2 +teshsuite/smpi/mpich-test/coll/allredf +teshsuite/smpi/mpich-test/coll/allredmany +teshsuite/smpi/mpich-test/coll/alltoallv_mpich +teshsuite/smpi/mpich-test/coll/assocf +teshsuite/smpi/mpich-test/coll/barrier +teshsuite/smpi/mpich-test/coll/bcast_mpich +teshsuite/smpi/mpich-test/coll/bcastbug +teshsuite/smpi/mpich-test/coll/bcastbug2 +teshsuite/smpi/mpich-test/coll/bcastlog +teshsuite/smpi/mpich-test/coll/bcastvec +teshsuite/smpi/mpich-test/coll/coll1 +teshsuite/smpi/mpich-test/coll/coll10 +teshsuite/smpi/mpich-test/coll/coll11 +teshsuite/smpi/mpich-test/coll/coll12 +teshsuite/smpi/mpich-test/coll/coll13 +teshsuite/smpi/mpich-test/coll/coll2 +teshsuite/smpi/mpich-test/coll/coll3 +teshsuite/smpi/mpich-test/coll/coll4 +teshsuite/smpi/mpich-test/coll/coll5 +teshsuite/smpi/mpich-test/coll/coll6 +teshsuite/smpi/mpich-test/coll/coll7 +teshsuite/smpi/mpich-test/coll/coll8 +teshsuite/smpi/mpich-test/coll/coll9 +teshsuite/smpi/mpich-test/coll/grouptest +teshsuite/smpi/mpich-test/coll/longuser +teshsuite/smpi/mpich-test/coll/redscat +teshsuite/smpi/mpich-test/coll/redtst +teshsuite/smpi/mpich-test/coll/scantst +teshsuite/smpi/mpich-test/coll/scattern +teshsuite/smpi/mpich-test/coll/scatterv +teshsuite/smpi/mpich-test/context/attrerr +teshsuite/smpi/mpich-test/context/groupcreate +teshsuite/smpi/mpich-test/context/grouptest_mpich +teshsuite/smpi/mpich-test/context/icdup +teshsuite/smpi/mpich-test/context/ictest +teshsuite/smpi/mpich-test/context/ictest2 +teshsuite/smpi/mpich-test/context/ictest3 +teshsuite/smpi/mpich-test/env/aborttest +teshsuite/smpi/mpich-test/env/baseattr +teshsuite/smpi/mpich-test/env/env.diff +teshsuite/smpi/mpich-test/env/errhand +teshsuite/smpi/mpich-test/env/getproc +teshsuite/smpi/mpich-test/env/getprocf +teshsuite/smpi/mpich-test/env/gtime +teshsuite/smpi/mpich-test/env/init +teshsuite/smpi/mpich-test/env/sigchk +teshsuite/smpi/mpich-test/env/testerr +teshsuite/smpi/mpich-test/env/timers +teshsuite/smpi/mpich-test/env/timertest +teshsuite/smpi/mpich-test/profile/colluses +teshsuite/smpi/mpich-test/profile/ptest +teshsuite/smpi/mpich-test/pt2pt/bsendtest +teshsuite/smpi/mpich-test/pt2pt/cancel +teshsuite/smpi/mpich-test/pt2pt/cancel2 +teshsuite/smpi/mpich-test/pt2pt/cancel3 +teshsuite/smpi/mpich-test/pt2pt/cancelibm +teshsuite/smpi/mpich-test/pt2pt/cancelissend +teshsuite/smpi/mpich-test/pt2pt/cancelmessages +teshsuite/smpi/mpich-test/pt2pt/commit +teshsuite/smpi/mpich-test/pt2pt/dataalign +teshsuite/smpi/mpich-test/pt2pt/dtypelife +teshsuite/smpi/mpich-test/pt2pt/dtyperecv +teshsuite/smpi/mpich-test/pt2pt/exittest +teshsuite/smpi/mpich-test/pt2pt/fifth +teshsuite/smpi/mpich-test/pt2pt/flood +teshsuite/smpi/mpich-test/pt2pt/flood2 +teshsuite/smpi/mpich-test/pt2pt/fourth +teshsuite/smpi/mpich-test/pt2pt/getelm +teshsuite/smpi/mpich-test/pt2pt/hindexed +teshsuite/smpi/mpich-test/pt2pt/htmsg +teshsuite/smpi/mpich-test/pt2pt/hvec +teshsuite/smpi/mpich-test/pt2pt/hvectest +teshsuite/smpi/mpich-test/pt2pt/hvectest2 +teshsuite/smpi/mpich-test/pt2pt/irecvtest +teshsuite/smpi/mpich-test/pt2pt/irsend +teshsuite/smpi/mpich-test/pt2pt/irsendinit +teshsuite/smpi/mpich-test/pt2pt/isendf +teshsuite/smpi/mpich-test/pt2pt/isendtest +teshsuite/smpi/mpich-test/pt2pt/isndrcv +teshsuite/smpi/mpich-test/pt2pt/issend2 +teshsuite/smpi/mpich-test/pt2pt/issendinit +teshsuite/smpi/mpich-test/pt2pt/issendtest +teshsuite/smpi/mpich-test/pt2pt/longmsgs +teshsuite/smpi/mpich-test/pt2pt/nblock +teshsuite/smpi/mpich-test/pt2pt/nbtest +teshsuite/smpi/mpich-test/pt2pt/nullproc +teshsuite/smpi/mpich-test/pt2pt/nullproc2 +teshsuite/smpi/mpich-test/pt2pt/order +teshsuite/smpi/mpich-test/pt2pt/overtake +teshsuite/smpi/mpich-test/pt2pt/pack +teshsuite/smpi/mpich-test/pt2pt/persist +teshsuite/smpi/mpich-test/pt2pt/persist2 +teshsuite/smpi/mpich-test/pt2pt/persistent +teshsuite/smpi/mpich-test/pt2pt/pingpong_f +teshsuite/smpi/mpich-test/pt2pt/probe +teshsuite/smpi/mpich-test/pt2pt/probe1 +teshsuite/smpi/mpich-test/pt2pt/relrank +teshsuite/smpi/mpich-test/pt2pt/reqcreate +teshsuite/smpi/mpich-test/pt2pt/reqfree +teshsuite/smpi/mpich-test/pt2pt/secondf +teshsuite/smpi/mpich-test/pt2pt/self +teshsuite/smpi/mpich-test/pt2pt/selfvsworld +teshsuite/smpi/mpich-test/pt2pt/send1 +teshsuite/smpi/mpich-test/pt2pt/sendcplx +teshsuite/smpi/mpich-test/pt2pt/sendfort +teshsuite/smpi/mpich-test/pt2pt/sendmany +teshsuite/smpi/mpich-test/pt2pt/sendorder +teshsuite/smpi/mpich-test/pt2pt/sendrecv2 +teshsuite/smpi/mpich-test/pt2pt/sendrecv3 +teshsuite/smpi/mpich-test/pt2pt/sendrecv4 +teshsuite/smpi/mpich-test/pt2pt/sendrecv_mpich +teshsuite/smpi/mpich-test/pt2pt/sixth +teshsuite/smpi/mpich-test/pt2pt/sndrcv +teshsuite/smpi/mpich-test/pt2pt/sndrcvrep +teshsuite/smpi/mpich-test/pt2pt/sndrcvrpl2 +teshsuite/smpi/mpich-test/pt2pt/ssendtest +teshsuite/smpi/mpich-test/pt2pt/ssendtest2 +teshsuite/smpi/mpich-test/pt2pt/structlb +teshsuite/smpi/mpich-test/pt2pt/testall_mpich +teshsuite/smpi/mpich-test/pt2pt/testsome +teshsuite/smpi/mpich-test/pt2pt/testtest1 +teshsuite/smpi/mpich-test/pt2pt/testtypes +teshsuite/smpi/mpich-test/pt2pt/third +teshsuite/smpi/mpich-test/pt2pt/trunc +teshsuite/smpi/mpich-test/pt2pt/truncmult +teshsuite/smpi/mpich-test/pt2pt/typebase +teshsuite/smpi/mpich-test/pt2pt/typebasef +teshsuite/smpi/mpich-test/pt2pt/typecreate +teshsuite/smpi/mpich-test/pt2pt/typelb +teshsuite/smpi/mpich-test/pt2pt/typetest +teshsuite/smpi/mpich-test/pt2pt/typeub +teshsuite/smpi/mpich-test/pt2pt/typeub2 +teshsuite/smpi/mpich-test/pt2pt/typeub3 +teshsuite/smpi/mpich-test/pt2pt/waitall +teshsuite/smpi/mpich-test/pt2pt/waitall2 +teshsuite/smpi/mpich-test/pt2pt/waitall3 +teshsuite/smpi/mpich-test/pt2pt/waitall4 +teshsuite/smpi/mpich-test/pt2pt/waitany teshsuite/msg/get_sender teshsuite/msg/trace/test_trace_integration teshsuite/simdag/basic0 diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 94c715b4d4..a14a301e54 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -785,7 +785,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/test_prog/prog_stackgrowth.c buildtools/Cmake/test_prog/prog_stacksetup.c buildtools/Cmake/test_prog/prog_thread_storage.c - buildtools/Cmake/test_prog/prog_va_copy.c buildtools/Cmake/test_prog/prog_vsnprintf.c ) diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake index 905c564ca6..91d09b5d4a 100644 --- a/buildtools/Cmake/Distrib.cmake +++ b/buildtools/Cmake/Distrib.cmake @@ -287,6 +287,9 @@ set(CMAKE_BINARY_TEST_DIR ${CMAKE_BINARY_DIR}) # Allow to test the "make dist" add_custom_target(distcheck + COMMAND ${CMAKE_COMMAND} -E echo "XXX compare archive with git repository" + COMMAND ${CMAKE_HOME_DIRECTORY}/tools/check_dist_archive -batch ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}.tar.gz + COMMAND ${CMAKE_COMMAND} -E echo "XXX remove old copy" COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version} diff --git a/src/mc/README b/src/mc/README deleted file mode 100644 index e2c38da1fc..0000000000 --- a/src/mc/README +++ /dev/null @@ -1,9 +0,0 @@ -This file lists the issues to solve to achieve a the full integration of the MC branch: -- Model-checker entry point: - Up to now, the main function of each user API has to be modified to call MC_modelcheck instead of SIMIX_solve. - It would be nice to have a command line option like --model-check to determine the right behaviour. - -- Memory managment routines: - Because mc_memory.c redefines malloc, calloc, realloc and free, now even the simulator is going to use - the mmalloc library. This is no good because it is far slower than GNU's malloc, so some black magic should be - used to link against one library or the other depending on the mode choosed by the user. diff --git a/src/smpi/sample/reduce.c b/src/smpi/sample/reduce.c deleted file mode 100644 index f7321d6028..0000000000 --- a/src/smpi/sample/reduce.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (c) 2007, 2009, 2010. The SimGrid Team. - * All rights reserved. */ - -/* This program is free software; you can redistribute it and/or modify it - * under the terms of the license (GNU LGPL) which comes with this package. */ - -#include -#include - -int main(int argc, char **argv) -{ - int size, rank; - int root = 0; - int value = 1; - int sum = -99; - - double start_timer; - - - MPI_Init(&argc, &argv); - MPI_Comm_size(MPI_COMM_WORLD, &size); - MPI_Comm_rank(MPI_COMM_WORLD, &rank); - - start_timer = MPI_Wtime(); - - printf("rank %d has value %d\n", rank, value); - MPI_Reduce(&value, &sum, 1, MPI_INT, MPI_SUM, root, MPI_COMM_WORLD); - if (rank == root) { - printf("On root: sum=%d\n", sum); - printf("Elapsed time=%lf s\n", MPI_Wtime() - start_timer); - } - MPI_Finalize(); - return 0; -} diff --git a/teshsuite/smpi/mpich-test/.gitignore b/teshsuite/smpi/mpich-test/.gitignore deleted file mode 100644 index 0fb5f048c7..0000000000 --- a/teshsuite/smpi/mpich-test/.gitignore +++ /dev/null @@ -1,144 +0,0 @@ -*.out -*.stdo - -coll/allgatherf -coll/allred -coll/allred2 -coll/allredf -coll/allredmany -coll/alltoallv_mpich -coll/assocf -coll/barrier -coll/bcast_mpich -coll/bcastbug -coll/bcastbug2 -coll/bcastlog -coll/bcastvec -coll/coll1 -coll/coll10 -coll/coll11 -coll/coll12 -coll/coll13 -coll/coll2 -coll/coll3 -coll/coll4 -coll/coll5 -coll/coll6 -coll/coll7 -coll/coll8 -coll/coll9 -coll/grouptest -coll/longuser -coll/redscat -coll/redtst -coll/scantst -coll/scattern -coll/scatterv -context/attrerr -context/groupcreate -context/grouptest_mpich -context/icdup -context/ictest -context/ictest2 -context/ictest3 -env/aborttest -env/baseattr -env/env.diff -env/errhand -env/getproc -env/getprocf -env/gtime -env/init -env/sigchk -env/testerr -env/timers -env/timertest -profile/colluses -profile/ptest -pt2pt/bsendtest -pt2pt/cancel -pt2pt/cancel2 -pt2pt/cancel3 -pt2pt/cancelibm -pt2pt/cancelissend -pt2pt/cancelmessages -pt2pt/commit -pt2pt/dataalign -pt2pt/dtypelife -pt2pt/dtyperecv -pt2pt/exittest -pt2pt/fifth -pt2pt/flood -pt2pt/flood2 -pt2pt/fourth -pt2pt/getelm -pt2pt/hindexed -pt2pt/htmsg -pt2pt/hvec -pt2pt/hvectest -pt2pt/hvectest2 -pt2pt/irecvtest -pt2pt/irsend -pt2pt/irsendinit -pt2pt/isendf -pt2pt/isendtest -pt2pt/isndrcv -pt2pt/issend2 -pt2pt/issendinit -pt2pt/issendtest -pt2pt/longmsgs -pt2pt/nblock -pt2pt/nbtest -pt2pt/nullproc -pt2pt/nullproc2 -pt2pt/order -pt2pt/overtake -pt2pt/pack -pt2pt/persist -pt2pt/persist2 -pt2pt/persistent -pt2pt/pingpong_f -pt2pt/probe -pt2pt/probe1 -pt2pt/relrank -pt2pt/reqcreate -pt2pt/reqfree -pt2pt/secondf -pt2pt/self -pt2pt/selfvsworld -pt2pt/send1 -pt2pt/sendcplx -pt2pt/sendfort -pt2pt/sendmany -pt2pt/sendorder -pt2pt/sendrecv2 -pt2pt/sendrecv3 -pt2pt/sendrecv4 -pt2pt/sendrecv_mpich -pt2pt/sixth -pt2pt/sndrcv -pt2pt/sndrcvrep -pt2pt/sndrcvrpl2 -pt2pt/ssendtest -pt2pt/ssendtest2 -pt2pt/structlb -pt2pt/testall_mpich -pt2pt/testsome -pt2pt/testtest1 -pt2pt/testtypes -pt2pt/third -pt2pt/trunc -pt2pt/truncmult -pt2pt/typebase -pt2pt/typebasef -pt2pt/typecreate -pt2pt/typelb -pt2pt/typetest -pt2pt/typeub -pt2pt/typeub2 -pt2pt/typeub3 -pt2pt/waitall -pt2pt/waitall2 -pt2pt/waitall3 -pt2pt/waitall4 -pt2pt/waitany diff --git a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt index 1572fbf84c..a41d932885 100644 --- a/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt +++ b/teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt @@ -401,6 +401,7 @@ set(bin_files ) set(txt_files ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/README ${CMAKE_CURRENT_SOURCE_DIR}/runtests ${CMAKE_CURRENT_SOURCE_DIR}/self.std ${CMAKE_CURRENT_SOURCE_DIR}/sndrcvrep.std @@ -424,6 +425,5 @@ set(txt_files ${CMAKE_CURRENT_SOURCE_DIR}/structf.std ${CMAKE_CURRENT_SOURCE_DIR}/typecreate.std ${CMAKE_CURRENT_SOURCE_DIR}/nblock.std - -PARENT_SCOPE + PARENT_SCOPE ) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 7634adcc37..bcf8684780 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -14,3 +14,9 @@ set(bin_files ${CMAKE_CURRENT_SOURCE_DIR}/MSG_visualization/trace2fig.pl PARENT_SCOPE ) + +set(txt_files + ${txt_files} + ${CMAKE_CURRENT_SOURCE_DIR}/simgrid2vite.sed + PARENT_SCOPE + ) diff --git a/tools/check_dist_archive b/tools/check_dist_archive new file mode 100755 index 0000000000..22c717b547 --- /dev/null +++ b/tools/check_dist_archive @@ -0,0 +1,100 @@ +#!/bin/bash + +set -e + +if [ "$1" = "-batch" ]; then + shift + interactive=0 +elif [ -t 1 ]; then + interactive=1 +else + interactive=0 +fi + +if [ $# -lt 1 -o $# -gt 3 ]; then + cat < $arch_dir" +tar --directory "$tmpdir" \ + --transform 's!^[^/]*!a!' \ + --extract --gunzip --file "$archive" + +echo "Copying git repository: $giturl/$gitbranch -> $git_dir" +git archive --format=tar --prefix="b/" --remote="$giturl" "$gitbranch" \ + | tar --directory "$tmpdir" --extract --file - + +fa=from_tgz +fb=from_git +cd "$tmpdir" + +sed -n '/^-/{s/^- //;p;}' "$exclude" > ea +sed -n '/^+/{s/^+ //;p;}' "$exclude" > eb + +find a -type f \ + | sed 's!^a/!!' \ + | grep -E -v -x -f ea \ + | sort > "$fa" +find b -type f \ + | sed 's!^b/!!' \ + | grep -E -v -x -f eb \ + | sort > "$fb" + +diffcmd() { + diff -u "$fa" "$fb" +} + +colordiff=$(type -p colordiff) +colorless() { + if [ -n "$colordiff" ]; then + "$colordiff" | less -R -F + else + less -F + fi +} + +if [ "$interactive" = "1" ]; then + diffcmd | colorless +else + diffcmd +fi diff --git a/tools/check_dist_archive.exclude b/tools/check_dist_archive.exclude new file mode 100644 index 0000000000..8339ce8a41 --- /dev/null +++ b/tools/check_dist_archive.exclude @@ -0,0 +1,77 @@ +# Expected dfferences between git repository and tardists +# +# lines beginning with '#', and empty lines are ignored +# lines beginning with '- ' are expected in archive only +# lines beginning with '+ ' are expected in git only +# each line is an extended regexp that should match full file names + +- Makefile +- doc/html/.* + ++ \.gitignore ++ README\.(coding|git) ++ mk_win-dist.sh + ++ buildtools/(jenkins|pipol)/.* + ++ contrib/.* + ++ examples/msg/actions/NAS_LU_S_4/.* ++ examples/msg/chainsend/generate_deployment_file\.rb ++ examples/msg/chord/chord3\.xml + ++ examples/smpi/MM/command_exemple ++ examples/smpi/MM/host ++ examples/smpi/NAS/.* + ++ src/simix/README_attempt_without_stack ++ src/simix/simix_network\.tla + ++ src/smpi/BUGS ++ src/smpi/fixsrc\.pl ++ src/smpi/myprintloc\.cocci ++ src/smpi/patch_source\.sh ++ src/smpi/replace_globals\.cocci ++ src/smpi/replace_static\.cocci + ++ teshsuite/smpi/mpich-test/coll/bcast2\.f ++ teshsuite/smpi/mpich-test/coll/nbcoll\.c ++ teshsuite/smpi/mpich-test/coll/shortint\.c ++ teshsuite/smpi/mpich-test/coll/temprun ++ teshsuite/smpi/mpich-test/context/attrt\.c ++ teshsuite/smpi/mpich-test/context/commnames\.c ++ teshsuite/smpi/mpich-test/env/argstest\.c ++ teshsuite/smpi/mpich-test/env/cmdline\.c ++ teshsuite/smpi/mpich-test/env/errhand2\.c ++ teshsuite/smpi/mpich-test/env/hang\.c ++ teshsuite/smpi/mpich-test/pt2pt/fairness/README ++ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness-euih\.c ++ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness\.c ++ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness2\.c ++ teshsuite/smpi/mpich-test/pt2pt/fairness/fairness2m\.c ++ teshsuite/smpi/mpich-test/pt2pt/fairness/fairnessm\.c ++ teshsuite/smpi/mpich-test/pt2pt/isndrcv2\.c ++ teshsuite/smpi/mpich-test/pt2pt/mpitest\.h ++ teshsuite/smpi/mpich-test/pt2pt/systest\.c ++ teshsuite/smpi/mpich-test/pt2pt/systest1\.c ++ teshsuite/smpi/mpich-test/pt2pt/testhetero ++ teshsuite/smpi/mpich-test/topol/cart\.c ++ teshsuite/smpi/mpich-test/topol/cart1f\.f ++ teshsuite/smpi/mpich-test/topol/cart2\.c ++ teshsuite/smpi/mpich-test/topol/cart2f\.f ++ teshsuite/smpi/mpich-test/topol/cartc\.f90 ++ teshsuite/smpi/mpich-test/topol/cartf\.f ++ teshsuite/smpi/mpich-test/topol/cartf\.std ++ teshsuite/smpi/mpich-test/topol/cartmap\.c ++ teshsuite/smpi/mpich-test/topol/cartmap\.std ++ teshsuite/smpi/mpich-test/topol/cartorder\.c ++ teshsuite/smpi/mpich-test/topol/dims\.c ++ teshsuite/smpi/mpich-test/topol/graphtest\.c ++ teshsuite/smpi/mpich-test/topol/graphtest\.std ++ teshsuite/smpi/mpich-test/topol/test\.c ++ teshsuite/smpi/mpich-test/topol/test\.h ++ teshsuite/smpi/mpich-test/topol/twod\.f ++ teshsuite/smpi/mpich-test/topol/twod2\.f + ++ tools/check_dist_archive ++ tools/check_dist_archive\.exclude