Merge branches 'MC_LTL' and 'MC_LTL' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined buildtools/Cmake/DefinePackages.cmake
index fac0192,aeb4b10..fd54e3d
--- 1/buildtools/Cmake/DefinePackages.cmake
--- 2/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@@ -16,6 -16,7 +16,7 @@@ set(EXTRA_DIS
        src/xbt/backtrace_windows.c
        src/xbt/backtrace_dummy.c
        src/xbt/setset_private.h
+       src/xbt/automatonparse_promela.c
        src/xbt/mmalloc/attach.c
        src/xbt/mmalloc/detach.c        
        src/xbt/mmalloc/keys.c
@@@ -179,6 -180,7 +180,7 @@@ set(XBT_SR
        src/xbt/parmap.c
        src/xbt/xbt_replay_trace_reader.c
        src/xbt/lib.c
+       src/xbt/automaton.c
  )
  
  if(HAVE_MMAP)
@@@ -224,12 -226,14 +226,12 @@@ set(SURF_SR
        src/surf/surf.c
        src/surf/surfxml_parse.c
        src/surf/surfxml_parseplatf.c
 -      src/surf/cpu.c
        src/surf/network.c
 -      src/surf/network_im.c
        src/surf/network_constant.c
        src/surf/workstation.c
        src/surf/workstation_ptask_L07.c
        src/surf/cpu_ti.c
 -      src/surf/cpu_im.c
 +      src/surf/cpu_cas01.c
        src/surf/sg_platf.c
        src/xbt/xbt_sg_stubs.c
  )
@@@ -365,6 -369,7 +367,7 @@@ set(MC_SR
        src/mc/mc_dpor.c
        src/mc/mc_request.c
        src/mc/private.h
+       src/mc/mc_liveness.c
  )
  
  set(RNGSTREAM_SRC
@@@ -407,6 -412,8 +410,8 @@@ set(headers_to_instal
        include/xbt/mmalloc.h
        include/xbt/replay_trace_reader.h
        include/xbt/parmap.h
+       include/xbt/automaton.h
+       include/xbt/automatonparse_promela.h
        include/simgrid/platf.h
        include/mc/modelchecker.h
        include/msg/msg.h

diff --combined src/simix/smx_smurf.c
index 1db593b,f193032..1fb1585
--- 1/src/simix/smx_smurf.c
--- 2/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@@ -39,7 -39,6 +39,7 @@@ void SIMIX_request_answer(smx_req_t req
  
  void SIMIX_request_pre(smx_req_t req, int value)
  {
 +  XBT_DEBUG("Handling request %p: %s", req, SIMIX_request_name(req->call));
  
    switch (req->call) {
      case REQ_COMM_TEST:
@@@ -71,7 -70,6 +71,7 @@@
            req->comm_send.src_buff,
            req->comm_send.src_buff_size,
            req->comm_send.match_fun,
 +          NULL, /* no clean function since it's not detached */
            req->comm_send.data,
            0);
        SIMIX_pre_comm_wait(req, comm, req->comm_send.timeout, 0);
@@@ -87,7 -85,6 +87,7 @@@
            req->comm_isend.src_buff,
            req->comm_isend.src_buff_size,
            req->comm_isend.match_fun,
 +          req->comm_isend.clean_fun,
            req->comm_isend.data,
            req->comm_isend.detached);
        SIMIX_request_answer(req);
@@@ -487,6 -484,7 +487,7 @@@
            SIMIX_host_get_name(SIMIX_process_get_host(req->issuer))
            );
        break;
+ 
    }
  }