A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mc: cosmetics
[simgrid.git]
/
src
/
mc
/
mc_client_api.cpp
diff --git
a/src/mc/mc_client_api.cpp
b/src/mc/mc_client_api.cpp
index
e21f2d9
..
4f2e24a
100644
(file)
--- a/
src/mc/mc_client_api.cpp
+++ b/
src/mc/mc_client_api.cpp
@@
-1,19
+1,16
@@
-/* Copyright (c) 2008-201
5
. The SimGrid Team.
+/* Copyright (c) 2008-201
9
. The SimGrid Team.
* All rights reserved. */
/* 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. */
* All rights reserved. */
/* 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 <simgrid/modelchecker.h>
-
#include "src/mc/ModelChecker.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/mc_ignore.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
#include "src/mc/remote/Client.hpp"
-#include "
src/mc/remote/mc_protocol
.h"
+#include "
xbt/asserts
.h"
/** @file mc_client_api.cpp
*
/** @file mc_client_api.cpp
*
@@
-29,8
+26,12
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
void MC_assert(int prop)
{
xbt_assert(mc_model_checker == nullptr);
void MC_assert(int prop)
{
xbt_assert(mc_model_checker == nullptr);
- if (MC_is_active() && not prop)
- simgrid::mc::Client::get()->reportAssertionFailure();
+ if (not prop) {
+ if (MC_is_active())
+ simgrid::mc::Client::get()->report_assertion_failure();
+ if (MC_record_replay_is_active())
+ xbt_die("MC assertion failed");
+ }
}
void MC_cut()
}
void MC_cut()
@@
-47,10
+48,10
@@
void MC_ignore(void* addr, size_t size)
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
- simgrid::mc::Client::get()->ignore
M
emory(addr, size);
+ simgrid::mc::Client::get()->ignore
_m
emory(addr, size);
}
}
-void MC_automaton_new_propositional_symbol(const char*
id, int (*fct
)())
+void MC_automaton_new_propositional_symbol(const char*
/*id*/, int (*/*fct*/
)())
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
@@
-64,29
+65,29
@@
void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
- simgrid::mc::Client::get()->declare
S
ymbol(name, value);
+ simgrid::mc::Client::get()->declare
_s
ymbol(name, value);
}
/** @brief Register a stack in the model checker
*
}
/** @brief Register a stack in the model checker
*
- * The stacks are allocated in the heap. The MC handle them
especi
ally
+ * The stacks are allocated in the heap. The MC handle them
specific
ally
* when we analyze/compare the content of the heap so it must be told where
* they are with this function.
*
* 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
*/
* @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;
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
- simgrid::mc::Client::get()->declare
Stack(stack, size, process
, context);
+ simgrid::mc::Client::get()->declare
_stack(stack, size, actor
, context);
}
}
-void MC_ignore_global_variable(const char
*name
)
+void MC_ignore_global_variable(const char
* /*name*/
)
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
@@
-100,13
+101,13
@@
void MC_ignore_heap(void *address, size_t size)
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
- simgrid::mc::Client::get()->ignore
H
eap(address, size);
+ simgrid::mc::Client::get()->ignore
_h
eap(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())
return;
{
xbt_assert(mc_model_checker == nullptr);
if (not MC_is_active())
return;
- simgrid::mc::Client::get()->unignore
H
eap(address, size);
+ simgrid::mc::Client::get()->unignore
_h
eap(address, size);
}
}