X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/706dd4584b4002e0d948b81d103dd5c4b70db077..da6a8948438ab0798f492ed7bf5dad2a515ca04e:/src/mc/mc_client_api.cpp

diff --git a/src/mc/mc_client_api.cpp b/src/mc/mc_client_api.cpp
index 0e4fcf05ef..3cf1ff7343 100644
--- a/src/mc/mc_client_api.cpp
+++ b/src/mc/mc_client_api.cpp
@@ -4,16 +4,16 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
 #include <simgrid/modelchecker.h>
 
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_ignore.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
 #include "src/mc/ModelChecker.hpp"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_private.h"
+#include "src/mc/mc_record.h"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 /** @file mc_client_api.cpp
  *
@@ -29,14 +29,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
 void MC_assert(int prop)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (MC_is_active() && !prop)
+  if (MC_is_active() && not prop)
     simgrid::mc::Client::get()->reportAssertionFailure();
 }
 
-void MC_cut(void)
+void MC_cut()
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   // FIXME, We want to do this in the model-checker:
   xbt_die("MC_cut() not implemented");
@@ -45,15 +45,15 @@ void MC_cut(void)
 void MC_ignore(void* addr, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   simgrid::mc::Client::get()->ignoreMemory(addr, size);
 }
 
-void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
+void MC_automaton_new_propositional_symbol(const char* id, int (*fct)())
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   xbt_die("Support for client-side function proposition is not implemented: "
     "use MC_automaton_new_propositional_symbol_pointer instead.");
@@ -62,7 +62,7 @@ void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
 void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   simgrid::mc::Client::get()->declareSymbol(name, value);
 }
@@ -78,10 +78,10 @@ void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
  *  @param context
  *  @param size    Size of the stack
  */
-void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
+void MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   simgrid::mc::Client::get()->declareStack(stack, size, process, context);
 }
@@ -89,7 +89,7 @@ void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* cont
 void MC_ignore_global_variable(const char *name)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   // TODO, send a message to the model_checker
   xbt_die("Unimplemented");
@@ -98,7 +98,7 @@ void MC_ignore_global_variable(const char *name)
 void MC_ignore_heap(void *address, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   simgrid::mc::Client::get()->ignoreHeap(address, size);
 }
@@ -106,7 +106,7 @@ void MC_ignore_heap(void *address, size_t size)
 void MC_remove_ignore_heap(void *address, size_t size)
 {
   xbt_assert(mc_model_checker == nullptr);
-  if (!MC_is_active())
+  if (not MC_is_active())
     return;
   simgrid::mc::Client::get()->unignoreHeap(address, size);
 }