AND Public Git Repository - simgrid.git/commit

Algorithmique Numérique Distribuée

Public GIT Repository

author	Paul Bédaride <paul.bedaride@gmail.com>
	Wed, 30 Oct 2013 14:26:47 +0000 (15:26 +0100)
committer	Paul Bédaride <paul.bedaride@gmail.com>
	Wed, 30 Oct 2013 14:26:47 +0000 (15:26 +0100)
commit	d0ffc37686edcc803601f76ab51fdfed5fc2f241
tree	8424a01da0a5fb4763c2493c94212885bcebfb97	tree \| snapshot
parent	7ac272e25e5f27abe5c854124acb21a2d9bcc435	commit \| diff
parent	045db1657e870c721be490b411868f4181a12ced	commit \| diff

Merge commit '045db1657e870c721be490b411868f4181a12ced' into surf++

Conflicts:
buildtools/Cmake/DefinePackages.cmake
src/include/surf/datatypes.h
src/include/surf/surf.h
src/simgrid/sg_config.c
src/simix/smx_io.c
src/simix/smx_smurf_private.h
src/surf/cpu_cas01.c
src/surf/cpu_ti.c
src/surf/network.c
src/surf/network_constant.c
src/surf/network_gtnets.c
src/surf/new_model.c
src/surf/storage.c
src/surf/storage_private.h
src/surf/surf.c
src/surf/surf_action.c
src/surf/surf_model.c
src/surf/surf_routing.cpp
src/surf/surf_routing_cluster.c
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_full.cpp
src/surf/surf_routing_none.c
src/surf/surf_routing_vivaldi.c
src/surf/workstation.c
src/surf/workstation_ptask_L07.c

65 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
buildtools/Cmake/DefinePackages.cmake	diff1 \|	diff2 \|	blob \| history
include/msg/datatypes.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/platf.h	diff1 \|	diff2 \|	blob \| history
include/surf/surf_routing.h	diff1 \|	diff2 \|	blob \| history
include/xbt/heap.h	diff1 \|	diff2 \|	blob \| history
include/xbt/module.h	diff1 \|	diff2 \|	blob \| history
src/include/simgrid/platf_interface.h	diff1 \|	diff2 \|	blob \| history
src/include/simgrid/sg_config.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/datatypes.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/maxmin.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf_resource.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf_resource_lmm.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/trace_mgr.h	diff1 \|	diff2 \|	blob \| history
src/instr/instr_interface.c	diff1 \|	diff2 \|	blob \| history
src/instr/instr_private.h	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_global.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_link.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_task.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_workstation.c	diff1 \|	diff2 \|	blob \| history
src/simgrid/sg_config.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/surf/cpu.cpp	diff1 \|	\|	blob \| history
src/surf/cpu.hpp	diff1 \|	\|	blob \| history
src/surf/cpu_cas01.cpp	diff1 \|	\|	blob \| history
src/surf/cpu_cas01.hpp	diff1 \|	\|	blob \| history
src/surf/cpu_ti.cpp	diff1 \|	\|	blob \| history
src/surf/cpu_ti.hpp	diff1 \|	\|	blob \| history
src/surf/instr_routing.c	diff1 \|	diff2 \|	blob \| history
src/surf/instr_surf.c	diff1 \|	diff2 \|	blob \| history
src/surf/network.cpp	diff1 \|	\|	blob \| history
src/surf/network_constant.cpp	diff1 \|	\|	blob \| history
src/surf/network_smpi.cpp	diff1 \|	\|	blob \| history
src/surf/storage.cpp	diff1 \|	\|	blob \| history
src/surf/storage.hpp	diff1 \|	\|	blob \| history
src/surf/storage_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surf.cpp	diff1 \|	\|	blob \| history
src/surf/surf.hpp	diff1 \|	\|	blob \| history
src/surf/surf_interface.cpp	diff1 \|	\|	blob \| history
src/surf/surf_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_dijkstra.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_floyd.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_full.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_generic.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surfxml_parse.c	diff1 \|	diff2 \|	blob \| history
src/surf/workstation.cpp	diff1 \|	\|	blob \| history
src/surf/workstation.hpp	diff1 \|	\|	blob \| history
src/surf/workstation_ptask_L07.cpp	diff1 \|	\|	blob \| history
src/surf/workstation_ptask_L07.hpp	diff1 \|	\|	blob \| history
src/xbt/log.c	diff1 \|	diff2 \|	blob \| history
src/xbt/swag.c	diff1 \|	diff2 \|	blob \| history
teshsuite/simdag/platforms/flatifier.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage2.c	diff1 \|	diff2 \|	blob \| history

Clone of SimGrid repository with local patches

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
buildtools/Cmake/DefinePackages.cmake	diff1 \|	diff2 \|	blob \| history
include/msg/datatypes.h	diff1 \|	diff2 \|	blob \| history
include/simgrid/platf.h	diff1 \|	diff2 \|	blob \| history
include/surf/surf_routing.h	diff1 \|	diff2 \|	blob \| history
include/xbt/heap.h	diff1 \|	diff2 \|	blob \| history
include/xbt/module.h	diff1 \|	diff2 \|	blob \| history
src/include/simgrid/platf_interface.h	diff1 \|	diff2 \|	blob \| history
src/include/simgrid/sg_config.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/datatypes.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/maxmin.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf_resource.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/surf_resource_lmm.h	diff1 \|	diff2 \|	blob \| history
src/include/surf/trace_mgr.h	diff1 \|	diff2 \|	blob \| history
src/instr/instr_interface.c	diff1 \|	diff2 \|	blob \| history
src/instr/instr_private.h	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_global.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_link.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_task.c	diff1 \|	diff2 \|	blob \| history
src/simdag/sd_workstation.c	diff1 \|	diff2 \|	blob \| history
src/simgrid/sg_config.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/surf/cpu.cpp	diff1 \|	\|	blob \| history
src/surf/cpu.hpp	diff1 \|	\|	blob \| history
src/surf/cpu_cas01.cpp	diff1 \|	\|	blob \| history
src/surf/cpu_cas01.hpp	diff1 \|	\|	blob \| history
src/surf/cpu_ti.cpp	diff1 \|	\|	blob \| history
src/surf/cpu_ti.hpp	diff1 \|	\|	blob \| history
src/surf/instr_routing.c	diff1 \|	diff2 \|	blob \| history
src/surf/instr_surf.c	diff1 \|	diff2 \|	blob \| history
src/surf/network.cpp	diff1 \|	\|	blob \| history
src/surf/network_constant.cpp	diff1 \|	\|	blob \| history
src/surf/network_smpi.cpp	diff1 \|	\|	blob \| history
src/surf/storage.cpp	diff1 \|	\|	blob \| history
src/surf/storage.hpp	diff1 \|	\|	blob \| history
src/surf/storage_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surf.cpp	diff1 \|	\|	blob \| history
src/surf/surf.hpp	diff1 \|	\|	blob \| history
src/surf/surf_interface.cpp	diff1 \|	\|	blob \| history
src/surf/surf_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_dijkstra.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_floyd.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_full.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_generic.cpp	diff1 \|	diff2 \|	blob \| history
src/surf/surf_routing_private.h	diff1 \|	diff2 \|	blob \| history
src/surf/surfxml_parse.c	diff1 \|	diff2 \|	blob \| history
src/surf/workstation.cpp	diff1 \|	\|	blob \| history
src/surf/workstation.hpp	diff1 \|	\|	blob \| history
src/surf/workstation_ptask_L07.cpp	diff1 \|	\|	blob \| history
src/surf/workstation_ptask_L07.hpp	diff1 \|	\|	blob \| history
src/xbt/log.c	diff1 \|	diff2 \|	blob \| history
src/xbt/swag.c	diff1 \|	diff2 \|	blob \| history
teshsuite/simdag/platforms/flatifier.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage.c	diff1 \|	diff2 \|	blob \| history
testsuite/surf/surf_usage2.c	diff1 \|	diff2 \|	blob \| history