From: Martin Quinson <martin.quinson@loria.fr>
Date: Sun, 16 Jul 2017 19:25:23 +0000 (+0200)
Subject: cosmetics
X-Git-Tag: v3_17~388
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/49b1303645f1ec4a07a561ce1e747a094cfb86d0

cosmetics
---

diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h
index c362f999ef..c5f59c3499 100644
--- a/include/simgrid/modelchecker.h
+++ b/include/simgrid/modelchecker.h
@@ -48,7 +48,7 @@ XBT_PUBLIC(void) MC_cut(void);
 XBT_PUBLIC(void) MC_ignore(void *addr, size_t size);
 
 XBT_PUBLIC(void) MC_ignore_heap(void* address, size_t size);
-XBT_PUBLIC(void) MC_remove_ignore_heap(void* address, size_t size);
+XBT_PUBLIC(void) MC_unignore_heap(void* address, size_t size);
 XBT_PUBLIC(void) MC_ignore_local_variable(const char* var_name, const char* frame);
 XBT_PUBLIC(void) MC_ignore_global_variable(const char* var_name);
 
diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 3cf1ff7343..fee19b6d45 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -69,21 +69,21 @@ void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
 
 /** @brief Register a stack in the model checker
  *
- *  The stacks are allocated in the heap. The MC handle them especially
+ *  The stacks are allocated in the heap. The MC handle them specifically
  *  when we analyze/compare the content of the heap so it must be told where
  *  they are with this function.
  *
- *  @param stack
- *  @param process Process owning the stack
- *  @param context
+ *  @param stack Where the stack is
+ *  @param actor Actor owning the stack
+ *  @param context The context associated to that stack
  *  @param size    Size of the stack
  */
-void MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size)
+void MC_register_stack_area(void* stack, smx_actor_t actor, ucontext_t* context, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
   if (not MC_is_active())
     return;
-  simgrid::mc::Client::get()->declareStack(stack, size, process, context);
+  simgrid::mc::Client::get()->declareStack(stack, size, actor, context);
 }
 
 void MC_ignore_global_variable(const char *name)
@@ -103,7 +103,7 @@ void MC_ignore_heap(void *address, size_t size)
   simgrid::mc::Client::get()->ignoreHeap(address, size);
 }
 
-void MC_remove_ignore_heap(void *address, size_t size)
+void MC_unignore_heap(void* address, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
   if (not MC_is_active())
diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index 38b5fc02d9..7ee5e76c2d 100644
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -59,7 +59,7 @@ void mfree(struct mdesc *mdp, void *ptr)
       mdp -> heapinfo[block].busy_block.size * BLOCKSIZE;
 
     if (MC_is_active() && mdp->heapinfo[block].busy_block.ignore > 0)
-      MC_remove_ignore_heap(ptr, mdp->heapinfo[block].busy_block.busy_size);
+      MC_unignore_heap(ptr, mdp->heapinfo[block].busy_block.busy_size);
 
     /* Find the free cluster previous to this one in the free list.
        Start searching at the last block referenced; this may benefit
@@ -169,7 +169,7 @@ void mfree(struct mdesc *mdp, void *ptr)
     }
 
     if (MC_is_active() && mdp->heapinfo[block].busy_frag.ignore[frag_nb] > 0)
-      MC_remove_ignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
+      MC_unignore_heap(ptr, mdp->heapinfo[block].busy_frag.frag_size[frag_nb]);
 
     /* Set size used in the fragment to -1 */
     mdp->heapinfo[block].busy_frag.frag_size[frag_nb] = -1;