From 20d5d4cbcb5580189461745935712009a7afbce5 Mon Sep 17 00:00:00 2001
From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 2 Dec 2010 17:18:55 +0000
Subject: [PATCH] Rename two functions and a structure

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8911 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 src/mc/mc_dpor.c          | 4 ++--
 src/mc/mc_global.c        | 4 ++--
 src/simix/private.h       | 6 +++---
 src/simix/smurf_private.h | 4 ++--
 src/simix/smx_global.c    | 4 ++--
 src/simix/smx_process.c   | 2 +-
 src/simix/smx_smurf.c     | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 02c1d058ff..3b2eb2ab11 100644
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -126,7 +126,7 @@ void MC_dpor(void)
 
       /* Check for deadlocks */
       xbt_swag_foreach(process, simix_global->process_list){
-        if(process->request && !SIMIX_request_isEnabled(process->request)){
+        if(process->request && !SIMIX_request_is_enabled(process->request)){
           *mc_exp_ctl = MC_DEADLOCK;
           return;
         }
@@ -181,4 +181,4 @@ void MC_dpor(void)
   MC_UNSET_RAW_MEM;
   *mc_exp_ctl = MC_STOP;
   return;
-}
\ No newline at end of file
+}
diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index c4b4b15a54..c29198cf41 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -231,7 +231,7 @@ void MC_wait_for_requests(void)
   do {
     SIMIX_context_runall(simix_global->process_to_run);
     while((req = SIMIX_request_pop())){
-      if(!SIMIX_request_isVisible(req))
+      if(!SIMIX_request_is_visible(req))
         SIMIX_request_pre(req);
       else if(req->call == REQ_COMM_WAITANY)
         THROW_UNIMPLEMENTED;
@@ -283,4 +283,4 @@ void MC_show_deadlock(smx_req_t req)
   xbt_free(req_str);
   INFO0("Counter-example execution trace:");
   MC_dump_stack(mc_stack);
-}
\ No newline at end of file
+}
diff --git a/src/simix/private.h b/src/simix/private.h
index 34cac50243..f6bafe02fc 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -28,7 +28,7 @@ extern int _surf_do_model_check;
 
 typedef struct s_smx_context_factory *smx_context_factory_t;
 
-typedef struct SIMIX_Global {
+typedef struct s_smx_global {
   smx_context_factory_t context_factory;
   xbt_dict_t host;
   xbt_swag_t process_to_run;
@@ -42,9 +42,9 @@ typedef struct SIMIX_Global {
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   xbt_dict_t latency_limited_dict;
 #endif
-} s_SIMIX_Global_t, *SIMIX_Global_t;
+} s_smx_global_t, *smx_global_t;
 
-extern SIMIX_Global_t simix_global;
+extern smx_global_t simix_global;
 
 
 /*********************************** Time ************************************/
diff --git a/src/simix/smurf_private.h b/src/simix/smurf_private.h
index 1725cf6362..7a67a35d69 100644
--- a/src/simix/smurf_private.h
+++ b/src/simix/smurf_private.h
@@ -450,8 +450,8 @@ smx_req_t SIMIX_request_pop(void);
 void SIMIX_request_answer(smx_req_t);
 void SIMIX_request_pre(smx_req_t);
 void SIMIX_request_post(smx_action_t);
-int SIMIX_request_isVisible(smx_req_t req);
-int SIMIX_request_isEnabled(smx_req_t req);
+int SIMIX_request_is_visible(smx_req_t req);
+int SIMIX_request_is_enabled(smx_req_t req);
 
 #endif
 
diff --git a/src/simix/smx_global.c b/src/simix/smx_global.c
index d6b84edc67..ddf05b6a25 100644
--- a/src/simix/smx_global.c
+++ b/src/simix/smx_global.c
@@ -22,7 +22,7 @@ XBT_LOG_EXTERNAL_CATEGORY(simix_context);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                 "Logging specific to SIMIX (kernel)");
 
-SIMIX_Global_t simix_global = NULL;
+smx_global_t simix_global = NULL;
 static xbt_heap_t simix_timers = NULL;
 
 /* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
@@ -63,7 +63,7 @@ void SIMIX_global_init(int *argc, char **argv)
     XBT_LOG_CONNECT(simix_synchro, simix);
     XBT_LOG_CONNECT(simix_context, simix);
 
-    simix_global = xbt_new0(s_SIMIX_Global_t, 1);
+    simix_global = xbt_new0(s_smx_global_t, 1);
 
     simix_global->host = xbt_dict_new();
     simix_global->process_to_run =
diff --git a/src/simix/smx_process.c b/src/simix/smx_process.c
index cb7d6e7087..c1f19e169a 100644
--- a/src/simix/smx_process.c
+++ b/src/simix/smx_process.c
@@ -400,7 +400,7 @@ int SIMIX_process_is_suspended(smx_process_t process)
 
 int SIMIX_process_is_enabled(smx_process_t process)
 {
-  if (process->request && SIMIX_request_isEnabled(process->request))
+  if (process->request && SIMIX_request_is_enabled(process->request))
     return TRUE;
 
   return FALSE;
diff --git a/src/simix/smx_smurf.c b/src/simix/smx_smurf.c
index fd7514d03e..1c21595506 100644
--- a/src/simix/smx_smurf.c
+++ b/src/simix/smx_smurf.c
@@ -56,7 +56,7 @@ void SIMIX_request_answer(smx_req_t req)
   }
 }
 
-int SIMIX_request_isVisible(smx_req_t req)
+int SIMIX_request_is_visible(smx_req_t req)
 {
   return req->call == REQ_COMM_ISEND
      || req->call == REQ_COMM_IRECV
@@ -65,7 +65,7 @@ int SIMIX_request_isVisible(smx_req_t req)
      || req->call == REQ_COMM_TEST;
 }
 
-int SIMIX_request_isEnabled(smx_req_t req)
+int SIMIX_request_is_enabled(smx_req_t req)
 {
   unsigned int index = 0;
   smx_action_t act;
-- 
2.20.1