From: cristianrosa <cristianrosa@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 8 Dec 2010 22:08:29 +0000 (+0000)
Subject: Compile fix: smx_process_t->request is a s_smx_req_t now.
X-Git-Tag: v3.6_beta2~823
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e9c6282dfe55ae4c5b35553d5d68f9dc129181c?hp=3d27a1e82ea26521deee4ab0bab6543ab4339da9;ds=sidebyside

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 3b2eb2ab11..f97fc36e22 100644
--- 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){
-        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;
         }
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index acd09ed2a8..0dd57b1c95 100644
--- 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 */
-      req = saved_req->issuer->request;
+      req = &saved_req->issuer->request;
 
       /* 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 0547bdb4cf..f6ccb79637 100644
--- 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);
-      return process->request;
+      return &process->request;
     }
   }
    
   return NULL;
-}
\ No newline at end of file
+}