Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'hypervisor' into surf++
authorPaul Bédaride <paul.bedaride@gmail.com>
Fri, 15 Nov 2013 13:06:27 +0000 (14:06 +0100)
committerPaul Bédaride <paul.bedaride@gmail.com>
Fri, 15 Nov 2013 13:06:27 +0000 (14:06 +0100)
commiteee21ec5f99218189fc98898a09150294cd0fbf4
tree88ce72e9b13bb62e2dd4ae3e17722a442d4a053a
parent95f98f86ddeb28cea15e126929f48d196160a316
parent0e9c0448c6566825b170b98ecff716b098bda10e
Merge branch 'hypervisor' into surf++

Conflicts:
.cproject
buildtools/Cmake/DefinePackages.cmake
src/include/surf/surf.h
src/simix/smx_global.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_io.c
src/simix/smx_network.c
src/simix/smx_new_api.c
src/simix/smx_process.c
src/simix/smx_smurf_private.h
src/simix/smx_synchro.c
src/surf/cpu_cas01.c
src/surf/cpu_cas01_private.h
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/surf.c
src/surf/surf_action.c
src/surf/surf_private.h
src/surf/workstation.c
testsuite/surf/surf_usage.c
26 files changed:
buildtools/Cmake/DefinePackages.cmake
include/msg/datatypes.h
include/simgrid/simix.h
src/include/surf/maxmin.h
src/include/surf/surf.h
src/simdag/sd_global.c
src/simgrid/sg_config.c
src/simix/smx_global.c
src/simix/smx_host.c
src/simix/smx_host_private.h
src/simix/smx_process.c
src/simix/smx_smurf_private.h
src/simix/smx_synchro.c
src/simix/smx_vm.c
src/surf/cpu.cpp
src/surf/cpu.hpp
src/surf/cpu_cas01.cpp
src/surf/cpu_ti.cpp
src/surf/surf.cpp
src/surf/surf.hpp
src/surf/surf_interface.cpp
src/surf/workstation.cpp
src/surf/workstation.hpp
src/surf/workstation_ptask_L07.cpp
src/surf/workstation_ptask_L07.hpp
testsuite/surf/surf_usage.c