From 2b3b5bd763d386fdf2f64236790cf86d1f3fd828 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 24 May 2017 17:37:22 +0200 Subject: [PATCH] this header file is much less interesting now that it's almost empty --- include/simgrid/modelchecker.h | 3 +-- src/kernel/context/Context.cpp | 2 -- src/kernel/context/ContextRaw.cpp | 1 - src/mc/ModelChecker.cpp | 1 - src/mc/Process.cpp | 1 - src/mc/mc_global.cpp | 1 - src/mc/mc_ignore.h | 10 ++-------- src/mc/remote/Client.cpp | 1 - src/msg/instr_msg_task.cpp | 1 - src/msg/msg_global.cpp | 1 - src/smpi/smpi_process.cpp | 1 - src/xbt/mmalloc/mfree.c | 1 - 12 files changed, 3 insertions(+), 21 deletions(-) diff --git a/include/simgrid/modelchecker.h b/include/simgrid/modelchecker.h index 7c7d09a9f8..11bd0b179c 100644 --- a/include/simgrid/modelchecker.h +++ b/include/simgrid/modelchecker.h @@ -1,7 +1,6 @@ /* simgrid/modelchecker.h - Formal Verification made possible in SimGrid */ -/* Copyright (c) 2008-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2008-2017. 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. */ diff --git a/src/kernel/context/Context.cpp b/src/kernel/context/Context.cpp index 97b19857dc..bf07805700 100644 --- a/src/kernel/context/Context.cpp +++ b/src/kernel/context/Context.cpp @@ -7,8 +7,6 @@ #include "src/kernel/context/Context.hpp" #include "src/simix/smx_private.h" -#include "src/mc/mc_ignore.h" - /** * @brief creates a new context for a user level process diff --git a/src/kernel/context/ContextRaw.cpp b/src/kernel/context/ContextRaw.cpp index 5afc40f350..fa39f6cc3a 100644 --- a/src/kernel/context/ContextRaw.cpp +++ b/src/kernel/context/ContextRaw.cpp @@ -9,7 +9,6 @@ #include "src/simix/smx_private.h" #include "mc/mc.h" -#include "src/mc/mc_ignore.h" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context); diff --git a/src/mc/ModelChecker.cpp b/src/mc/ModelChecker.cpp index 1b8c7186c2..f611391742 100644 --- a/src/mc/ModelChecker.cpp +++ b/src/mc/ModelChecker.cpp @@ -27,7 +27,6 @@ #include "src/mc/Transition.hpp" #include "src/mc/checker/Checker.hpp" #include "src/mc/mc_exit.h" -#include "src/mc/mc_ignore.h" #include "src/mc/mc_private.h" #include "src/mc/mc_record.h" #include "src/mc/remote/mc_protocol.h" diff --git a/src/mc/Process.cpp b/src/mc/Process.cpp index 26447a3dc2..47a0637e30 100644 --- a/src/mc/Process.cpp +++ b/src/mc/Process.cpp @@ -34,7 +34,6 @@ #include "src/mc/mc_unw.h" #include "src/mc/mc_snapshot.h" -#include "src/mc/mc_ignore.h" #include "src/mc/mc_smx.h" #include "src/mc/Process.hpp" diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 85dbe92c3c..80ecca598c 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -31,7 +31,6 @@ #if SIMGRID_HAVE_MC #include #include "src/mc/mc_comm_pattern.h" -#include "src/mc/mc_ignore.h" #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" #include "src/mc/mc_snapshot.h" diff --git a/src/mc/mc_ignore.h b/src/mc/mc_ignore.h index fef3326247..58f1795577 100644 --- a/src/mc/mc_ignore.h +++ b/src/mc/mc_ignore.h @@ -7,20 +7,14 @@ #define SIMGRID_MC_IGNORE_H #include "src/internal_config.h" -#include "xbt/dynar.h" #if HAVE_UCONTEXT_H #include /* context relative declarations */ -#endif - SG_BEGIN_DECL(); - -#if HAVE_UCONTEXT_H XBT_PUBLIC(void) MC_register_stack_area(void *stack, smx_actor_t process, ucontext_t* context, size_t size); -#endif - - SG_END_DECL(); #endif + +#endif diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp index 626b9b56d5..602c2eb95b 100644 --- a/src/mc/remote/Client.cpp +++ b/src/mc/remote/Client.cpp @@ -25,7 +25,6 @@ #include "src/mc/remote/mc_protocol.h" // We won't need those once the separation MCer/MCed is complete: -#include "src/mc/mc_ignore.h" #include "src/mc/mc_smx.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_client, mc, "MC client logic"); diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp index c4236de55a..65b69cc8e3 100644 --- a/src/msg/instr_msg_task.cpp +++ b/src/msg/instr_msg_task.cpp @@ -7,7 +7,6 @@ #include "mc/mc.h" #include "src/instr/instr_private.h" #include "src/msg/msg_private.h" -#include "src/mc/mc_ignore.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation"); diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp index fce5d4c093..3f4d5431af 100644 --- a/src/msg/msg_global.cpp +++ b/src/msg/msg_global.cpp @@ -9,7 +9,6 @@ #include "instr/instr_interface.h" #include "mc/mc.h" #include "src/msg/msg_private.h" -#include "src/mc/mc_ignore.h" XBT_LOG_NEW_CATEGORY(msg, "All MSG categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg, "Logging specific to MSG (kernel)"); diff --git a/src/smpi/smpi_process.cpp b/src/smpi/smpi_process.cpp index 446a560c56..b6bc56aa45 100644 --- a/src/smpi/smpi_process.cpp +++ b/src/smpi/smpi_process.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "mc/mc.h" -#include "src/mc/mc_ignore.h" #include "src/mc/mc_replay.h" #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c index 5294c14e49..66ec157be2 100644 --- a/src/xbt/mmalloc/mfree.c +++ b/src/xbt/mmalloc/mfree.c @@ -13,7 +13,6 @@ #include "mmprivate.h" #include "xbt/ex.h" #include "mc/mc.h" -#include "src/mc/mc_ignore.h" /* Return memory to the heap. Like `mfree' but don't call a mfree_hook if there is one. */ -- 2.20.1