Compile fix: smx_process_t->request is a s_smx_req_t now.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9100 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 3b2eb2a..f97fc36 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -126,7 +126,8 @@ void MC_dpor(void)
 
       /* Check for deadlocks */
       xbt_swag_foreach(process, simix_global->process_list){
 
       /* Check for deadlocks */
       xbt_swag_foreach(process, simix_global->process_list){

-        if(process->request && !SIMIX_request_is_enabled(process->request)){
+      /* FIXME: use REQ_NO_REQ instead of NULL for comparison */
+        if(&process->request && !SIMIX_request_is_enabled(&process->request)){

           *mc_exp_ctl = MC_DEADLOCK;
           return;
         }
           *mc_exp_ctl = MC_DEADLOCK;
           return;
         }

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index acd09ed..0dd57b1 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -164,7 +164,7 @@ void MC_replay(xbt_fifo_t stack)
     if(saved_req){
       /* because we got a copy of the executed request, we have to fetch the  
          real one, pointed by the request field of the issuer process */
     if(saved_req){
       /* because we got a copy of the executed request, we have to fetch the  
          real one, pointed by the request field of the issuer process */

-      req = saved_req->issuer->request;
+      req = &saved_req->issuer->request;

 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 0547bdb..f6ccb79 100644 (file)
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -47,9 +47,9 @@ smx_req_t MC_state_get_request(mc_state_t state)
     if(SIMIX_process_is_enabled(process)
        && !xbt_setset_set_belongs(state->done, process)){
       xbt_setset_set_insert(state->done, process);
     if(SIMIX_process_is_enabled(process)
        && !xbt_setset_set_belongs(state->done, process)){
       xbt_setset_set_insert(state->done, process);

-      return process->request;
+      return &process->request;

     }
   }
    
   return NULL;
     }
   }
    
   return NULL;

-}
\ No newline at end of file
+}