tiny conflict resolution

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 99e7567..8ed5023 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.patch
 *.plist
 *.trace
+*.class
 
 ################################################
 ### Maintainer mode
@@ -66,12 +67,13 @@ CMakeFiles
 CMakeCache.txt
 DartConfiguration.tcl
 simgrid.nsi
+TAGS
 Testing/
 Makefile
 bin/
 lib/
 manpages/
-build_dir/
+build_*/
 build/
 buildtools/Cmake/memcheck_tests.cmake
 buildtools/Cmake/test_prog/prog_va_copy.c
@@ -94,43 +96,14 @@ doc/footer.html
 *.doc.toc
 doc/latex/
 doc/html
-doc/user_guide/html
-doc/user_guide/latex
-doc/ref_guide/html
-doc/ref_guide/latex
-doc/dev_guide/html
-doc/dev_guide/latex
 doc/index.php
 doc/simgrid.tag
-doc/publis_core.bib
-doc/publis_core_bib.html
-doc/publis_count.html
-doc/publis_extern.bib
-doc/publis_extern_bib.html
-doc/publis_intra.bib
-doc/publis_intra_bib.html
-doc/ref_guide/doxygen/RefGuideDoxyfile
-doc/user_guide/doxygen/UserGuideDoxyfile
-doc/dev_guide/doxygen/DevGuideDoxyfile
-doc/ref_guide/doxygen/logcategories.doc
-doc/user_guide/doxygen/logcategories.doc
-doc/dev_guide/doxygen/logcategories.doc
-doc/ref_guide/doxygen/simgrid_modules.map
-doc/user_guide/doxygen/simgrid_modules.map
-doc/dev_guide/doxygen/simgrid_modules.map
+doc/doxygen/logcategories.doc
 doc/index-API.doc
-doc/ref_guide/doxygen/index-API.doc
-doc/user_guide/doxygen/index-API.doc
-doc/dev_guide/doxygen/index-API.doc
 doc/simgrid_modules.map
-doc/logcategories.doc
-doc/shared/doxygen/simgridrefguide.tag
-doc/shared/doxygen/simgriduserguide.tag
-doc/shared/doxygen/simgriddevguide.tag
 
 ################################################
 ### Specific of project 
-.cproject
 .project
 .settings/
 .anjuta
@@ -170,17 +143,12 @@ examples/msg/tracing/volume
 examples/msg/io/file
 examples/msg/io/file_unlink
 examples/msg/mc/bugged3
-examples/msg/mc/random_test
-examples/msg/mc/bugged1_for_liveness
-examples/msg/mc/bugged1_while_liveness
-examples/msg/mc/centralized_liveness_deadlock
-examples/msg/mc/test/test_heap_comparison
-examples/msg/mc/chord_liveness
-examples/msg/mc/test/snapshot_comparison_liveness1
-examples/msg/mc/test/snapshot_comparison_liveness2
-examples/msg/mc/test/snapshot_comparison_liveness3
-examples/msg/mc/test/snapshot_comparison_liveness4
-examples/msg/mc/test/snapshot_comparison_liveness5
+examples/msg/mc/test/snapshot_comparison1
+examples/msg/mc/test/snapshot_comparison2
+examples/msg/mc/test/snapshot_comparison3
+examples/msg/mc/test/snapshot_comparison4
+examples/msg/mc/test/snapshot_comparison5
+examples/msg/chainsend/chainsend
 examples/msg/chord/chord
 examples/msg/chord/chord_stateful
 examples/msg/chord/deployments
@@ -245,7 +213,7 @@ examples/msg/pmm/msg_pmm
 examples/smpi/toto.txt
 examples/smpi/MM/MM_mpi
 examples/smpi/smpi_replay
-examples/smpi/replay
+examples/smpi/replay/one_trace
 examples/smpi/bcbench
 examples/smpi/first
 examples/smpi/mvmul
@@ -264,6 +232,13 @@ examples/msg/mc/centralized_liveness
 
 src/replay/replay
 src/testall
+teshsuite/smpi/allgather_coll
+teshsuite/smpi/allgatherv_coll
+teshsuite/smpi/allreduce_coll
+teshsuite/smpi/alltoall_coll
+teshsuite/smpi/alltoallv_coll
+teshsuite/smpi/bcast_coll
+teshsuite/smpi/reduce_coll
 teshsuite/smpi/allreduce
 teshsuite/smpi/alltoall2
 teshsuite/smpi/alltoall_basic
@@ -283,8 +258,153 @@ 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/pid
 teshsuite/msg/get_sender
 teshsuite/msg/trace/test_trace_integration
+teshsuite/simdag/availability/availability_test
 teshsuite/simdag/basic0
 teshsuite/simdag/basic1
 teshsuite/simdag/basic2
@@ -313,6 +433,7 @@ teshsuite/xbt/log_large_test
 teshsuite/xbt/parallel_log_crashtest
 testsuite/xbt/parmap_bench
 teshsuite/xbt/mmalloc_test
+teshsuite/xbt/parmap_test
 testsuite/run_tests
 testsuite/simdag/sd_test
 testsuite/surf/lmm_usage
@@ -341,27 +462,22 @@ examples/smpi/smpi_traced.trace
 examples/simdag/dot/simulate_dot
 teshsuite/simdag/platforms/graphicator
 
-#########################################""
-## tutorial files
-doc/gtut-files/01-bones_client
-doc/gtut-files/01-bones_server
-doc/gtut-files/02-simple_client
-doc/gtut-files/02-simple_server
-doc/gtut-files/03-args_client
-doc/gtut-files/03-args_server
-doc/gtut-files/04-callback_client
-doc/gtut-files/04-callback_server
-doc/gtut-files/05-globals_client
-doc/gtut-files/05-globals_server
-doc/gtut-files/06-logs_client
-doc/gtut-files/06-logs_server
-doc/gtut-files/07-timers_client
-doc/gtut-files/07-timers_server
-doc/gtut-files/08-exceptions_client
-doc/gtut-files/08-exceptions_server
-doc/gtut-files/09-simpledata_client
-doc/gtut-files/09-simpledata_server
-doc/gtut-files/10-rpc_client
-doc/gtut-files/10-rpc_server
-doc/gtut-files/11-explicitwait_client
-doc/gtut-files/11-explicitwait_server
+#########################################
+## touched files to track the dependencies of java examples
+examples/java/async/java_async_compiled
+examples/java/bittorrent/java_bittorrent_compiled
+examples/java/chord/java_chord_compiled
+examples/java/cloud/java_cloud_compiled
+examples/java/commTime/java_commTime_compiled
+examples/java/io/java_io_compiled
+examples/java/kademlia/java_kademlia_compiled
+examples/java/master_slave_bypass/java_master_slave_bypass_compiled
+examples/java/master_slave_kill/java_master_slave_kill_compiled
+examples/java/masterslave/java_masterslave_compiled
+examples/java/migration/java_migration_compiled
+examples/java/mutualExclusion/java_mutualExclusion_compiled
+examples/java/pingPong/java_pingPong_compiled
+examples/java/priority/java_priority_compiled
+examples/java/startKillTime/java_startKillTime_compiled
+examples/java/suspend/java_suspend_compiled
+examples/java/tracing/java_tracing_compiled