#include <xbt/sysdep.h>
#include <xbt/mmalloc.h>
+#include "src/internal_config.h"
+
#include "src/mc/mc_protocol.h"
#include "src/mc/Client.hpp"
}
}
+void Client::reportAssertionFailure(const char* description)
+{
+ if (channel_.send(MC_MESSAGE_ASSERTION_FAILED))
+ xbt_die("Could not send assertion to model-checker");
+ this->handleMessages();
+}
+
+void Client::ignoreMemory(void* addr, std::size_t size)
+{
+ s_mc_ignore_memory_message_t message;
+ message.type = MC_MESSAGE_IGNORE_MEMORY;
+ message.addr = (std::uintptr_t) addr;
+ message.size = size;
+ if (channel_.send(message))
+ xbt_die("Could not send IGNORE_MEMORY mesage to model-checker");
+}
+
+void Client::ignoreHeap(void* address, std::size_t size)
+{
+ xbt_mheap_t heap = mmalloc_get_current_heap();
+
+ s_mc_ignore_heap_message_t message;
+ message.type = MC_MESSAGE_IGNORE_HEAP;
+ message.address = address;
+ message.size = size;
+ message.block =
+ ((char *) address -
+ (char *) heap->heapbase) / BLOCKSIZE + 1;
+ if (heap->heapinfo[message.block].type == 0) {
+ message.fragment = -1;
+ heap->heapinfo[message.block].busy_block.ignore++;
+ } else {
+ message.fragment =
+ ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >>
+ heap->heapinfo[message.block].type;
+ heap->heapinfo[message.block].busy_frag.ignore[message.fragment]++;
+ }
+
+ if (channel_.send(message))
+ xbt_die("Could not send ignored region to MCer");
+}
+
+void Client::unignoreHeap(void* address, std::size_t size)
+{
+ s_mc_ignore_memory_message_t message;
+ message.type = MC_MESSAGE_UNIGNORE_HEAP;
+ message.addr = (std::uintptr_t) address;
+ message.size = size;
+ if (channel_.send(message))
+ xbt_die("Could not send IGNORE_HEAP mesasge to model-checker");
+}
+
+void Client::declareSymbol(const char *name, int* value)
+{
+ s_mc_register_symbol_message_t message;
+ message.type = MC_MESSAGE_REGISTER_SYMBOL;
+ if (strlen(name) + 1 > sizeof(message.name))
+ xbt_die("Symbol is too long");
+ strncpy(message.name, name, sizeof(message.name));
+ message.callback = nullptr;
+ message.data = value;
+ if (channel_.send(message))
+ xbt_die("Could send REGISTER_SYMBOL message to model-checker");
+}
+
+void Client::declareStack(void *stack, size_t size, smx_process_t process, ucontext_t* context)
+{
+ xbt_mheap_t heap = mmalloc_get_current_heap();
+
+ s_stack_region_t region;
+ memset(®ion, 0, sizeof(region));
+ region.address = stack;
+ region.context = context;
+ region.size = size;
+ region.block =
+ ((char *) stack -
+ (char *) heap->heapbase) / BLOCKSIZE + 1;
+#if HAVE_SMPI
+ if (smpi_privatize_global_variables && process)
+ region.process_index = smpi_process_index_of_smx_process(process);
+ else
+#endif
+ region.process_index = -1;
+
+ s_mc_stack_region_message_t message;
+ message.type = MC_MESSAGE_STACK_REGION;
+ message.stack_region = region;
+ if (channel_.send(message))
+ xbt_die("Coule not send STACK_REGION to model-checker");
+}
+
}
}
#include <xbt/base.h>
+#include <simgrid/simix.h>
+
#include "src/mc/mc_protocol.h"
#include "src/mc/Channel.hpp"
Channel const& getChannel() const { return channel_; }
Channel& getChannel() { return channel_; }
void mainLoop(void);
+ void reportAssertionFailure(const char* description = nullptr);
+ void ignoreMemory(void* addr, std::size_t size);
+ void ignoreHeap(void* addr, std::size_t size);
+ void unignoreHeap(void* addr, std::size_t size);
+ void declareSymbol(const char *name, int* value);
+ void declareStack(void *stack, size_t size, smx_process_t process, ucontext_t* context);
// Singleton :/
// TODO, remove the singleton antipattern.
void MC_assert(int prop)
{
- if (MC_is_active() && !prop) {
- if (simgrid::mc::Client::get()->getChannel().send(MC_MESSAGE_ASSERTION_FAILED))
- xbt_die("Could not send assertion to model-checker");
- simgrid::mc::Client::get()->handleMessages();
- }
+ if (MC_is_active() && !prop)
+ simgrid::mc::Client::get()->reportAssertionFailure();
}
void MC_cut(void)
{
- // FIXME, this is a function called in the model-checked
- // but the variable must be set in the model-checker.
- // We should send a message here instead.
- user_max_depth_reached = 1;
+ // FIXME, We want to do this in the model-checker:
+ // user_max_depth_reached = 1;
+ xbt_die("MC_cut() not implemented");
}
void MC_ignore(void* addr, size_t size)
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;
- if (simgrid::mc::Client::get()->getChannel().send(message))
- xbt_die("Could not send IGNORE_MEMORY mesage to model-checker");
+ simgrid::mc::Client::get()->ignoreMemory(addr, size);
}
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;
+ simgrid::mc::Client::get()->declareSymbol(name, value);
+}
- s_mc_register_symbol_message_t message;
- message.type = MC_MESSAGE_REGISTER_SYMBOL;
- if (strlen(name) + 1 > sizeof(message.name))
- xbt_die("Symbol is too long");
- strncpy(message.name, name, sizeof(message.name));
- message.callback = nullptr;
- message.data = value;
- if (simgrid::mc::Client::get()->getChannel().send(message))
- xbt_die("Could send REGISTER_SYMBOL message to model-checker");
+/** @brief Register a stack in the model checker
+ *
+ * The stacks are allocated in the heap. The MC handle them especially
+ * when we analyse/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 size Size of the stack
+ */
+void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->declareStack(stack, size, process, context);
+}
+
+void MC_ignore_global_variable(const char *name)
+{
+ // TODO, send a message to the model_checker
+ xbt_die("Unimplemented");
+}
+
+void MC_ignore_heap(void *address, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->ignoreHeap(address, size);
+}
+
+void MC_remove_ignore_heap(void *address, size_t size)
+{
+ if (mc_mode != MC_MODE_CLIENT)
+ return;
+ simgrid::mc::Client::get()->unignoreHeap(address, size);
}
+++ /dev/null
-/* Copyright (c) 2008-2015. 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. */
-
-#include "src/internal_config.h"
-#include "src/mc/mc_private.h"
-#include "src/smpi/private.h"
-#include "src/mc/mc_snapshot.h"
-#include "src/mc/mc_ignore.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_ignore, mc,
- "Logging specific to MC ignore mechanism");
-
-extern "C" {
-
-// ***** Model-checked
-
-void MC_ignore_heap(void *address, size_t size)
-{
- if (mc_mode != MC_MODE_CLIENT)
- return;
-
- xbt_mheap_t heap = mmalloc_get_current_heap();
-
- s_mc_ignore_heap_message_t message;
- message.type = MC_MESSAGE_IGNORE_HEAP;
- message.address = address;
- message.size = size;
- message.block =
- ((char *) address -
- (char *) heap->heapbase) / BLOCKSIZE + 1;
- if (heap->heapinfo[message.block].type == 0) {
- message.fragment = -1;
- heap->heapinfo[message.block].busy_block.ignore++;
- } else {
- message.fragment =
- ((uintptr_t) (ADDR2UINT(address) % (BLOCKSIZE))) >>
- heap->heapinfo[message.block].type;
- heap->heapinfo[message.block].busy_frag.ignore[message.fragment]++;
- }
-
- if (simgrid::mc::Client::get()->getChannel().send(message))
- xbt_die("Could not send ignored region to MCer");
-}
-
-void MC_remove_ignore_heap(void *address, size_t size)
-{
- if (mc_mode != MC_MODE_CLIENT)
- return;
-
- s_mc_ignore_memory_message_t message;
- message.type = MC_MESSAGE_UNIGNORE_HEAP;
- message.addr = (std::uintptr_t) address;
- message.size = size;
- if (simgrid::mc::Client::get()->getChannel().send(message))
- xbt_die("Could not send UNIGNORE_HEAP mesasge to model-checker");
-}
-
-void MC_ignore_global_variable(const char *name)
-{
- // TODO, send a message to the model_checker
- xbt_die("Unimplemented");
-}
-
-/** @brief Register a stack in the model checker
- *
- * The stacks are allocated in the heap. The MC handle them especially
- * when we analyse/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 size Size of the stack
- */
-void MC_register_stack_area(void *stack, smx_process_t process, ucontext_t* context, size_t size)
-{
- if (mc_mode != MC_MODE_CLIENT)
- return;
-
- xbt_mheap_t heap = mmalloc_get_current_heap();
-
- s_stack_region_t region;
- memset(®ion, 0, sizeof(region));
- region.address = stack;
- region.context = context;
- region.size = size;
- region.block =
- ((char *) stack -
- (char *) heap->heapbase) / BLOCKSIZE + 1;
-#if HAVE_SMPI
- if (smpi_privatize_global_variables && process)
- region.process_index = smpi_process_index_of_smx_process(process);
- else
-#endif
- region.process_index = -1;
-
- s_mc_stack_region_message_t message;
- message.type = MC_MESSAGE_STACK_REGION;
- message.stack_region = region;
- if (simgrid::mc::Client::get()->getChannel().send(message))
- xbt_die("Coule not send STACK_REGION to model-checker");
-}
-
-}
XBT_LOG_CONNECT(mc_diff);
XBT_LOG_CONNECT(mc_dwarf);
XBT_LOG_CONNECT(mc_hash);
- XBT_LOG_CONNECT(mc_ignore);
XBT_LOG_CONNECT(mc_liveness);
XBT_LOG_CONNECT(mc_memory);
XBT_LOG_CONNECT(mc_page_snapshot);
src/mc/mc_dwarf_tagnames.cpp
src/mc/mc_hash.hpp
src/mc/mc_hash.cpp
- src/mc/mc_ignore.cpp
src/mc/mc_ignore.h
src/mc/mc_mmalloc.h
src/mc/mc_liveness.h