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
stop using MSG_task_get_initial_flops_amount(): it's useless now
[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
d12eeff
..
aab4ac6
100644
(file)
--- a/
src/mc/mc_client_api.cpp
+++ b/
src/mc/mc_client_api.cpp
@@
-1,21
+1,21
@@
-/* Copyright (c) 2008-201
5
. The SimGrid Team.
+/* Copyright (c) 2008-201
7
. 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
"xbt/log.h"
+#include
"xbt/sysdep.h"
#include <simgrid/modelchecker.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/ModelChecker.hpp"
+#include "src/mc/mc_ignore.h"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
-/**
\
file mc_client_api.cpp
+/**
@
file mc_client_api.cpp
*
* This is the implementation of the API used by the user simulated program to
* communicate with the MC (declared in modelchecker.h).
*
* This is the implementation of the API used by the user simulated program to
* communicate with the MC (declared in modelchecker.h).
@@
-29,14
+29,14
@@
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() &&
!
prop)
+ if (MC_is_active() &&
not
prop)
simgrid::mc::Client::get()->reportAssertionFailure();
}
simgrid::mc::Client::get()->reportAssertionFailure();
}
-void MC_cut(
void
)
+void MC_cut()
{
xbt_assert(mc_model_checker == nullptr);
{
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");
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);
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);
}
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);
{
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.");
return;
xbt_die("Support for client-side function proposition is not implemented: "
"use MC_automaton_new_propositional_symbol_pointer instead.");
@@
-62,34
+62,34
@@
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);
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);
}
/** @brief Register a stack in the model checker
*
return;
simgrid::mc::Client::get()->declareSymbol(name, value);
}
/** @brief Register a stack in the model checker
*
- * The stacks are allocated in the heap. The MC handle them
especi
ally
- * when we analy
s
e/compare the content of the heap so it must be told where
+ * The stacks are allocated in the heap. The MC handle them
specific
ally
+ * when we analy
z
e/compare the content of the heap so it must be told where
* they are with this function.
*
* 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_process_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);
{
xbt_assert(mc_model_checker == nullptr);
- if (
!
MC_is_active())
+ if (
not
MC_is_active())
return;
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)
{
xbt_assert(mc_model_checker == nullptr);
}
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");
return;
// TODO, send a message to the model_checker
xbt_die("Unimplemented");
@@
-98,15
+98,15
@@
void MC_ignore_global_variable(const char *name)
void MC_ignore_heap(void *address, size_t size)
{
xbt_assert(mc_model_checker == nullptr);
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);
}
return;
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);
{
xbt_assert(mc_model_checker == nullptr);
- if (
!
MC_is_active())
+ if (
not
MC_is_active())
return;
simgrid::mc::Client::get()->unignoreHeap(address, size);
}
return;
simgrid::mc::Client::get()->unignoreHeap(address, size);
}