Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
authorMarion Guthmuller <marion.guthmuller@loria.fr>
Sat, 2 Jun 2012 20:35:14 +0000 (22:35 +0200)
committerMarion Guthmuller <marion.guthmuller@loria.fr>
Sat, 2 Jun 2012 20:35:14 +0000 (22:35 +0200)
53 files changed:
COPYING
ChangeLog
buildtools/Cmake/AddTests.cmake
buildtools/Cmake/CompleteInFiles.cmake
buildtools/Cmake/DefinePackages.cmake
buildtools/Cmake/Flags.cmake
buildtools/Cmake/Option.cmake
buildtools/Cmake/Pipol.cmake
buildtools/Cmake/PrintArgs.cmake
buildtools/Cmake/generate_memcheck_tests.pl
buildtools/Cmake/memcheck_tests.cmake
buildtools/Cmake/simgrid.nsi.in
doc/gtut-introduction.doc
doc/gtut-tour-07-timers.doc
doc/gtut-tour-11-explicitwait.doc
doc/gtut-tour-recap-messages.doc
doc/install.doc
doc/surf_nutshell.fig
examples/amok/bandwidth/bandwidth_rl.tesh
examples/amok/saturate/saturate_rl.tesh
examples/gras/console/ping_server.c
examples/gras/mmrpc/mmrpc.c
examples/gras/mmrpc/mmrpc_server.c
examples/gras/mutual_exclusion/simple_token/simple_token.c
examples/gras/ping/ping_server.c
examples/gras/ping/test_rl.tesh
examples/gras/ping/test_sg_32.tesh
examples/gras/ping/test_sg_64.tesh
examples/gras/properties/test_rl.tesh
examples/gras/rpc/rpc.c
include/gras/messages.h
include/gras/timer.h
include/xbt/RngStream.h [new file with mode: 0644]
include/xbt/datadesc.h
include/xbt/xbt_os_thread.h
src/bindings/lua/lua_platf.c
src/bindings/lua/lua_state_cloner.c
src/bindings/lua/lua_utils.c
src/bindings/lua/simgrid_lua.c
src/gras/Msg/gras_msg_exchange.c
src/gras/Msg/gras_msg_listener.c
src/gras/Virtu/virtu_private.h
src/rngstreams/RngStream.h [deleted file]
src/simix/smx_context.c
src/surf/surf.c
src/xbt/RngStream.c [moved from src/rngstreams/RngStream.c with 98% similarity]
src/xbt/backtrace_linux.c
src/xbt/datadesc/cbps.c
src/xbt/datadesc/datadesc_private.h
src/xbt/log.c
teshsuite/gras/datadesc/datadesc_r_little64.tesh
teshsuite/gras/empty_main/test_rl.tesh
teshsuite/gras/msg_handle/test_rl.tesh

diff --git a/COPYING b/COPYING
index 54dd23d..01cdd37 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -138,8 +138,8 @@ Their copyright is the following:
  *
  *      You should have received a copy of the GNU Lesser General Public
  *      License along with SimGrid in the file LICENSE-LGPL-2.1;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *      if not, write to the Free Software Foundation, Inc., 
+ *      51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
  
 =========================================================================
index 463d8fa..b40ea02 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 SimGrid (3.8) NOT RELEASED; urgency=low
 
  The "SimGrid makes psssshiiiit and jumps into the cloud" release.
+ CMAKE:
+ * Remove option custom_flags. Now use environment variables CFLAGS 
+   and LDFLAGS.
   
  MSG:
  * Add an experimental interface to manipulate VMs. They are mainly
@@ -1210,7 +1214,7 @@ SimGrid (3.3) stable; urgency=high
     [contributed by Sékou Diakite, many thanks]
 
  GRAS:
-  * Introduce a listener thread in charge of receiving incomming
+  * Introduce a listener thread in charge of receiving incoming
     messages from the network. It allows to overlap communication and
     computation but most notably, it removes some stupid deadlocks due
     to the fact that so far, a process could not send and receive at
index be472c7..6b2f3d2 100644 (file)
@@ -91,9 +91,9 @@ ADD_TEST(tesh-msg-get-sender-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}
 if(HAVE_RAWCTX)
        ADD_TEST(tesh-msg-get-sender-raw                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
 endif(HAVE_RAWCTX)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(tesh-msg-get-sender-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite       --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 IF(enable_debug) # these tests need the assertion mechanism
        ADD_TEST(tesh-simdag-parser-bogus-symmetric     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}             --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms  --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh)
@@ -148,7 +148,7 @@ ADD_TEST(msg-masterslave-cpu-ti-thread         ${CMAKE_BINARY_DIR}/bin/tesh ${TE
 
 ADD_TEST(msg-masterslave-virtual-machines ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
 
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(msg-sendrecv-CLM03-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
        ADD_TEST(msg-sendrecv-Vegas-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
        ADD_TEST(msg-sendrecv-Reno-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
@@ -166,7 +166,7 @@ if(HAVE_UCONTEXT_H)
     ADD_TEST(msg-masterslave-failure-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_failure_crosstraffic.tesh)
     ADD_TEST(msg-masterslave-mailbox-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_mailbox_crosstraffic.tesh)
     ADD_TEST(msg-masterslave-cpu-ti-ucontext         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/masterslave    --cd ${CMAKE_HOME_DIRECTORY}/examples/msg masterslave/masterslave_cpu_ti_crosstraffic.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 if(HAVE_RAWCTX)
     ADD_TEST(msg-sendrecv-CLM03-raw            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
@@ -194,10 +194,10 @@ if(HAVE_RAWCTX)
   ADD_TEST(msg-masterslave-vivaldi-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
   ADD_TEST(msg-token-ring-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring         --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
 endif(HAVE_RAWCTX)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(msg-masterslave-vivaldi-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/masterslave_vivaldi.tesh)
        ADD_TEST(msg-token-ring-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring         --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 ADD_TEST(msg-migration-thread  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
 ADD_TEST(msg-ptask-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
@@ -210,7 +210,7 @@ ADD_TEST(msg-chord-no-crosstraffic-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OP
 ADD_TEST(msg-chord-no-crosstraffic-thread-parallel     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --cfg contexts/nthreads:4       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
 ADD_TEST(msg-chord-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
 ADD_TEST(msg-chord-thread-parallel  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --cfg contexts/nthreads:4   --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(msg-migration-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
        ADD_TEST(msg-ptask-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
        ADD_TEST(msg-priority-ucontext  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
@@ -222,7 +222,7 @@ if(HAVE_UCONTEXT_H)
        ADD_TEST(msg-chord-no-crosstraffic-ucontext-parallel    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --cfg contexts/nthreads:4       --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord.tesh)
     ADD_TEST(msg-chord-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext      --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
     ADD_TEST(msg-chord-ucontext-parallel   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext       --cfg contexts/nthreads:4   --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chord  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord chord_crosstraffic.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
     ADD_TEST(msg-migration-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
     ADD_TEST(msg-ptask-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
@@ -248,7 +248,7 @@ ADD_TEST(gras-mmrpc-sg-32-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --c
 ADD_TEST(gras-all2all-sg-32-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
 ADD_TEST(gras-pmm-sg-32-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
 ADD_TEST(gras-synchro-sg-32-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(gras-ping-sg-32-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
        ADD_TEST(gras-rpc-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
        ADD_TEST(gras-spawn-sg-32-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_32.tesh)
@@ -259,7 +259,7 @@ if(HAVE_UCONTEXT_H)
        ADD_TEST(gras-all2all-sg-32-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_32.tesh)
        ADD_TEST(gras-pmm-sg-32-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_32.tesh)
        ADD_TEST(gras-synchro-sg-32-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_32.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
   ADD_TEST(gras-ping-sg-32-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_32.tesh)
   ADD_TEST(gras-rpc-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_32.tesh)
@@ -284,7 +284,7 @@ ADD_TEST(gras-mmrpc-sg-64-thread    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --c
 ADD_TEST(gras-all2all-sg-64-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
 ADD_TEST(gras-pmm-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
 ADD_TEST(gras-synchro-sg-64-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(gras-ping-sg-64-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
        ADD_TEST(gras-rpc-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
        ADD_TEST(gras-spawn-sg-64-ucontext      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/spawn     --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/test_sg_64.tesh)
@@ -295,7 +295,7 @@ if(HAVE_UCONTEXT_H)
        ADD_TEST(gras-all2all-sg-64-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/all2all   --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/test_sg_64.tesh)
        ADD_TEST(gras-pmm-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/pmm       --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/test_sg_64.tesh)
        ADD_TEST(gras-synchro-sg-64-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/synchro   --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/test_sg_64.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
   ADD_TEST(gras-ping-sg-64-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/ping      --cd ${CMAKE_BINARY_DIR}/examples/gras/ping ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/test_sg_64.tesh)
   ADD_TEST(gras-rpc-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/rpc       --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/test_sg_64.tesh)
@@ -311,9 +311,9 @@ endif(HAVE_RAWCTX)
 
 ENDIF(${ARCH_32_BITS})
 ADD_TEST(gras-properties-sg-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(gras-properties-sg-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
   ADD_TEST(gras-properties-sg-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/gras/properties        --cd ${CMAKE_BINARY_DIR}/examples/gras/properties ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/test_sg.tesh)
 endif(HAVE_RAWCTX)
@@ -329,10 +329,10 @@ IF(${ARCH_32_BITS})
     ADD_TEST(amok-bandwidth-sg-32-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
     ADD_TEST(amok-saturate-sg-32-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
   endif(HAVE_RAWCTX)
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
        ADD_TEST(amok-bandwidth-sg-32-ucontext  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_32.tesh)
        ADD_TEST(amok-saturate-sg-32-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_32.tesh)
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
 ELSE(${ARCH_32_BITS})
   ADD_TEST(amok-bandwidth-sg-64-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
   ADD_TEST(amok-saturate-sg-64-thread  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
@@ -340,10 +340,10 @@ ELSE(${ARCH_32_BITS})
     ADD_TEST(amok-bandwidth-sg-64-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
     ADD_TEST(amok-saturate-sg-64-raw           ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
   endif(HAVE_RAWCTX)
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
          ADD_TEST(amok-saturate-sg-64-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate_sg_64.tesh)
          ADD_TEST(amok-bandwidth-sg-64-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/amok   --cd ${CMAKE_BINARY_DIR}/examples/amok ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth_sg_64.tesh)
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
 ENDIF(${ARCH_32_BITS})
 
 # simdag examples
@@ -354,8 +354,12 @@ ADD_TEST(simdag-test-prop          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv
 ADD_TEST(simdag-minmin-test            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling  --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
 
 ADD_TEST(msg-gtnets-crosstraffic-thread   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread       --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-ADD_TEST(msg-gtnets-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
-ADD_TEST(msg-gtnets-crosstraffic-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+if(CONTEXT_UCONTEXT)
+  ADD_TEST(msg-gtnets-crosstraffic-ucontext ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+endif(CONTEXT_UCONTEXT)
+if(HAVE_RAWCTX)
+  ADD_TEST(msg-gtnets-crosstraffic-raw      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh)
+endif(HAVE_RAWCTX)
 
 if(HAVE_GTNETS)
 ADD_TEST(msg-gtnets-waxman-thread      ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
@@ -363,13 +367,13 @@ ADD_TEST(msg-gtnets-dogbone-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     -
 ADD_TEST(msg-gtnets-onelink-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
 ADD_TEST(msg-gtnets-dogbone-lv08-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
 ADD_TEST(msg-gtnets-onelink-lv08-thread        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(msg-gtnets-waxman-ucontext     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
        ADD_TEST(msg-gtnets-dogbone-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
        ADD_TEST(msg-gtnets-onelink-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-gtnets.tesh)
        ADD_TEST(msg-gtnets-dogbone-lv08-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-lv08.tesh)
        ADD_TEST(msg-gtnets-onelink-lv08-ucontext       ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-onelink-lv08.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
        ADD_TEST(msg-gtnets-waxman-raw          ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-waxman.tesh)
        ADD_TEST(msg-gtnets-dogbone-raw         ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg    --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-dogbone-gtnets.tesh)
@@ -431,10 +435,10 @@ if(HAVE_RAWCTX)
   ADD_TEST(smpi-bcast-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw                      --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
   ADD_TEST(smpi-reduce-raw             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw                      --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
 endif(HAVE_RAWCTX)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(smpi-bcast-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext                 --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
        ADD_TEST(smpi-reduce-ucontext   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext                 --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_TRACING)
   ADD_TEST(smpi-tracing-ptp ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
 endif(HAVE_TRACING)
@@ -445,11 +449,11 @@ if(HAVE_MC)
 ADD_TEST(mc-bugged1-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
 ADD_TEST(mc-bugged2-thread     ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
 ADD_TEST(mc-centralized-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:thread           --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
        ADD_TEST(mc-bugged1-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
        ADD_TEST(mc-bugged2-ucontext    ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
        ADD_TEST(mc-centralized-ucontext        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:ucontext         --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
   ADD_TEST(mc-bugged1-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
   ADD_TEST(mc-bugged2-raw              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION}     --cfg contexts/factory:raw              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
@@ -467,18 +471,18 @@ set_tests_properties(amok-bandwidth-rl amok-saturate-rl PROPERTIES WILL_FAIL tru
 if(${ARCH_32_BITS})
   set_tests_properties(amok-bandwidth-sg-32-thread PROPERTIES WILL_FAIL true)   
   set_tests_properties(amok-saturate-sg-32-thread  PROPERTIES WILL_FAIL true)
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
        set_tests_properties(amok-bandwidth-sg-32-ucontext amok-saturate-sg-32-ucontext PROPERTIES WILL_FAIL true) 
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
   if(HAVE_RAWCTX)
     set_tests_properties(amok-bandwidth-sg-32-raw amok-saturate-sg-32-raw PROPERTIES WILL_FAIL true)   
   endif(HAVE_RAWCTX)   
 else(${ARCH_32_BITS})
   set_tests_properties(amok-bandwidth-sg-64-thread PROPERTIES WILL_FAIL true)   
   set_tests_properties(amok-saturate-sg-64-thread PROPERTIES WILL_FAIL true)  
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
        set_tests_properties(amok-bandwidth-sg-64-ucontext amok-saturate-sg-64-ucontext PROPERTIES WILL_FAIL true) 
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
   if(HAVE_RAWCTX)
     set_tests_properties(amok-bandwidth-sg-64-raw amok-saturate-sg-64-raw PROPERTIES WILL_FAIL true)   
   endif(HAVE_RAWCTX)   
@@ -490,9 +494,9 @@ if(HAVE_MC)
        set_tests_properties(mc-bugged1-thread PROPERTIES WILL_FAIL true)
        set_tests_properties(mc-bugged2-thread PROPERTIES WILL_FAIL true)
        set_tests_properties(mc-centralized-thread PROPERTIES WILL_FAIL true)
-       if(HAVE_UCONTEXT_H)
+       if(CONTEXT_UCONTEXT)
            set_tests_properties(mc-centralized-ucontext PROPERTIES WILL_FAIL true)
-    endif(HAVE_UCONTEXT_H)
+    endif(CONTEXT_UCONTEXT)
        if(HAVE_RAWCTX)
            set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
        endif(HAVE_RAWCTX)
index e00a914..0ab58f2 100644 (file)
@@ -408,7 +408,7 @@ endif(pthread)
 
 
 ###############
-## SVN version check
+## GIT version check
 ##
 if(EXISTS ${CMAKE_HOME_DIRECTORY}/.git/ AND NOT WIN32)
 exec_program("git remote | head -n 1" OUTPUT_VARIABLE remote RETURN_VALUE ret)
index 948d959..ef6012d 100644 (file)
@@ -197,6 +197,7 @@ set(XBT_SRC
        src/xbt/xbt_socket.c
        src/xbt/xbt_socket_private.h
        src/xbt/xbt_trp_plugin_tcp.c
+       src/xbt/RngStream.c
 )
 
 if(HAVE_MMAP)
@@ -391,11 +392,6 @@ set(MC_SRC
        src/mc/mc_liveness.c
 )
 
-set(RNGSTREAM_SRC
-       src/rngstreams/RngStream.h
-       src/rngstreams/RngStream.c
-)
-
 set(headers_to_install
        include/xbt/misc.h
        include/xbt/sysdep.h
@@ -437,6 +433,7 @@ set(headers_to_install
        include/xbt/socket.h
        include/xbt/file_stat.h
        include/xbt/xbt_os_thread.h
+  include/xbt/RngStream.h
        include/simgrid/platf.h
        include/simgrid/modelchecker.h
        include/simgrid/simix.h
@@ -524,7 +521,6 @@ set(simgrid_sources
        ${AMOK_SRC}
        ${BINDINGS_SRC}
        ${JEDULE_SRC}
-       ${RNGSTREAM_SRC}
 )
 
 if(HAVE_MC)
index 6b54833..a17b015 100644 (file)
@@ -42,7 +42,6 @@ endif(enable_msg_deprecated)
 
 set(CMAKE_C_FLAGS "${optCFLAGS}${warnCFLAGS}${CMAKE_C_FLAGS}")
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${custom_flags}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${optCFLAGS}")
 
 # Try to make Mac a bit more complient to open source standards
index 6e64b98..3e180e3 100644 (file)
@@ -4,7 +4,6 @@
 set(BIBTEX2HTML ${BIBTEX2HTML} CACHE PATH "Path to bibtex2html")
 set(gtnets_path ${gtnets_path} CACHE PATH "Path to gtnets lib and include")
 set(ns3_path ${ns3_path} CACHE PATH "Path to ns3 lib and include")
-set(custom_flags ${custom_flags} CACHE FORCE "Customers flags add to cmake_c_flag")
 
 if(NOT CMAKE_INSTALL_PREFIX)
        set(CMAKE_INSTALL_PREFIX "/usr/local/simgrid/" CACHE PATH "Path where to install project")
@@ -73,3 +72,4 @@ mark_as_advanced(CMAKE_OSX_DEPLOYMENT_TARGET)
 mark_as_advanced(CMAKE_OSX_SYSROOT)                                                                         
 mark_as_advanced(SED_EXE)
 mark_as_advanced(BIBTEX2HTML)
+mark_as_advanced(CMAKE_C_LINK_FLAGS)
index b01c574..75b4e9c 100644 (file)
@@ -8,10 +8,6 @@ IF(pipol_user)
 
        set(CMAKE_OPTIONS "     -Wno-dev")
        
-       if(custom_flags)
-       set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Dcustom_flags=${custom_flags}")
-       endif(custom_flags)
-       
        if(with_context)
        set(CMAKE_OPTIONS "${CMAKE_OPTIONS}     -Dwith_context=${with_context}")
        endif(with_context)
index a06bded..1e06c85 100644 (file)
@@ -113,7 +113,7 @@ message("")
 message("        INSTALL_PREFIX ......: ${CMAKE_INSTALL_PREFIX}")
 
 exec_program("${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/Testing/Notes/" OUTPUT_VARIABLE OKIDOKI)
-file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build  "SVN version : ${SVN_VERSION}\n")
+file(WRITE ${PROJECT_BINARY_DIR}/Testing/Notes/Build  "GIT version : ${GIT_VERSION}\n")
 file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Release     : simgrid-${release_version}\n")
 file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol user  : $ENV{PIPOL_USER}\n")
 file(APPEND ${PROJECT_BINARY_DIR}/Testing/Notes/Build "Pipol image : $ENV{PIPOL_IMAGE}\n")
index 2f9058d..23699bb 100755 (executable)
@@ -110,7 +110,6 @@ while ( defined( $line = <MAKETEST> ) ) {
                     $command = var_subst($command, "SG_TEST_EXENV", "");
                     $command = var_subst($command, "SG_TEST_ENV", "");
                     $command = var_subst($command, "SG_EXENV_TEST", "");
-                    $command = var_subst($command, "ARGS", "");
                     $command =~ s/\$@//g;
 #                    $command =~ s/..\/..\/bin\/smpirun/\${CMAKE_BINARY_DIR\}\/bin\/smpirun/g;
                     $command =~ s/^\s+//;
index 51b62ad..4a60194 100644 (file)
@@ -14,7 +14,7 @@ ADD_TEST(memcheck-tesh-gras-dd-rw-0 rm -f datadesc_usage.out --cd ${CMAKE_BINARY
 ADD_TEST(memcheck-tesh-gras-dd-rw-1 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --write "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 ADD_TEST(memcheck-tesh-gras-dd-rw-2 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --read "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 ADD_TEST(memcheck-tesh-gras-dd-r-little32-4-0 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --read ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc.little32_4  --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
-ADD_TEST(memcheck-tesh-gras-dd-r-little64-0 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --read ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc.little64  --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n"  --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ADD_TEST(memcheck-tesh-gras-dd-r-little64-0 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --read ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc.little64  --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 ADD_TEST(memcheck-tesh-gras-dd-r-big32-8-4-0 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --read ${CMAKE_HOME_DIRECTORY}/teshsuite/gras/datadesc/datadesc.big32_8_4 --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 
 IF(${ARCH_32_BITS})
@@ -36,17 +36,17 @@ ADD_TEST(memcheck-gras-spawn-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/spawn/spawn_
 ADD_TEST(memcheck-gras-timer-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/timer/timer_client --log=root.fmt:%m%n --cd ${CMAKE_BINARY_DIR}/examples/gras/timer/)
 ADD_TEST(memcheck-gras-chrono-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/chrono/chrono_multiplier --log=root.fmt:%m%n   --cd ${CMAKE_BINARY_DIR}/examples/gras/chrono/)
 ADD_TEST(memcheck-gras-synchro-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/synchro/synchro_philosopher 4 --log=root.fmt=%m%n --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro/)
-ADD_TEST(memcheck-gras-properties-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_alice --log=root.fmt=%P:%t%e%m%n  --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
-ADD_TEST(memcheck-gras-properties-rl-1 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_bob --log=root.fmt=%P:%t%e%m%n  --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
+ADD_TEST(memcheck-gras-properties-rl-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_alice --log=root.fmt=%P:%t%e%m%n --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
+ADD_TEST(memcheck-gras-properties-rl-1 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_bob --log=root.fmt=%P:%t%e%m%n --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
 
 # BEGIN CONTEXTS FACTORY
 ADD_TEST(memcheck-tesh-msg-get-sender-thread-0 ${CMAKE_BINARY_DIR}/teshsuite/msg/get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-tesh-msg-get-sender-raw-0 ${CMAKE_BINARY_DIR}/teshsuite/msg/get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/teshsuite/)
 endif(HAVE_RAWCTX)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-tesh-msg-get-sender-ucontext-0 ${CMAKE_BINARY_DIR}/teshsuite/msg/get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/teshsuite/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 IF(enable_debug) # these tests need the assertion mechanism
 ADD_TEST(memcheck-tesh-simdag-parser-bogus-symmetric-0 ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/flatifier two_hosts_asymetric_BOGUS.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/)
@@ -159,7 +159,10 @@ ADD_TEST(memcheck-msg-masterslave-cpu-ti-thread-1 ${CMAKE_BINARY_DIR}/examples/m
 ADD_TEST(memcheck-msg-masterslave-cpu-ti-thread-2 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path: --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-cpu-ti-thread-3 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 
-if(HAVE_UCONTEXT_H)
+# tesh_file: /localhome/giersch/src/simgrid/simgrid-git/examples/msg/cloud/masterslave_virtual_machines.tesh does not exist!
+# ADD_TEST(msg-masterslave-virtual-machines ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud     --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/masterslave_virtual_machines.tesh)
+
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-msg-sendrecv-CLM03-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-sendrecv-Vegas-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-sendrecv-Reno-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -180,7 +183,7 @@ ADD_TEST(memcheck-msg-masterslave-cpu-ti-ucontext-0 ${CMAKE_BINARY_DIR}/examples
 ADD_TEST(memcheck-msg-masterslave-cpu-ti-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_forwarder msg_platform.xml masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-cpu-ti-ucontext-2 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc small_platform_with_failures.xml masterslave/deployment_masterslave.xml --cfg=path: --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-cpu-ti-ucontext-3 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_bypass --log=no_loc --cfg=cpu/optim:TI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-msg-sendrecv-CLM03-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -213,11 +216,11 @@ ADD_TEST(memcheck-msg-masterslave-vivaldi-raw-0 ${CMAKE_BINARY_DIR}/examples/msg
 ADD_TEST(memcheck-msg-token-ring-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 ADD_TEST(memcheck-msg-token-ring-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 endif(HAVE_RAWCTX)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-msg-masterslave-vivaldi-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox  ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/vivaldi.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-token-ring-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 ADD_TEST(memcheck-msg-token-ring-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 
 ADD_TEST(memcheck-msg-migration-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-ptask-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/parallel_task ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -254,7 +257,7 @@ ADD_TEST(memcheck-msg-chord-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chor
 ADD_TEST(memcheck-msg-chord-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-thread-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-msg-migration-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-ptask-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/parallel_task ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-ptask-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/test_ptask ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/test_ptask_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/test_ptask_deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -290,7 +293,7 @@ ADD_TEST(memcheck-msg-chord-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/ch
 ADD_TEST(memcheck-msg-chord-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-ucontext-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-msg-migration-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-ptask-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/parallel_task ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -330,7 +333,7 @@ ADD_TEST(memcheck-msg-chord-raw-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chor
 endif(HAVE_RAWCTX)
 
 IF(${ARCH_32_BITS})
-ADD_TEST(memcheck-gras-ping-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
+ADD_TEST(memcheck-gras-ping-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
 ADD_TEST(memcheck-gras-rpc-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/rpc/rpc_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/rpc.xml "--log=root.fmt:[0]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc/)
 ADD_TEST(memcheck-gras-spawn-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/spawn/spawn_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/spawn.xml --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn/)
 ADD_TEST(memcheck-gras-timer-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/timer/timer_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/timer.xml --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/timer/)
@@ -340,8 +343,8 @@ ADD_TEST(memcheck-gras-mmrpc-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/mm
 ADD_TEST(memcheck-gras-all2all-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/all2all/all2all_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/all2all.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%.2i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all/)
 ADD_TEST(memcheck-gras-pmm-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/pmm/pmm_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/../../msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/pmm.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm/)
 ADD_TEST(memcheck-gras-synchro-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/synchro/synchro_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/synchro.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro/)
-if(HAVE_UCONTEXT_H)
-ADD_TEST(memcheck-gras-ping-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
+if(CONTEXT_UCONTEXT)
+ADD_TEST(memcheck-gras-ping-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
 ADD_TEST(memcheck-gras-rpc-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/rpc/rpc_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/rpc.xml "--log=root.fmt:[0]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc/)
 ADD_TEST(memcheck-gras-spawn-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/spawn/spawn_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/spawn.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn/)
 ADD_TEST(memcheck-gras-timer-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/timer/timer_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/timer.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/timer/)
@@ -351,9 +354,9 @@ ADD_TEST(memcheck-gras-mmrpc-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/
 ADD_TEST(memcheck-gras-all2all-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/all2all/all2all_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/all2all.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%.2i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all/)
 ADD_TEST(memcheck-gras-pmm-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/pmm/pmm_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/../../msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/pmm.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm/)
 ADD_TEST(memcheck-gras-synchro-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/synchro/synchro_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/synchro.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
-ADD_TEST(memcheck-gras-ping-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
+ADD_TEST(memcheck-gras-ping-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
 ADD_TEST(memcheck-gras-rpc-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/rpc/rpc_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/rpc.xml "--log=root.fmt:[0]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc/)
 ADD_TEST(memcheck-gras-spawn-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/spawn/spawn_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/spawn.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn/)
 ADD_TEST(memcheck-gras-timer-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/timer/timer_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/timer/timer.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/timer/)
@@ -376,7 +379,7 @@ ADD_TEST(memcheck-gras-mmrpc-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/mm
 ADD_TEST(memcheck-gras-all2all-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/all2all/all2all_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/all2all.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%.2i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all/)
 ADD_TEST(memcheck-gras-pmm-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/pmm/pmm_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/../../msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/pmm.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm/)
 ADD_TEST(memcheck-gras-synchro-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/synchro/synchro_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/synchro.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro/)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-gras-ping-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
 ADD_TEST(memcheck-gras-rpc-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/rpc/rpc_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/rpc.xml "--log=root.fmt:[0]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc/)
 ADD_TEST(memcheck-gras-spawn-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/spawn/spawn_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/spawn/spawn.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/spawn/)
@@ -387,7 +390,7 @@ ADD_TEST(memcheck-gras-mmrpc-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/
 ADD_TEST(memcheck-gras-all2all-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/all2all/all2all_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/all2all/all2all.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%.2i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/all2all/)
 ADD_TEST(memcheck-gras-pmm-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/pmm/pmm_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/../../msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/pmm/pmm.xml --cfg=network/crosstraffic:0 "--log=root.fmt:[%10.6r]%e(%2i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/pmm/)
 ADD_TEST(memcheck-gras-synchro-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/synchro/synchro_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/synchro/synchro.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/synchro/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-gras-ping-sg-64-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/ping/ping_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/ping/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/ping/)
 ADD_TEST(memcheck-gras-rpc-sg-64-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/rpc/rpc_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/../../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/rpc/rpc.xml "--log=root.fmt:[0]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/rpc/)
@@ -403,9 +406,9 @@ endif(HAVE_RAWCTX)
 
 ENDIF(${ARCH_32_BITS})
 ADD_TEST(memcheck-gras-properties-sg-thread-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-gras-properties-sg-ucontext-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-gras-properties-sg-raw-0 ${CMAKE_BINARY_DIR}/examples/gras/properties/properties_simulator ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/../../platforms/prop.xml ${CMAKE_HOME_DIRECTORY}/examples/gras/properties/properties.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/gras/properties/)
 endif(HAVE_RAWCTX)
@@ -419,10 +422,10 @@ ADD_TEST(memcheck-amok-saturate-sg-32-thread-0 ${CMAKE_BINARY_DIR}/examples/amok
 ADD_TEST(memcheck-amok-bandwidth-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/amok/bandwidth/bandwidth_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
 ADD_TEST(memcheck-amok-saturate-sg-32-raw-0 ${CMAKE_BINARY_DIR}/examples/amok/saturate/saturate_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
   endif(HAVE_RAWCTX)
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-amok-bandwidth-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/amok/bandwidth/bandwidth_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
 ADD_TEST(memcheck-amok-saturate-sg-32-ucontext-0 ${CMAKE_BINARY_DIR}/examples/amok/saturate/saturate_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
 ELSE(${ARCH_32_BITS})
 ADD_TEST(memcheck-amok-bandwidth-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/amok/bandwidth/bandwidth_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
 ADD_TEST(memcheck-amok-saturate-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/amok/saturate/saturate_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate.xml --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
@@ -430,10 +433,10 @@ ADD_TEST(memcheck-amok-saturate-sg-64-thread-0 ${CMAKE_BINARY_DIR}/examples/amok
 ADD_TEST(memcheck-amok-bandwidth-sg-64-raw-0 ${CMAKE_BINARY_DIR}/examples/amok/bandwidth/bandwidth_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
 ADD_TEST(memcheck-amok-saturate-sg-64-raw-0 ${CMAKE_BINARY_DIR}/examples/amok/saturate/saturate_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
   endif(HAVE_RAWCTX)
-  if(HAVE_UCONTEXT_H)
+  if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-amok-saturate-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/amok/saturate/saturate_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/saturate/saturate.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
 ADD_TEST(memcheck-amok-bandwidth-sg-64-ucontext-0 ${CMAKE_BINARY_DIR}/examples/amok/bandwidth/bandwidth_simulator ${CMAKE_HOME_DIRECTORY}/examples/amok/../msg/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/amok/bandwidth/bandwidth.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/amok/)
-  endif(HAVE_UCONTEXT_H)
+  endif(CONTEXT_UCONTEXT)
 ENDIF(${ARCH_32_BITS})
 
 # simdag examples
@@ -442,13 +445,18 @@ ADD_TEST(memcheck-simdag-test-simdag2-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_t
 ADD_TEST(memcheck-simdag-test-simdag-seq-access-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_seq_access ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-prop-0 ${CMAKE_BINARY_DIR}/examples/simdag/properties/sd_prop ${CMAKE_HOME_DIRECTORY}/examples/simdag/../platforms/prop.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-minmin-test-0 ${CMAKE_BINARY_DIR}/examples/simdag/scheduling/minmin_test --log=sd_daxparse.thresh:critical ./simulacrum_7_hosts.xml ./Montage_25.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling/)
+ADD_TEST(memcheck-simdag-minmin-test-1 cmake -E remove -f ./Montage_25.jed --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling/)
 
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:0 --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:1 --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:0 --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:1 --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
+endif(CONTEXT_UCONTEXT)
+if(HAVE_RAWCTX)
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:0 --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-crosstraffic-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/crosstraffic-d.xml --cfg=network/crosstraffic:1 --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
+endif(HAVE_RAWCTX)
 
 if(HAVE_GTNETS)
 ADD_TEST(memcheck-msg-gtnets-waxman-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -456,13 +464,13 @@ ADD_TEST(memcheck-msg-gtnets-dogbone-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/g
 ADD_TEST(memcheck-msg-gtnets-onelink-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-lv08-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-lv08-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
-if(HAVE_UCONTEXT_H)
+if(CONTEXT_UCONTEXT)
 ADD_TEST(memcheck-msg-gtnets-waxman-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-lv08-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-lv08-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
-endif(HAVE_UCONTEXT_H)
+endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
 ADD_TEST(memcheck-msg-gtnets-waxman-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-dogbone-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/gtnets/gtnets ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-p.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
index 7407773..5d797b9 100644 (file)
@@ -99,6 +99,8 @@ Section "Libraries and Headers" LibSection
        file @CMAKE_HOME_DIRECTORY@\include\xbt\datadesc.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\socket.h\r
        file @CMAKE_HOME_DIRECTORY@\include\xbt\file_stat.h\r
+    file @CMAKE_HOME_DIRECTORY@\include\xbt\xbt_os_thread.h\r
+    file @CMAKE_HOME_DIRECTORY@\include\xbt\RngStream.h\r
 \r
        CreateDirectory  $INSTDIR\include\simgrid\r
        setOutPath $INSTDIR\include\simgrid\r
@@ -213,11 +215,11 @@ Section "Java Bindings" JavaSection
        # install java library and examples\r
        CreateDirectory $INSTDIR\examples\simgrid-java\r
        setOutPath $INSTDIR\lib\r
-       file "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
-       file "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
-       file "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.dll"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\build\SG_java.def"\r
+       file /nonfatal "$%SIMGRID_JAVA_SRC%\simgrid.jar"\r
        setOutPath $INSTDIR\examples\simgrid-java\r
-       file /r "$%SIMGRID_JAVA_SRC%\examples\"\r
+       file /nonfatal /r "$%SIMGRID_JAVA_SRC%\examples\"\r
        # create shortcuts in the start menu programs directory\r
        createShortCut  "$SMPROGRAMS\SimGrid @SIMGRID_VERSION_MAJOR@.@SIMGRID_VERSION_MINOR@.@SIMGRID_VERSION_PATCH@\Examples\Java project.lnk" "$INSTDIR\examples\simgrid-java"\r
        # create a popup box, with an OK button"\r
index 7172091..01afc6b 100644 (file)
@@ -209,7 +209,7 @@ Two main types of events may change the internal state of a given process:
    messages during the transition associated to this event.\n
    \n
    Incoming messages are not handled as soon as they arrive, but only when
-   the process declares to be ready to accept incomming events (using \ref
+   the process declares to be ready to accept incoming events (using \ref
    gras_msg_handle or related functions). It ensures that the treatment of a
    given message won't run in parallel to any other callback, so that
    process globals (its state) can be accessed and modified without
@@ -221,7 +221,7 @@ Two main types of events may change the internal state of a given process:
    \n
    Processes can also wait explicitely for incoming messages matching some
    given criterions (using \ref gras_msg_wait). Any messages received before the
-   one matching the criterions will be added to the incomming messages'
+   one matching the criterions will be added to the incoming messages'
    queue for further use. This may breaks the message delivery order.
    Moreover, there is no restriction on when this can be done. So, a
    callback to a given message can consume messages of other types. There is
@@ -287,14 +287,14 @@ The experimental scenario is as follows: <ul>
 
 <li>Process A sends a first message (depicted in red) with gras_msg_send(), do
     some more computation, and then send another message (depicted in
-    yellow). Then, this process handles any incomming message with
+    yellow). Then, this process handles any incoming message with
     gras_msg_handle(). Since no message is already queued in process A at this
     point, this is a blocking call until the third message (depicted in
     magenta) arrives from the other process.</li>
 
 <li>On its side, the process B explicitely wait for the second message with
     gras_msg_wait(), do some computation with it, and then call
-    gras_msg_handle() to handle any incomming message. This will pop the red
+    gras_msg_handle() to handle any incoming message. This will pop the red
     message from the queue, and start the callback attached to that kind of
     messages. This callback sends back a new message (depicted in magenta) back
     to process A.</li>
@@ -331,7 +331,7 @@ network. The order of unexpected messages and subsequent ones is thus preserved
 from the receiver point of view.</li>
 
 <li>gras_msg_wait() and gras_msg_handle() accept timeouts as argument to
-specify how long you are willing to wait at most for incomming messages. These
+specify how long you are willing to wait at most for incoming messages. These
 were ignored here to not complexify the example any further. It is worth
 mentionning that the send operation cannot be timeouted. The existance of the
 listener should make it useless.</li>
@@ -341,7 +341,7 @@ listener should make it useless.</li>
 \subsection GRAS_tut_intro_model_timing_policy Timing policy
 
 All communication primitives allow 3 timout policies: one can only poll for
-incomming events (using timeout=0), wait endlessly for the communication to
+incoming events (using timeout=0), wait endlessly for the communication to
 be performed (using timeout<0) or specify a maximal delay to wait for the
 communication to proceed (using timeout>0, being a number of seconds).
 
index e8fdcb9..3ad4204 100644 (file)
@@ -36,7 +36,7 @@ must be function without argument nor result (<tt>void my_action(void){
 
 It is important to note that timers are not prehemptive. They will not start
 as soon as they are ready. Instead, they get served when you go into
-gras_msg_handle() (and they are served before incomming messages). This is
+gras_msg_handle() (and they are served before incoming messages). This is
 because allowing timers to run in parallel to the callbacks would add
 parallelism to the user code, which would have to protect data with mutexes.
 This is a level of complexity I really don't want for user code. If you
index 37dade0..a33502a 100644 (file)
@@ -117,7 +117,7 @@ Note that this is where the explicit wait feature is used.
 
 The core of our distributed service is implemented (protocol, actions on
 server side, and accessing function on client side). We should now
-initialize the server and let it wait for incomming messages. 
+initialize the server and let it wait for incoming messages. 
 
 Defining when to stop the server can become tricky. The simplest solution is
 to never let the server stop. It simply runs forever. But the simulator will
index 2f34294..ea78dbb 100644 (file)
@@ -93,7 +93,7 @@ execute when a process receives the given request. In other words, you want
 to attach a callback to the message. Of course, you usualy don't want to do
 so on every nodes, but only on "servers" or "workers" or such. First of all,
 you need to declare the callback itself. This function that will be executed
-on request incomming must follow a very specific prototype (the same
+on request incoming must follow a very specific prototype (the same
 regardless of the call semantic): 
 
 \verbatim
index ce35441..935fc52 100644 (file)
@@ -54,7 +54,6 @@ For Windows :
        enable_supernovae               ON/OFF or TRUE/FALSE or 1/0
        enable_msg_deprecated           ON/OFF or TRUE/FALSE or 1/0                                                                                                                                                                                                                                                                               
        enable_print_message            ON/OFF or TRUE/FALSE or 1/0 
-       custom_flags                    <flags>
        gtnets_path                     <path_to_gtnets_directory>
        ns3_path                        <path_to_ns3_directory>
        CMAKE_INSTALL_PREFIX            <path_to_install_directory>
@@ -101,8 +100,6 @@ For Windows :
   
   \li enable_print_message : When set to true configuration print more debug output.
   
-  \li custom_flags : If user wants to use a specific flag during compilation, give here.
-
   \li gtnets_path : Path to gtnets install directory (ex /usr)
   
   \li ns3_path : Path to ns3 install directory (ex /usr)
@@ -135,7 +132,6 @@ enable_jedule                       off
 enable_latency_bound_tracking  off 
 enable_lib_static              off
 CMAKE_INSTALL_PREFIX           /usr/local
-custom_flags                   null
 gtnets_path                    null
 pipol_user                     null
 \endverbatim
index d5d5962..bca88dd 100644 (file)
@@ -800,7 +800,7 @@ Single
 2 2 0 1 0 7 250 -1 20 0.000 0 0 -1 0 0 5
         21555 3870 19125 3870 19125 7470 21555 7470 21555 3870
 4 0 0 240 -1 0 12 0.0000 2 90 435 19260 4635 name\001
-4 0 0 240 -1 0 12 0.0000 2 180 2385 19260 7110 incomming_communications\001
+4 0 0 240 -1 0 12 0.0000 2 180 2385 19260 7110 incoming_communications\001
 4 0 0 240 -1 0 12 0.0000 2 180 2205 19260 7335 outgoing_communications\001
 4 0 0 240 -1 0 12 0.0000 2 135 165 19260 6885 id\001
 4 0 0 240 -1 0 12 0.0000 2 180 1200 19260 4410 type (cpu|link)\001
index 268c220..34bb825 100755 (executable)
@@ -1,13 +1,13 @@
 ! timeout 20
-& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n"
 > sensor:main Sensor starting (on port 3000)
 
 ! timeout 20
-& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV bandwidth/bandwidth_sensor$EXEEXT 127.0.0.1:6000 "--log=root.fmt=%P:%t%e%m%n"
 > sensor:main Sensor starting (on port 3001)
 
 ! timeout 20
-& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV bandwidth/bandwidth_maestro$EXEEXT 6000 "--log=root.fmt=%P:%t%e%m%n"
 > maestro:main Maestro starting
 > maestro:main Wait for peers for 5 sec
 > maestro:main Contact 127.0.0.1:3000
index 7b59058..f9d57d2 100755 (executable)
@@ -1,14 +1,14 @@
 ! timeout 20
-& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n"
 
 ! timeout 20
-& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n"
 
 ! timeout 20
-& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n"
 
 ! timeout 20
-& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV saturate/saturate_sensor$EXEEXT 127.0.0.1:3333 "--log=root.fmt=%P:%t%e%m%n"
 
 ! timeout 20
-& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 "--log=root.fmt=%P:%t%e%m%n" $ARGS
+& $SG_TEST_ENV saturate/saturate_maestro$EXEEXT 3333 "--log=root.fmt=%P:%t%e%m%n"
index bb01301..f1324b1 100644 (file)
@@ -88,7 +88,7 @@ int server(int argc, char *argv[])
         xbt_socket_my_port(globals->sock));
   globals->endcondition = 0;
 
-  /* 6. Wait up to 20 minutes for an incomming message to handle */
+  /* 6. Wait up to 20 minutes for an incoming message to handle */
   gras_msg_handle(20.0);
 
   /* 7. Housekeeping */
index f5998a5..fa9de31 100644 (file)
@@ -81,7 +81,7 @@ int server(int argc, char *argv[])
   /* 5. Register my callback */
   gras_cb_register("request", &server_cb_request_handler);
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(600.0);
 
   /* 7. Free the allocated resources, and shut GRAS down */
index e3a1910..d1585f5 100644 (file)
@@ -73,7 +73,7 @@ int server(int argc, char *argv[])
   XBT_INFO("Launch server (port=%d)", port);
   sock = try_gras_socket_server(port);
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(600.0);
 
   /* 7. Free the allocated resources, and shut GRAS down */
index 90d6872..ef80458 100644 (file)
@@ -171,7 +171,7 @@ int node(int argc, char *argv[])
     }
   }
 
-  /* 8. Wait up to 10 seconds for an incomming message to handle */
+  /* 8. Wait up to 10 seconds for an incoming message to handle */
   while (globals->remaining_loop > (globals->create ? -1 : 0)) {
     gras_msg_handle(-1);
 
index ab4f75e..ccb590c 100644 (file)
@@ -88,7 +88,7 @@ int server(int argc, char *argv[])
         xbt_socket_my_port(globals->sock));
   globals->endcondition = 0;
 
-  /* 6. Wait up to 10 minutes for an incomming message to handle */
+  /* 6. Wait up to 10 minutes for an incoming message to handle */
   gras_msg_handle(10.0);
 
   /* 7. Housekeeping */
index 4908dd0..859ba97 100755 (executable)
@@ -1,7 +1,7 @@
 
 ! timeout 20
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-& $SG_TEST_ENV ./ping_server$EXEEXT 4302 --log=root.fmt=%P:%t%e%m%n $ARGS
+& $SG_TEST_ENV ./ping_server$EXEEXT 4302 --log=root.fmt=%P:%t%e%m%n
 > server:main Launch server (port=4302)
 > server:main Messages registered
 > server:main Messages registered
@@ -16,7 +16,7 @@ $ $SG_TEST_ENV sleep 1
 
 ! timeout 20
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4302 --log=root.fmt=%P:%t%e%m%n $ARGS
+& $SG_TEST_ENV ./ping_client$EXEEXT 127.0.0.1 4302 --log=root.fmt=%P:%t%e%m%n
 > client:main Launch client (server on 127.0.0.1:4302)
 > client:main Connected to 127.0.0.1:4302.
 > client:main Messages registered
index ef76fa9..ff401a3 100644 (file)
@@ -2,7 +2,7 @@ p Runs the 'ping' test within the simulator (simulation times valid for 32bits a
 
 ! output sort
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-$ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/ping.xml $ARGS "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/ping.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:server@Tremblay) Launch server (port=4000)
 > [  0.000000] (2:client@Fafard) Launch client (server on Tremblay:4000)
 > [  0.000195] (1:server@Tremblay) Messages registered
index c96003f..bbc4c68 100644 (file)
@@ -18,4 +18,4 @@ $ $SG_TEST_EXENV ./ping_simulator${EXEEXT:=} ${srcdir:=.}/../../msg/small_platfo
 > [  0.051613] (1:server@Tremblay) Exiting GRAS
 > [  0.051613] (2:client@Fafard) >>>>>>>> Got PONG(4321) from Tremblay:4000 <<<<<<<<
 > [  0.051613] (2:client@Fafard) Done.
-> [  0.051613] (2:client@Fafard) Exiting GRAS
\ No newline at end of file
+> [  0.051613] (2:client@Fafard) Exiting GRAS
index 2376a93..831274f 100755 (executable)
@@ -1,7 +1,7 @@
 
 ! setenv SG_TEST_blah=blah
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-$ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n $ARGS
+$ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n
 > alice:main == Dump all the properties of current host
 > alice:main == Dump all the properties of alice
 > alice:main   Process property: 'SG_TEST_blah' has value: 'blah'
@@ -11,7 +11,7 @@ $ $SG_TEST_ENV ./properties_alice --log=root.fmt=%P:%t%e%m%n $ARGS
 
 ! setenv SG_TEST_blah=blah
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-$ $SG_TEST_ENV ./properties_bob --log=root.fmt=%P:%t%e%m%n $ARGS
+$ $SG_TEST_ENV ./properties_bob --log=root.fmt=%P:%t%e%m%n
 > bob:main == Dump all the properties of host1
 > bob:main == Try to get a property that does not exist
 > bob:main == Set a host property that alice will try to retrieve in SG (from bob->hello)
index 4d12003..a12da53 100644 (file)
@@ -370,7 +370,7 @@ int server(int argc, char *argv[])
 
   XBT_INFO("Listening on port %d", xbt_socket_my_port(mysock));
 
-  /* 5. Wait for the ping incomming messages */
+  /* 5. Wait for the ping incoming messages */
 
   /** \bug if the server is gone before the forwarder tries to connect,
      it dies awfully with the following message. The problem stands somewhere
index d2595c5..56dde92 100644 (file)
@@ -164,8 +164,8 @@ XBT_PUBLIC(void) gras_msg_send_(xbt_socket_t sock,
  *  @hideinitializer
  * @param timeout: How long should we wait for this message.
  * @param msgt_want: type of awaited msg
- * @param[out] expeditor: where to create a socket to answer the incomming message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] expeditor: where to create a socket to answer the incoming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of another type received before the one waited will be queued
@@ -193,7 +193,7 @@ XBT_PUBLIC(void) gras_msg_handle(double timeOut);
  * right answer from the right host and so on.  Any exception raised on the
  * server is also passed over the network to the client.
  * 
- * Callbacks are attached to RPC incomming messages the regular way using
+ * Callbacks are attached to RPC incoming messages the regular way using
  * \ref gras_cb_register.
  * 
  * For an example of use, check the examples/gras/rpc directory of the distribution.
@@ -272,7 +272,7 @@ typedef enum {
      group communication
    */
 
-  e_gras_msg_kind_count = 5     /* sentinel, dont mess with */
+  e_gras_msg_kind_count = 5     /* sentinel, don't mess with */
 } e_gras_msg_kind_t;
 
 
index fa6e7c0..40c3062 100644 (file)
@@ -28,7 +28,7 @@ SG_BEGIN_DECL()
  *  and such within a specific process.
  *
  *  Timers are served by the gras_handle() function: if there is an elapsed 
- *  timer, the associated code gets executed before any incomming connexion 
+ *  timer, the associated code gets executed before any incoming connexion 
  *  are checked. 
  *
  *  The section \ref GRAS_ex_timer constitutes a perfect example of these features.
diff --git a/include/xbt/RngStream.h b/include/xbt/RngStream.h
new file mode 100644 (file)
index 0000000..a2ca811
--- /dev/null
@@ -0,0 +1,65 @@
+/* RngStream.h for ANSI C */
+#ifndef RNGSTREAM_H
+#define RNGSTREAM_H
+#include "misc.h"
+
+typedef struct RngStream_InfoState * RngStream;
+
+struct RngStream_InfoState {
+   double Cg[6], Bg[6], Ig[6];
+   int Anti;
+   int IncPrec;
+   char *name;
+};
+
+
+XBT_PUBLIC(int) RngStream_SetPackageSeed (unsigned long seed[6]);
+
+
+XBT_PUBLIC(RngStream) RngStream_CreateStream (const char name[]);
+
+
+XBT_PUBLIC(void) RngStream_DeleteStream (RngStream *pg);
+
+
+XBT_PUBLIC(void) RngStream_ResetStartStream (RngStream g);
+
+
+XBT_PUBLIC(void) RngStream_ResetStartSubstream (RngStream g);
+
+
+XBT_PUBLIC(void) RngStream_ResetNextSubstream (RngStream g);
+
+
+XBT_PUBLIC(void) RngStream_SetAntithetic (RngStream g, int a);
+
+
+XBT_PUBLIC(void) RngStream_IncreasedPrecis (RngStream g, int incp);
+
+
+XBT_PUBLIC(int) RngStream_SetSeed (RngStream g, unsigned long seed[6]);
+
+
+XBT_PUBLIC(void) RngStream_AdvanceState (RngStream g, long e, long c);
+
+
+XBT_PUBLIC(void) RngStream_GetState (RngStream g, unsigned long seed[6]);
+
+
+XBT_PUBLIC(void) RngStream_WriteState (RngStream g);
+
+
+XBT_PUBLIC(void) RngStream_WriteStateFull (RngStream g);
+
+
+XBT_PUBLIC(double) RngStream_RandU01 (RngStream g);
+
+
+XBT_PUBLIC(int) RngStream_RandInt (RngStream g, int i, int j);
+
+#endif
+
index bac0bc3..fdc1c79 100644 (file)
@@ -313,7 +313,7 @@ XBT_PUBLIC(xbt_datadesc_type_t)
 /* @{ */
 
 
-/** \brief Opaque type describing a type description callback persistant state. */
+/** \brief Opaque type describing a type description callback persistent state. */
 typedef struct s_xbt_cbps *xbt_cbps_t;
 
 /* callbacks prototypes */
index bcebc8f..31e5840 100644 (file)
@@ -24,11 +24,12 @@ SG_BEGIN_DECL()
   /** \brief Thread data type (opaque structure) */
 typedef struct xbt_os_thread_ *xbt_os_thread_t;
 
+#include <pthread.h>
+
 #ifdef _XBT_WIN32 /* defined if this is a windows system, 32bits or 64bits) */
 #include <WinDef.h>
 typedef DWORD xbt_os_thread_key_t;
 #else /* assume that every non-windows system is POSIX-compatible */
-#include <pthread.h>
 typedef pthread_key_t xbt_os_thread_key_t;
 #endif
 
index 51bbe29..89d7ef3 100644 (file)
@@ -38,12 +38,29 @@ int console_open(lua_State *L) {
   sg_platf_init();
   sg_platf_begin();
   surf_parse_init_callbacks();
+  routing_register_callbacks();
+
   return 0;
 }
 
 int console_close(lua_State *L) {
   sg_platf_end();
   sg_platf_exit();
+
+  xbt_lib_cursor_t cursor;
+  void **data;
+  char *name;
+
+  /* Initialize MSG and WKS hosts */
+  XBT_DEBUG("Initialize MSG and WKS hosts");
+  xbt_lib_foreach(host_lib, cursor, name, data) {
+    if(data[SURF_WKS_LEVEL]){
+      XBT_DEBUG("\tSee surf host %s",name);
+      SIMIX_host_create(name, data[SURF_WKS_LEVEL], NULL);
+      __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL]);
+    }
+  }
+
   return 0;
 }
 
@@ -71,6 +88,15 @@ int console_add_host(lua_State *L) {
   host.power_peak = lua_tonumber(L, -1);
   lua_pop(L, 1);
 
+  // get core
+  lua_pushstring(L, "core");
+  lua_gettable(L, -2);
+  if(!lua_isnumber(L,-1)) host.core_amount = 1;// Default value
+  else host.core_amount = lua_tonumber(L, -1);
+  if (host.core_amount == 0)
+    host.core_amount = 1;
+  lua_pop(L, 1);
+
   //get power_scale
   lua_pushstring(L, "power_scale");
   lua_gettable(L, -2);
@@ -83,18 +109,13 @@ int console_add_host(lua_State *L) {
   host.power_trace = tmgr_trace_new(lua_tostring(L, -1));
   lua_pop(L, 1);
 
-  lua_pushstring(L, "core");
-  lua_gettable(L, -2);
-  host.core_amount = lua_tonumber(L, -1);
-  if (host.core_amount == 0)
-    host.core_amount = 1;
-  lua_pop(L, 1);
-
   //get state initial
   lua_pushstring(L, "state_initial");
   lua_gettable(L, -2);
-  state = lua_tonumber(L, -1);
+  if(!lua_isnumber(L,-1)) state = 1;// Default value
+  else state = lua_tonumber(L, -1);
   lua_pop(L, 1);
+
   if (state)
     host.initial_state = SURF_RESOURCE_ON;
   else
index e33aebb..11e97f2 100644 (file)
@@ -234,7 +234,6 @@ void sglua_copy_value(lua_State* src, lua_State* dst) {
       break;
   }
 
-  indent -= 2;
   XBT_DEBUG("%sData copied", sglua_get_spaces(indent));
 
   sglua_stack_dump("src after copying a value (should be ... value): ", src);
index 24bd4ab..efd257a 100644 (file)
@@ -103,7 +103,8 @@ const char* sglua_get_spaces(int length) {
 
   static char spaces[128];
 
-  xbt_assert(length < 128);
+  xbt_assert(length >= 0 && length < 128,
+      "Invalid indentation length: %d", length);
   if (length != 0) {
     memset(spaces, ' ', length);
   }
index 6877c67..11e4bad 100644 (file)
@@ -196,7 +196,7 @@ static int simgrid_gc(lua_State * L)
  */
 static int msg_register_platform(lua_State * L)
 {
-  /* Tell Simgrid we dont wanna use its parser */
+  /* Tell Simgrid we don't wanna use its parser */
   //surf_parse = console_parse_platform;
   surf_parse_reset_callbacks();
   MSG_create_environment(NULL);
index df02431..3491586 100644 (file)
@@ -136,8 +136,8 @@ gras_msg_wait_ext_(double timeout,
  *
  * @param timeout: How long should we wait for this message.
  * @param msgt_want: type of awaited msg
- * @param[out] expeditor: where to create a socket to answer the incomming message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] expeditor: where to create a socket to answer the incoming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of another type received before the one waited will be queued
@@ -188,7 +188,7 @@ static int gras_msg_wait_or_filter(gras_msg_t msg, void *ctx)
  * @param msgt_want: a dynar containing all accepted message type
  * @param[out] ctx: the context of received message (in case it's a RPC call we want to answer to)
  * @param[out] msgt_got: indice in the dynar of the type of the received message
- * @param[out] payload: where to write the payload of the incomming message
+ * @param[out] payload: where to write the payload of the incoming message
  * @return the error code (or no_error).
  *
  * Every message of a type not in the accepted list received before the one
@@ -282,7 +282,7 @@ void gras_msg_handleall(double period)
   } while (period - now + begin > 0);
 }
 
-/** @brief Handle an incomming message or timer (or wait up to \a timeOut seconds)
+/** @brief Handle an incoming message or timer (or wait up to \a timeOut seconds)
  *
  * @param timeOut: How long to wait for incoming messages (in seconds)
  * @return the error code (or no_error).
@@ -402,7 +402,7 @@ void gras_msg_handle(volatile double timeOut)
         volatile unsigned int cpt2 = cpt;
         if (!ran_ok) {
           XBT_DEBUG
-              ("Use the callback #%u (@%p) for incomming msg '%s' (payload_size=%d)",
+              ("Use the callback #%u (@%p) for incoming msg '%s' (payload_size=%d)",
                cpt + 1, cb, msg.type->name, msg.payl_size);
           if (!cb(&ctx, msg.payl)) {
             /* cb handled the message */
index a08ee25..ca62d02 100644 (file)
@@ -19,7 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(gras_msg_read, gras_msg,
 
 typedef struct s_gras_msg_listener_ {
   xbt_thread_t listener; /* keep this first, gras_socket_im_the_server() does funky transtyping in sg_msg.c */
-  xbt_queue_t incomming_messages;       /* messages received from the wire and still to be used by master */
+  xbt_queue_t incoming_messages;       /* messages received from the wire and still to be used by master */
   xbt_queue_t socks_to_close;   /* let the listener close the sockets, since it may be selecting on them. Darwin don't like this trick */
   xbt_socket_t wakeup_sock_listener_side;
   xbt_socket_t wakeup_sock_master_side;
@@ -66,7 +66,7 @@ static void listener_function(void *p)
                   I'm not the user process but I'm just the listener. Too bad */
       XBT_VERB("Got a '%s' message (%s) from sock %p. Queue it for handling by main thread",
             gras_msgtype_get_name(msg->type),e_gras_msg_kind_names[msg->kind],msg->expe);
-      xbt_queue_push(me->incomming_messages, msg);
+      xbt_queue_push(me->incoming_messages, msg);
     } else {
       char got = *(char *) msg->payl;
       if (got == '1') {
@@ -110,7 +110,7 @@ gras_msg_listener_t gras_msg_listener_launch(xbt_queue_t msg_received)
   gras_msg_listener_t arg = xbt_new0(s_gras_msg_listener_t, 1);
 
   XBT_VERB("Launch listener");
-  arg->incomming_messages = msg_received;
+  arg->incoming_messages = msg_received;
   arg->socks_to_close = xbt_queue_new(0, sizeof(int));
   arg->init_mutex = xbt_mutex_init();
   arg->init_cond = xbt_cond_init();
@@ -150,7 +150,7 @@ void gras_msg_listener_shutdown()
   xbt_thread_join(pd->listener->listener);
 
   //  gras_socket_close(pd->listener->wakeup_sock_master_side); FIXME: uncommenting this leads to deadlock at terminaison
-  xbt_queue_free(&pd->listener->incomming_messages);
+  xbt_queue_free(&pd->listener->incoming_messages);
   xbt_queue_free(&pd->listener->socks_to_close);
   xbt_free(pd->listener);
 }
index 529ce83..462f500 100644 (file)
@@ -37,7 +37,7 @@ typedef struct {
   int pid;                      /* pid of process, only for SG */
   int ppid;                     /* ppid of process, only for SG */
 
-  gras_msg_listener_t listener; /* the thread in charge of the incomming communication for this process */
+  gras_msg_listener_t listener; /* the thread in charge of the incoming communication for this process */
 } gras_procdata_t;
 
 gras_procdata_t *gras_procdata_get(void);
diff --git a/src/rngstreams/RngStream.h b/src/rngstreams/RngStream.h
deleted file mode 100644 (file)
index ecbd493..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/* RngStream.h for ANSI C */
-#ifndef RNGSTREAM_H
-#define RNGSTREAM_H
-
-
-typedef struct RngStream_InfoState * RngStream;
-
-struct RngStream_InfoState {
-   double Cg[6], Bg[6], Ig[6];
-   int Anti;
-   int IncPrec;
-   char *name;
-};
-
-
-int RngStream_SetPackageSeed (unsigned long seed[6]);
-
-
-RngStream RngStream_CreateStream (const char name[]);
-
-
-void RngStream_DeleteStream (RngStream *pg);
-
-
-void RngStream_ResetStartStream (RngStream g);
-
-
-void RngStream_ResetStartSubstream (RngStream g);
-
-
-void RngStream_ResetNextSubstream (RngStream g);
-
-
-void RngStream_SetAntithetic (RngStream g, int a);
-
-
-void RngStream_IncreasedPrecis (RngStream g, int incp);
-
-
-int RngStream_SetSeed (RngStream g, unsigned long seed[6]);
-
-
-void RngStream_AdvanceState (RngStream g, long e, long c);
-
-
-void RngStream_GetState (RngStream g, unsigned long seed[6]);
-
-
-void RngStream_WriteState (RngStream g);
-
-
-void RngStream_WriteStateFull (RngStream g);
-
-
-double RngStream_RandU01 (RngStream g);
-
-
-int RngStream_RandInt (RngStream g, int i, int j);
-
-#endif
-
index f0ec02f..9273ab1 100644 (file)
@@ -28,7 +28,7 @@ static xbt_os_thread_key_t smx_current_context_key = 0;
 static smx_context_t smx_current_context_serial;
 static int smx_parallel_contexts = 1;
 static int smx_parallel_threshold = 2;
-static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_FUTEX;
+static e_xbt_parmap_mode_t smx_parallel_synchronization_mode = XBT_PARMAP_DEFAULT;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.
index 36980e1..3980bb2 100644 (file)
@@ -542,7 +542,7 @@ double surf_solve(double max_date)
     }
   }
 
-  XBT_DEBUG("Min for resources (remember that NS3 dont update that value) : %f", min);
+  XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", min);
 
   XBT_DEBUG("Looking for next trace event");
 
similarity index 98%
rename from src/rngstreams/RngStream.c
rename to src/xbt/RngStream.c
index eb4f695..494f9de 100644 (file)
@@ -12,7 +12,7 @@
 \***********************************************************************/
 
 
-#include "RngStream.h"
+#include "xbt/RngStream.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -517,3 +517,15 @@ int RngStream_RandInt (RngStream g, int i, int j)
 {
    return i + (int) ((j - i + 1.0) * RngStream_RandU01 (g));
 }
+
+/* Undefine this terms, or supernovae build will fail. */
+#undef norm
+#undef m1
+#undef m2
+#undef a12
+#undef a13n
+#undef a21
+#undef a23n
+#undef two17
+#undef two53
+#undef fact
index 084e668..9704bc0 100644 (file)
@@ -74,10 +74,10 @@ void xbt_backtrace_current(xbt_ex_t * e)
 {
   e->used = backtrace((void **) e->bt, XBT_BACKTRACE_SIZE);
   if (e->used == 0) {
-    XBT_DEBUG("The backtrace() function failed.\n"
-              "Here is a crude dump of the exception that I was trying to build:\n"
-              "%s:%s(%d) [%s:%d] %s",
-              e->host, e->procname, e->pid, e->file, e->line, e->msg);
+    fprintf(stderr, "The backtrace() function failed, which probably means that the memory is exhausted. Here is a crude dump of the exception that I was trying to build:");
+    fprintf(stderr, "%s:%s(%d) [%s:%d] %s", e->host,e->procname,e->pid, e->file,e->line,e->msg);
+    fprintf(stderr, "Bailing out now since there is nothing I can do without a decent amount of memory. Please go fix the memleaks\n");
+    exit(1);
   }
 }
 
index 2810ac3..b258d3a 100644 (file)
@@ -1,4 +1,4 @@
-/* cbps - persistant states for callbacks                                   */
+/* cbps - persistent states for callbacks                                   */
 
 /* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -9,7 +9,7 @@
 #include "xbt/ex.h"
 #include "xbt/datadesc/datadesc_private.h"
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_ddt_cbps, xbt_ddt,
-                                "callback persistant state");
+                                "callback persistent state");
 
 typedef struct {
   xbt_datadesc_type_t type;
index a5fd45d..0c1c802 100644 (file)
@@ -234,7 +234,7 @@ xbt_datadesc_scalar(const char *name,
                      enum e_xbt_dd_scalar_encoding encoding);
 
 /****************************************************
- * Callback persistant state constructor/destructor *
+ * Callback persistent state constructor/destructor *
  ****************************************************/
 xbt_cbps_t xbt_cbps_new(void);
 void xbt_cbps_free(xbt_cbps_t * state);
index 95f47ca..a5b33d8 100644 (file)
@@ -955,7 +955,7 @@ int _xbt_log_cat_init(xbt_log_category_t category,
         cpp = cpp->nextSibling;
       }
 
-      XBT_DEBUG("Childs of %s: %s; nextSibling: %s",
+      XBT_DEBUG("Children of %s: %s; nextSibling: %s",
              category->parent->name, res,
              (category->parent->nextSibling ?
               category->parent->nextSibling->name : "none"));
index 1c6e955..e2fd6e6 100644 (file)
@@ -1,7 +1,7 @@
 
 p Check the marshaling facilities (trying to read the result of linux/amd64)
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64  --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n" $ARGS
+$ $SG_TEST_EXENV gras/datadesc/datadesc_usage --read ${srcdir:=.}/gras/datadesc/datadesc.little64  --log=test.thres:verbose --log=structs.thres:info "--log=root.fmt:%m%n"
 > Read from file datadesc.little64
 > This file was generated on little64 (4)
 > ---- Test on integer ----
index 8b9e840..b94f15c 100755 (executable)
@@ -1,5 +1,5 @@
 
 ! timeout 20
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-& $SG_TEST_ENV ${bindir:=.}/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n $ARGS
+& $SG_TEST_ENV ${bindir:=.}/empty_main_function$EXEEXT --log=root.fmt=%P:%t%e%m%n
 > function:main Exiting GRAS
index f20ece9..c0b34f4 100755 (executable)
@@ -1,7 +1,7 @@
 
 ! timeout 20
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-& $SG_TEST_ENV gras/msg_handle/msg_handle_server$EXEEXT 4002 127.0.0.1:4003 --log=root.fmt=%P:%t%e%m%n $ARGS
+& $SG_TEST_ENV gras/msg_handle/msg_handle_server$EXEEXT 4002 127.0.0.1:4003 --log=root.fmt=%P:%t%e%m%n
 > server:main Launch server (port=4002)
 > server:main Initialization done.
 > server:main gras_msg_handle(0) works as expected (immediate timeout)
@@ -11,7 +11,7 @@
 
 ! timeout 20
 ! setenv GRAS_NO_WARN_EXPERIMENTAL=1
-& $SG_TEST_ENV gras/msg_handle/msg_handle_client$EXEEXT 4003 127.0.0.1:4002 --log=root.fmt=%P:%t%e%m%n $ARGS
+& $SG_TEST_ENV gras/msg_handle/msg_handle_client$EXEEXT 4003 127.0.0.1:4002 --log=root.fmt=%P:%t%e%m%n
 > client:main Launch client (port=4003)
 > client:main Initialization done.
 > client:main Got the message