AND Public Git Repository - simgrid.git/commit

Algorithmique Numérique Distribuée

Public GIT Repository

author	Paul Bédaride <paul.bedaride@gmail.com>
	Fri, 8 Nov 2013 10:50:47 +0000 (11:50 +0100)
committer	Paul Bédaride <paul.bedaride@gmail.com>
	Fri, 8 Nov 2013 10:50:47 +0000 (11:50 +0100)
commit	9b73466ada27682d1729f394549479da83ef4a99
tree	0066891fd37c2f91db06a2843740cf6970cb2c87	tree \| snapshot
parent	661875a3cf8631bf02abe783b948fb8c0230b67f	commit \| diff
parent	045db1657e870c721be490b411868f4181a12ced	commit \| diff

Merge tag 'v3_9_90' into hypervisor

Conflicts:
include/msg/msg.h
include/simgrid/simix.h
src/include/surf/surf.h
src/msg/msg_global.c
src/msg/msg_host.c
src/msg/msg_private.h
src/msg/msg_process.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_smurf_private.h
src/surf/cpu_cas01.c
src/surf/cpu_cas01_private.h
src/surf/cpu_ti.c
src/surf/surf.c
src/surf/workstation.c

69 files changed:

.cproject	diff1 \|	diff2 \|	blob \| history
.project	\|	diff2 \|	blob \| history
buildtools/Cmake/DefinePackages.cmake	diff1 \|	diff2 \|	blob \| history
doc/doxygen/platform.doc	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Cloud.java	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Master.java	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Slave.java	diff1 \|	diff2 \|	blob \| history
examples/msg/cloud/masterslave_virtual_machines.c	diff1 \|	diff2 \|	blob \| history
examples/msg/cloud/multicore.c	diff1 \|	\|	blob \| history
include/msg/datatypes.h	diff1 \|	diff2 \|	blob \| history
include/msg/msg.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/platf.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/simix.h	diff1 \|	diff2 \|	blob \| history
include/xbt/ex.h	diff1 \|	diff2 \|	blob \| history
include/xbt/lib.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_host.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_host.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_task.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_task.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_vm.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_vm.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/Host.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/Task.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/VM.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/smx_context_java.c	diff1 \|	diff2 \|	blob \| history
src/bindings/lua/lua_host.c	diff1 \|	diff2 \|	blob \| history
src/include/surf/maxmin.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf.h	diff1 \|	diff2 \|	blob \| history
src/msg/instr_msg_vm.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_global.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_gos.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_host.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_private.h	diff1 \|	diff2 \|	blob \| history
src/msg/msg_process.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_task.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_vm.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_global.c	diff1 \|	diff2 \|	blob \| history
src/simgrid/sg_config.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_deployment.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_global.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_host.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_host_private.h	diff1 \|	diff2 \|	blob \| history
src/simix/smx_io.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_network.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_new_api.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_process.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_smurf_private.h	diff1 \|	diff2 \|	blob \| history
src/simix/smx_synchro.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_user.c	diff1 \|	diff2 \|	blob \| history
src/smpi/smpi_bench.c	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_cas01.c	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_cas01_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_ti.c	diff1 \|	diff2 \|	blob \| history
src/surf/maxmin.c	diff1 \|	diff2 \|	blob \| history
src/surf/network.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_constant.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_gtnets.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_ns3.c	diff1 \|	diff2 \|	blob \| history
src/surf/new_model.c	diff1 \|	diff2 \|	blob \| history
src/surf/storage.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf_action.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/vm_workstation.c	diff1 \|	\|	blob \| history
src/surf/workstation.c	diff1 \|	diff2 \|	blob \| history
src/surf/workstation_ptask_L07.c	diff1 \|	diff2 \|	blob \| history
src/xbt/ex.c	diff1 \|	diff2 \|	blob \| history
src/xbt/lib.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage.c	diff1 \|	diff2 \|	blob \| history

Clone of SimGrid repository with local patches

RSS Atom

.cproject	diff1 \|	diff2 \|	blob \| history
.project	\|	diff2 \|	blob \| history
buildtools/Cmake/DefinePackages.cmake	diff1 \|	diff2 \|	blob \| history
doc/doxygen/platform.doc	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Cloud.java	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Master.java	diff1 \|	diff2 \|	blob \| history
examples/java/cloud/Slave.java	diff1 \|	diff2 \|	blob \| history
examples/msg/cloud/masterslave_virtual_machines.c	diff1 \|	diff2 \|	blob \| history
examples/msg/cloud/multicore.c	diff1 \|	\|	blob \| history
include/msg/datatypes.h	diff1 \|	diff2 \|	blob \| history
include/msg/msg.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/platf.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/simix.h	diff1 \|	diff2 \|	blob \| history
include/xbt/ex.h	diff1 \|	diff2 \|	blob \| history
include/xbt/lib.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_host.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_host.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_task.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_task.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_vm.c	diff1 \|	diff2 \|	blob \| history
src/bindings/java/jmsg_vm.h	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/Host.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/Task.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/org/simgrid/msg/VM.java	diff1 \|	diff2 \|	blob \| history
src/bindings/java/smx_context_java.c	diff1 \|	diff2 \|	blob \| history
src/bindings/lua/lua_host.c	diff1 \|	diff2 \|	blob \| history
src/include/surf/maxmin.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf.h	diff1 \|	diff2 \|	blob \| history
src/msg/instr_msg_vm.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_global.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_gos.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_host.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_private.h	diff1 \|	diff2 \|	blob \| history
src/msg/msg_process.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_task.c	diff1 \|	diff2 \|	blob \| history
src/msg/msg_vm.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_global.c	diff1 \|	diff2 \|	blob \| history
src/simgrid/sg_config.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_deployment.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_global.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_host.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_host_private.h	diff1 \|	diff2 \|	blob \| history
src/simix/smx_io.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_network.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_new_api.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_process.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_smurf_private.h	diff1 \|	diff2 \|	blob \| history
src/simix/smx_synchro.c	diff1 \|	diff2 \|	blob \| history
src/simix/smx_user.c	diff1 \|	diff2 \|	blob \| history
src/smpi/smpi_bench.c	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_cas01.c	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_cas01_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/cpu_ti.c	diff1 \|	diff2 \|	blob \| history
src/surf/maxmin.c	diff1 \|	diff2 \|	blob \| history
src/surf/network.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_constant.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_gtnets.c	diff1 \|	diff2 \|	blob \| history
src/surf/network_ns3.c	diff1 \|	diff2 \|	blob \| history
src/surf/new_model.c	diff1 \|	diff2 \|	blob \| history
src/surf/storage.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf_action.c	diff1 \|	diff2 \|	blob \| history
src/surf/surf_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/vm_workstation.c	diff1 \|	\|	blob \| history
src/surf/workstation.c	diff1 \|	diff2 \|	blob \| history
src/surf/workstation_ptask_L07.c	diff1 \|	diff2 \|	blob \| history
src/xbt/ex.c	diff1 \|	diff2 \|	blob \| history
src/xbt/lib.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage.c	diff1 \|	diff2 \|	blob \| history