tiny conflict resolution

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 39c9818..8ed5023 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.patch
 *.plist
 *.trace
+*.class
 
 ################################################
 ### Maintainer mode
@@ -29,9 +30,9 @@ src/bindings/ruby/simgrid.so
 examples/ruby/simgrid.so
 examples/lua/simgrid.so
 src/bindings/ruby/libsimgrid.so
-examples/gras/console/simgrid.so
 examples/msg/masterslave/simgrid.so
 examples/simdag/simgrid.so
+examples/lua/console/simgrid.so
 
 ################################################
 ### Units and supernovae files
@@ -47,7 +48,7 @@ include/xbt/version.h
 include/instr/tracing_config.h
 include/smpi/smpif.h
 src/context_sysv_config.h
-src/gras_config.h
+src/internal_config.h
 src/smpi/smpicc
 src/smpi/smpirun
 simgrid-*.tar.gz
@@ -66,12 +67,15 @@ CMakeFiles
 CMakeCache.txt
 DartConfiguration.tcl
 simgrid.nsi
+TAGS
 Testing/
 Makefile
 bin/
 lib/
-build_dir/
+manpages/
+build_*/
 build/
+buildtools/Cmake/memcheck_tests.cmake
 buildtools/Cmake/test_prog/prog_va_copy.c
 
 
@@ -92,21 +96,14 @@ doc/footer.html
 *.doc.toc
 doc/latex/
 doc/html
-doc/index-API.doc
 doc/index.php
 doc/simgrid.tag
+doc/doxygen/logcategories.doc
+doc/index-API.doc
 doc/simgrid_modules.map
-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
 
 ################################################
 ### Specific of project 
-.cproject
 .project
 .settings/
 .anjuta
@@ -133,68 +130,72 @@ examples/msg/masterslave/toto.txt
 examples/msg/simulation.trace
 examples/msg/toto.txt
 examples/msg/z_gtnets.trace
+examples/msg/gpu/test_MSG_gpu_task_create
+examples/msg/cloud/masterslave_virtual_machines
+examples/msg/tracing/link_srcdst_user_variables
+examples/msg/tracing/link_user_variables
+examples/msg/tracing/simple
+examples/msg/tracing/trace_platform
+examples/msg/tracing/user_variables
 examples/msg/tracing/procmig
 examples/msg/tracing/tasks
 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/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
+examples/msg/chord/exp_*
 examples/msg/token_ring/token_ring
-examples/simdag/ex_sd_seq_access
-examples/simdag/sd_seq_access
+examples/msg/token_ring/token_bypass
 examples/msg/icomms/peer
 examples/msg/icomms/peer2
-examples/gras/console/ping_client_console
-examples/gras/console/ping_server_console
-examples/gras/console/ping_simulator_console
+examples/msg/start_kill_time/sk_time
 examples/msg/icomms/.kdbgrc.peer3
 examples/msg/icomms/peer3
 examples/msg/icomms/toto.txt
 examples/msg/masterslave/masterslave_console
+examples/msg/irc_isend/peer
+examples/msg/irc_isend/toto.txt
+examples/simdag/ex_sd_seq_access
+examples/simdag/sd_seq_access
+examples/simdag/sd_comm_throttling
+examples/simdag/sd_fail
+examples/simdag/sd_typed_tasks_test
 examples/simdag/ex_sd_test_console
 examples/simdag/sd_test_console
 examples/simdag/scheduling/Montage_25.jed
-examples/msg/irc_isend/peer
-examples/msg/irc_isend/toto.txt
 examples/simdag/dot/dot_test
 examples/simdag/dot/dot_test2
-examples/smpi/toto.txt
-examples/java/*/classnoinst.stamp
-examples/amok/bandwidth/bandwidth_maestro
-examples/amok/bandwidth/bandwidth_sensor
-examples/amok/saturate/saturate_maestro
-examples/amok/saturate/saturate_sensor
-examples/gras/all2all/all2all_receiver
-examples/gras/all2all/all2all_sender
-examples/gras/chrono/chrono_multiplier
-examples/gras/mmrpc/mmrpc_client
-examples/gras/mmrpc/mmrpc_server
-examples/gras/mutual_exclusion/simple_token/simple_token_node
-examples/gras/mutual_exclusion/simple_token/simple_token_checker
-examples/gras/ping/ping_client
-examples/gras/ping/ping_server
-examples/gras/ping/ping_checker
-examples/gras/pmm/pmm_master
-examples/gras/pmm/pmm_slave
-examples/gras/properties/properties_alice
-examples/gras/properties/properties_bob
-examples/gras/properties/properties_master
-examples/gras/properties/properties_slave
-examples/gras/rpc/rpc_client
-examples/gras/rpc/rpc_forwarder
-examples/gras/rpc/rpc_server
-examples/gras/spawn/spawn_server
-examples/gras/synchro/synchro_philosopher
-examples/gras/timer/timer_client
-examples/gras/replay/replay_simulator
-examples/gras/replay/replay_master
-examples/gras/replay/replay_worker
+examples/simdag/ex_sd_test
+examples/simdag/ex_sd_test2
+examples/simdag/metaxml/sd_meta
+examples/simdag/properties/sd_prop
+examples/simdag/sd_test
+examples/simdag/sd_test2
+examples/simdag/dax/dax_test
+examples/simdag/goal/goal_test
+examples/simdag/scheduling/minmin_test
 examples/msg/actions/actions
+examples/msg/bittorrent/bittorrent
+examples/msg/bittorrent/bittorrent_platfgen
+examples/msg/kademlia/kademlia
 examples/msg/gtnets/gtnets
 examples/msg/masterslave/masterslave_bypass
 examples/msg/masterslave/masterslave_failure
 examples/msg/masterslave/masterslave_forwarder
 examples/msg/masterslave/masterslave_mailbox
+examples/msg/masterslave/masterslave_kill
+examples/msg/masterslave/masterslave_arg
+examples/msg/masterslave/masterslave_failure_platfgen
+examples/msg/masterslave/masterslave_platfgen
 examples/msg/migration/migration
 examples/msg/parallel_task/parallel_task
 examples/msg/parallel_task/test_ptask
@@ -209,46 +210,201 @@ examples/msg/mc/bugged1
 examples/msg/parallel_contexts/pcontexts
 examples/msg/parallel_contexts/pcontexts2
 examples/msg/pmm/msg_pmm
-examples/simdag/ex_sd_test
-examples/simdag/ex_sd_test2
-examples/simdag/metaxml/sd_meta
-examples/simdag/properties/sd_prop
-examples/simdag/sd_test
-examples/simdag/sd_test2
-examples/simdag/dax/dax_test
-examples/simdag/goal/goal_test
-examples/simdag/scheduling/minmin_test
-examples/smpi/reduce
-examples/smpi/bcast
+examples/smpi/toto.txt
+examples/smpi/MM/MM_mpi
+examples/smpi/smpi_replay
+examples/smpi/replay/one_trace
 examples/smpi/bcbench
-examples/smpi/compute
-examples/smpi/compute2
-examples/smpi/compute3
 examples/smpi/first
 examples/smpi/mvmul
 examples/smpi/ring_c
 examples/smpi/second
-examples/smpi/split
-examples/smpi/allreduce
-examples/smpi/pingpong
-examples/smpi/scatter
-examples/smpi/alltoall2
-examples/smpi/alltoall_basic
-examples/smpi/alltoallv
 examples/smpi/sendrecv
-examples/smpi/smpi_sendrecv
 examples/smpi/mc_bugged1
 examples/smpi/mc_bugged2
+examples/smpi/smpi_traced_simple
+
+examples/msg/mc/bugged1_liveness
+examples/msg/mc/bugged1_stateful
+examples/msg/mc/bugged2_liveness
+examples/msg/mc/bugged2_stateful
+examples/msg/mc/centralized_liveness
+
 src/replay/replay
 src/testall
-teshsuite/gras/datadesc/datadesc_usage
-teshsuite/gras/empty_main/empty_main_function
-teshsuite/gras/msg_handle/msg_handle_client
-teshsuite/gras/msg_handle/msg_handle_server
-teshsuite/gras/small_sleep/log.txt
-teshsuite/gras/small_sleep/small_sleep_function
-teshsuite/gras/modelcheck/modelcheck_checker
+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
+teshsuite/smpi/alltoallv
+teshsuite/smpi/bcast
+teshsuite/smpi/compute
+teshsuite/smpi/compute2
+teshsuite/smpi/compute3
+teshsuite/smpi/dsend
+teshsuite/smpi/hvector_test
+teshsuite/smpi/indexed_test
+teshsuite/smpi/pingpong
+teshsuite/smpi/reduce
+teshsuite/smpi/scatter
+teshsuite/smpi/smpi_sendrecv
+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
@@ -256,6 +412,7 @@ teshsuite/simdag/basic3
 teshsuite/simdag/basic4
 teshsuite/simdag/basic5
 teshsuite/simdag/basic6
+teshsuite/simdag/incomplete
 teshsuite/simdag/network/mxn/test_intra_all2all
 teshsuite/simdag/network/mxn/test_intra_independent_comm
 teshsuite/simdag/network/mxn/test_intra_scatter
@@ -266,10 +423,17 @@ teshsuite/simdag/network/p2p/test_latency_bound
 teshsuite/simdag/network/test_reinit_costs
 teshsuite/simdag/platforms/basic_parsing_test
 teshsuite/simdag/platforms/flatifier
+teshsuite/simdag/platforms/basic_tracing
+teshsuite/simdag/platforms/basic_link_test
+teshsuite/simdag/platforms/evaluate_get_route_time
+teshsuite/simdag/platforms/evaluate_parse_time
 teshsuite/simdag/partask/test_comp_only_par
 teshsuite/simdag/partask/test_comp_only_seq
 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
@@ -283,15 +447,12 @@ testsuite/xbt/context_usage
 testsuite/xbt/graphxml_usage
 testsuite/xbt/heap_bench
 testsuite/xbt/log_usage
-tools/gras/gras_stub_generator
 tools/tesh/tesh
 examples/msg/tracing/categories
 examples/msg/tracing/ms
 teshsuite/simdag/platforms/is_router_test
 examples/msg/masterslave/masterslave_cluster
 examples/simdag/simdag_tracing
-examples/gras/spawn/spawn_child
-examples/gras/spawn/spawn_father
 examples/smpi/smpi_traced
 examples/smpi/ttest01
 teshsuite/datadesc_usage.out
@@ -301,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