Merge branch 'mc-perf' into mc

diff --cc src/include/mc/mc.h
Simple merge

diff --cc src/mc/mc_dpor.c
Simple merge

diff --cc src/mc/mc_global.c
Simple merge

diff --cc src/mc/mc_liveness.c
Simple merge

diff --cc src/simgrid/sg_config.c
Simple merge

diff --cc src/simix/smx_network.c
Simple merge