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
Use typed Mailbox::get<>() instead of using static_cast everywhere.
[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 d2c13d64459ce12d13a299604fe5aec5e7a2a3a5..365a5fdf0056de2809c910d182b05d6009ee75e7 100644
(file)
--- a/
src/mc/mc_client_api.cpp
+++ b/
src/mc/mc_client_api.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008-20
19
. The SimGrid Team.
+/* Copyright (c) 2008-20
20
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-9,7
+9,7
@@
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_record.hpp"
#include "src/mc/mc_replay.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/
AppSide
.hpp"
#include "xbt/asserts.h"
/** @file mc_client_api.cpp
#include "xbt/asserts.h"
/** @file mc_client_api.cpp
@@
-18,9
+18,6
@@
* communicate with the MC (declared in modelchecker.h).
*/
* communicate with the MC (declared in modelchecker.h).
*/
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
- "Public API for the model-checked application");
-
// MC_random() is in mc_base.cpp
void MC_assert(int prop)
// MC_random() is in mc_base.cpp
void MC_assert(int prop)
@@
-28,7
+25,7
@@
void MC_assert(int prop)
xbt_assert(mc_model_checker == nullptr);
if (not prop) {
if (MC_is_active())
xbt_assert(mc_model_checker == nullptr);
if (not prop) {
if (MC_is_active())
- simgrid::mc::
Client
::get()->report_assertion_failure();
+ simgrid::mc::
AppSide
::get()->report_assertion_failure();
if (MC_record_replay_is_active())
xbt_die("MC assertion failed");
}
if (MC_record_replay_is_active())
xbt_die("MC assertion failed");
}
@@
-48,7
+45,7
@@
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_memory(addr, size);
+ simgrid::mc::
AppSide
::get()->ignore_memory(addr, size);
}
void MC_automaton_new_propositional_symbol(const char* /*id*/, int (*/*fct*/)())
}
void MC_automaton_new_propositional_symbol(const char* /*id*/, int (*/*fct*/)())
@@
-65,7
+62,7
@@
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_symbol(name, value);
+ simgrid::mc::
AppSide
::get()->declare_symbol(name, value);
}
/** @brief Register a stack in the model checker
}
/** @brief Register a stack in the model checker
@@
-84,7
+81,7
@@
void MC_register_stack_area(void* stack, 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, context);
+ simgrid::mc::
AppSide
::get()->declare_stack(stack, size, context);
}
void MC_ignore_global_variable(const char* /*name*/)
}
void MC_ignore_global_variable(const char* /*name*/)
@@
-101,7
+98,7
@@
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_heap(address, size);
+ simgrid::mc::
AppSide
::get()->ignore_heap(address, size);
}
void MC_unignore_heap(void* address, size_t size)
}
void MC_unignore_heap(void* address, size_t size)
@@
-109,5
+106,5
@@
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_heap(address, size);
+ simgrid::mc::
AppSide
::get()->unignore_heap(address, size);
}
}