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
Merge branch 'coverity_scan' of github.com:mquinson/simgrid
[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
1605801
..
9bbceb0
100644
(file)
--- a/
src/mc/mc_client_api.cpp
+++ b/
src/mc/mc_client_api.cpp
@@
-9,13
+9,13
@@
#include <xbt/sysdep.h>
#include <simgrid/modelchecker.h>
#include <xbt/sysdep.h>
#include <simgrid/modelchecker.h>
-#include "mc_record.h"
-#include "mc_private.h"
-#include "mc_mmalloc.h"
-#include "mc_ignore.h"
-#include "mc_protocol.h"
-#include "mc_client.h"
-#include "ModelChecker.hpp"
+#include "
src/mc/
mc_record.h"
+#include "
src/mc/
mc_private.h"
+#include "
src/mc/
mc_mmalloc.h"
+#include "
src/mc/
mc_ignore.h"
+#include "
src/mc/
mc_protocol.h"
+#include "
src/mc/
mc_client.h"
+#include "
src/mc/
ModelChecker.hpp"
/** \file mc_client_api.cpp
*
/** \file mc_client_api.cpp
*
@@
-28,6
+28,10
@@
extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client_api, mc,
"Public API for the model-checked application");
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)
{
if (MC_is_active() && !prop) {
void MC_assert(int prop)
{
if (MC_is_active() && !prop) {
@@
-36,8
+40,6
@@
void MC_assert(int prop)
}
}
}
}
-// TODO, MC_automaton_new_propositional_symbol
-
void *MC_snapshot(void)
{
return simcall_mc_snapshot();
void *MC_snapshot(void)
{
return simcall_mc_snapshot();
@@
-61,17
+63,23
@@
void MC_cut(void)
void MC_ignore(void* addr, size_t size)
{
void MC_ignore(void* addr, size_t size)
{
- if (mc_mode == MC_MODE_CLIENT) {
- s_mc_ignore_memory_message_t message;
- message.type = MC_MESSAGE_IGNORE_MEMORY;
- message.addr = (std::uintptr_t) addr;
- message.size = size;
- MC_client_send_message(&message, sizeof(message));
- }
+ xbt_assert(mc_mode != MC_MODE_SERVER);
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+
+ s_mc_ignore_memory_message_t message;
+ message.type = MC_MESSAGE_IGNORE_MEMORY;
+ message.addr = (std::uintptr_t) addr;
+ message.size = size;
+ MC_client_send_message(&message, sizeof(message));
}
void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
{
}
void MC_automaton_new_propositional_symbol(const char *id, int(*fct)(void))
{
+ xbt_assert(mc_mode != MC_MODE_SERVER);
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+
xbt_die("Support for client-side function proposition is not implemented: "
"use MC_automaton_new_propositional_symbol_pointer instead."
);
xbt_die("Support for client-side function proposition is not implemented: "
"use MC_automaton_new_propositional_symbol_pointer instead."
);
@@
-82,6
+90,7
@@
void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
xbt_assert(mc_mode != MC_MODE_SERVER);
if (mc_mode != MC_MODE_CLIENT)
return;
xbt_assert(mc_mode != MC_MODE_SERVER);
if (mc_mode != MC_MODE_CLIENT)
return;
+
s_mc_register_symbol_message_t message;
message.type = MC_MESSAGE_REGISTER_SYMBOL;
if (strlen(name) + 1 > sizeof(message.name))
s_mc_register_symbol_message_t message;
message.type = MC_MESSAGE_REGISTER_SYMBOL;
if (strlen(name) + 1 > sizeof(message.name))
@@
-91,5
+100,3
@@
void MC_automaton_new_propositional_symbol_pointer(const char *name, int* value)
message.data = value;
MC_client_send_message(&message, sizeof(message));
}
message.data = value;
MC_client_send_message(&message, sizeof(message));
}
-
-}