From 163f8696544cfc2c11a545b9ed06011903780031 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 2 Jul 2018 00:50:44 +0200 Subject: [PATCH] kill some include directives --- src/kernel/activity/CommImpl.cpp | 2 +- .../CommunicationDeterminismChecker.cpp | 11 ++++------ src/mc/mc_base.cpp | 9 ++++---- src/mc/mc_record.cpp | 22 ++++--------------- src/mc/mc_request.cpp | 5 ++--- src/mc/mc_state.cpp | 11 ++-------- src/mc/mc_state.hpp | 1 + src/msg/msg_gos.cpp | 1 + src/plugins/dirty_page_tracking.cpp | 1 + src/plugins/host_energy.cpp | 1 + src/plugins/host_load.cpp | 3 ++- src/plugins/vm/VirtualMachineImpl.cpp | 4 ++-- src/plugins/vm/s4u_VirtualMachine.cpp | 1 + src/s4u/s4u_Actor.cpp | 2 ++ src/s4u/s4u_Mailbox.cpp | 6 ++--- src/simix/ActorImpl.cpp | 2 ++ src/simix/libsmx.cpp | 13 ++--------- src/simix/popping.cpp | 10 --------- src/simix/popping_private.hpp | 8 ++----- src/simix/smx_environment.cpp | 7 ++---- src/simix/smx_global.cpp | 11 +++------- src/simix/smx_host.cpp | 3 ++- src/simix/smx_host_private.hpp | 9 ++------ src/simix/smx_io.cpp | 9 +------- src/simix/smx_network.cpp | 18 +++++---------- src/simix/smx_network_private.hpp | 5 ++--- src/simix/smx_private.hpp | 2 ++ src/simix/smx_synchro.cpp | 3 +-- src/simix/smx_synchro_private.hpp | 2 -- src/smpi/mpi/smpi_comm.cpp | 7 ------ src/surf/sg_platf.cpp | 1 + src/surf/surf_c_bindings.cpp | 2 ++ 32 files changed, 59 insertions(+), 133 deletions(-) diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index 8c2f838362..516c8fcb9c 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.cpp @@ -5,8 +5,8 @@ #include "src/kernel/activity/CommImpl.hpp" #include "simgrid/kernel/resource/Action.hpp" - #include "simgrid/modelchecker.h" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_network_private.hpp" #include "src/surf/surf_interface.hpp" diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index 5b8d3ff1bd..c417b911af 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -3,14 +3,9 @@ /* 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 - -#include -#include -#include - -#include "src/mc/VisitedState.hpp" #include "src/mc/checker/CommunicationDeterminismChecker.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" +#include "src/mc/VisitedState.hpp" #include "src/mc/mc_exit.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_record.hpp" @@ -21,6 +16,8 @@ #include "smpi_request.hpp" +#include + using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_comm_determinism, mc, "Logging specific to MC communication determinism detection"); diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index b9baf9148d..063e6956a5 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -3,17 +3,16 @@ /* 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 - -#include "mc/mc.h" #include "src/mc/mc_base.h" +#include "mc/mc.h" +#include "simgrid/config.h" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" -#include "src/kernel/activity/MutexImpl.hpp" - #if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" #include "src/mc/remote/RemoteClient.hpp" diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index 51a699d486..14de45f5e7 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -3,27 +3,13 @@ /* 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 -#include -#include - -#include -#include -#include - -#include "xbt/log.h" -#include "xbt/sysdep.h" - -#include "simgrid/simix.h" - -#include "src/kernel/context/Context.hpp" #include "src/mc/mc_record.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/context/Context.hpp" +#include "src/mc/Transition.hpp" +#include "src/mc/mc_base.h" #include "src/mc/mc_replay.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_private.hpp" - -#include "src/mc/mc_base.h" -#include "src/mc/Transition.hpp" #if SIMGRID_HAVE_MC #include "src/mc/checker/Checker.hpp" diff --git a/src/mc/mc_request.cpp b/src/mc/mc_request.cpp index 86f9ce8a30..6bde7b5d6c 100644 --- a/src/mc/mc_request.cpp +++ b/src/mc/mc_request.cpp @@ -3,12 +3,11 @@ /* 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 - +#include "src/mc/mc_request.hpp" #include "src/include/mc/mc.h" +#include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/ModelChecker.hpp" -#include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" #include "src/mc/mc_xbt.hpp" diff --git a/src/mc/mc_state.cpp b/src/mc/mc_state.cpp index 491f2dcbc4..369ea0130b 100644 --- a/src/mc/mc_state.cpp +++ b/src/mc/mc_state.cpp @@ -3,20 +3,13 @@ /* 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 - -#include - -#include "xbt/log.h" -#include "xbt/sysdep.h" - #include "src/mc/mc_comm_pattern.hpp" -#include "src/mc/mc_private.hpp" #include "src/mc/mc_request.hpp" #include "src/mc/mc_smx.hpp" #include "src/mc/mc_state.hpp" #include "src/mc/mc_xbt.hpp" -#include "src/simix/smx_private.hpp" + +#include using simgrid::mc::remote; diff --git a/src/mc/mc_state.hpp b/src/mc/mc_state.hpp index dc3a52b9ec..2da800775a 100644 --- a/src/mc/mc_state.hpp +++ b/src/mc/mc_state.hpp @@ -12,6 +12,7 @@ #include "src/mc/mc_record.hpp" #include "src/mc/mc_snapshot.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/mc/Transition.hpp" namespace simgrid { diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index e9f5b1c319..213315d24c 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -5,6 +5,7 @@ #include +#include "simgrid/s4u/Mailbox.hpp" #include "src/instr/instr_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" #include "src/msg/msg_private.hpp" diff --git a/src/plugins/dirty_page_tracking.cpp b/src/plugins/dirty_page_tracking.cpp index e655b2c066..4097976bb3 100644 --- a/src/plugins/dirty_page_tracking.cpp +++ b/src/plugins/dirty_page_tracking.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/plugins/live_migration.h" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" namespace simgrid { diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp index d01fe42e5b..734f5ea174 100644 --- a/src/plugins/host_energy.cpp +++ b/src/plugins/host_energy.cpp @@ -6,6 +6,7 @@ #include "simgrid/plugins/energy.h" #include "simgrid/plugins/load.h" #include "simgrid/s4u/Engine.hpp" +#include "src/include/surf/surf.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/surf/cpu_interface.hpp" diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index 86d6f1a48f..9c297c7d1e 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -3,9 +3,10 @@ /* 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 #include "simgrid/plugins/load.h" +#include "src/include/surf/surf.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include /** @addtogroup plugin_load diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp index 5553650a53..8e4d618dc2 100644 --- a/src/plugins/vm/VirtualMachineImpl.cpp +++ b/src/plugins/vm/VirtualMachineImpl.cpp @@ -4,10 +4,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/plugins/vm/VirtualMachineImpl.hpp" +#include "src/include/surf/surf.hpp" #include "src/simix/ActorImpl.hpp" #include "src/simix/smx_host_private.hpp" - -#include // xbt_log_no_loc +#include "xbt/asserts.h" // xbt_log_no_loc XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module"); diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp index c81a2cdc32..9e892c6e78 100644 --- a/src/plugins/vm/s4u_VirtualMachine.cpp +++ b/src/plugins/vm/s4u_VirtualMachine.cpp @@ -5,6 +5,7 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/vm.h" +#include "src/include/surf/surf.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/plugins/vm/VmHostExt.hpp" #include "src/simix/smx_host_private.hpp" diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp index 220675bf4a..8c45ca0142 100644 --- a/src/s4u/s4u_Actor.cpp +++ b/src/s4u/s4u_Actor.cpp @@ -7,7 +7,9 @@ #include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Host.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/simix/smx_private.hpp" + #include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors"); diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 7c3841ed02..0170e6fd18 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -5,10 +5,8 @@ #include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" -#include "src/msg/msg_private.hpp" -#include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_network_private.hpp" -#include "xbt/log.h" +#include "src/kernel/activity/MailboxImpl.hpp" +#include XBT_LOG_EXTERNAL_CATEGORY(s4u); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes"); diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index da87116cbf..d1a7ea16b9 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -5,6 +5,8 @@ #include "mc/mc.h" #include "smx_private.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/IoImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroRaw.hpp" diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index ed1d0cb79e..a40d1b0525 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -5,29 +5,20 @@ /* */ /* This is somehow the "libc" of SimGrid */ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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 /* std::isfinite() */ - -#include - #include "mc/mc.h" -#include "simgrid/s4u/VirtualMachine.hpp" -#include "simgrid/simix.hpp" #include "simgrid/simix/blocking_simcall.hpp" -#include "smx_private.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ConditionVariableImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" -#include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" -#include "xbt/ex.h" -#include "xbt/functional.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); diff --git a/src/simix/popping.cpp b/src/simix/popping.cpp index 34e4a71043..7d94291d56 100644 --- a/src/simix/popping.cpp +++ b/src/simix/popping.cpp @@ -4,16 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smx_private.hpp" -#include "xbt/xbt_os_thread.h" -#if SIMGRID_HAVE_MC -#include "src/mc/mc_private.hpp" -#endif - -#include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" -#include "src/kernel/activity/IoImpl.hpp" -#include "src/kernel/activity/SleepImpl.hpp" -#include "src/kernel/activity/SynchroRaw.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_popping, simix, "Popping part of SIMIX (transmuting from user request into kernel handlers)"); diff --git a/src/simix/popping_private.hpp b/src/simix/popping_private.hpp index 8561f7d574..7e6675b566 100644 --- a/src/simix/popping_private.hpp +++ b/src/simix/popping_private.hpp @@ -6,12 +6,8 @@ #ifndef SG_POPPING_PRIVATE_HPP #define SG_POPPING_PRIVATE_HPP -#include -#include - -#include -#include -#include +#include "simgrid/forward.h" +#include "src/kernel/activity/ActivityImpl.hpp" #include diff --git a/src/simix/smx_environment.cpp b/src/simix/smx_environment.cpp index 3a97ce8a73..ad6fe51ad9 100644 --- a/src/simix/smx_environment.cpp +++ b/src/simix/smx_environment.cpp @@ -1,13 +1,10 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2018. 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 "smx_private.hpp" -#include "xbt/config.hpp" -#include "xbt/log.h" -#include "xbt/sysdep.h" +#include "src/include/surf/surf.hpp" #include "xbt/xbt_os_time.h" #include diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 9e11626edf..6e7b575410 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -7,8 +7,10 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "../kernel/activity/IoImpl.hpp" #include "simgrid/sg_config.hpp" +#include "src/kernel/activity/ExecImpl.hpp" +#include "src/kernel/activity/IoImpl.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/kernel/activity/SleepImpl.hpp" #include "src/kernel/activity/SynchroRaw.hpp" #include "src/mc/mc_record.hpp" @@ -20,17 +22,10 @@ #include "src/surf/xml/platf.hpp" #if SIMGRID_HAVE_MC -#include "src/mc/mc_private.hpp" #include "src/mc/remote/Client.hpp" -#include "src/mc/remote/mc_protocol.h" -#endif - -#if HAVE_SMPI -#include "src/smpi/include/private.hpp" #endif #include -#include XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)"); diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp index a1f5cdf802..aedf946f2f 100644 --- a/src/simix/smx_host.cpp +++ b/src/simix/smx_host.cpp @@ -5,10 +5,11 @@ #include "mc/mc.h" #include "smx_private.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/ExecImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.hpp" -#include "src/surf/surf_interface.hpp" #include "xbt/ex.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts"); diff --git a/src/simix/smx_host_private.hpp b/src/simix/smx_host_private.hpp index 920bc47f16..aff0d7f143 100644 --- a/src/simix/smx_host_private.hpp +++ b/src/simix/smx_host_private.hpp @@ -6,14 +6,9 @@ #ifndef SIMIX_HOST_PRIVATE_HPP #define SIMIX_HOST_PRIVATE_HPP -#include -#include -#include -#include - #include "src/simix/ActorImpl.hpp" -#include "src/simix/popping_private.hpp" -#include "xbt/Extendable.hpp" + +#include XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, simgrid::kernel::actor::ActorImpl* actor); XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host); diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index d2a31185c2..f210733aa6 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -3,20 +3,13 @@ /* 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 -#include -#include - #include "simgrid/s4u/Host.hpp" -#include "simgrid/s4u/Storage.hpp" +#include "xbt/ex.hpp" #include "smx_private.hpp" #include "src/kernel/activity/IoImpl.hpp" #include "src/simix/smx_io_private.hpp" -#include "src/surf/HostImpl.hpp" #include "src/surf/StorageImpl.hpp" -#include "src/surf/surf_interface.hpp" -#include "surf/surf.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_io, simix, "Logging specific to SIMIX (io)"); diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp index b2327ed30d..1b7b19517b 100644 --- a/src/simix/smx_network.cpp +++ b/src/simix/smx_network.cpp @@ -3,24 +3,16 @@ /* 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 - -#include - -#include "src/kernel/activity/CommImpl.hpp" -#include - -#include "simgrid/s4u/Host.hpp" - #include "mc/mc.h" -#include "simgrid/s4u/Activity.hpp" -#include "simgrid/s4u/Mailbox.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/mc/mc_replay.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/surf_interface.hpp" - #include "src/surf/network_interface.hpp" +#include "xbt/ex.hpp" + +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization"); diff --git a/src/simix/smx_network_private.hpp b/src/simix/smx_network_private.hpp index 02c03c1b9e..c059ed68ce 100644 --- a/src/simix/smx_network_private.hpp +++ b/src/simix/smx_network_private.hpp @@ -6,9 +6,8 @@ #ifndef SIMIX_NETWORK_PRIVATE_HPP #define SIMIX_NETWORK_PRIVATE_HPP -#include "simgrid/s4u/Mailbox.hpp" -#include "src/kernel/activity/MailboxImpl.hpp" -#include "src/simix/ActorImpl.hpp" +#include "simgrid/forward.h" +#include "src/simix/popping_private.hpp" XBT_PRIVATE smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size, diff --git a/src/simix/smx_private.hpp b/src/simix/smx_private.hpp index bcbb2f6a8d..6609bd1234 100644 --- a/src/simix/smx_private.hpp +++ b/src/simix/smx_private.hpp @@ -8,8 +8,10 @@ #include "simgrid/s4u/Actor.hpp" #include "src/kernel/context/Context.hpp" +#include "src/simix/ActorImpl.hpp" #include +#include #include #include diff --git a/src/simix/smx_synchro.cpp b/src/simix/smx_synchro.cpp index cf91e4a819..d7deecfa12 100644 --- a/src/simix/smx_synchro.cpp +++ b/src/simix/smx_synchro.cpp @@ -3,13 +3,12 @@ /* 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 "smx_private.hpp" #include "src/kernel/activity/ConditionVariableImpl.hpp" #include "src/kernel/activity/MutexImpl.hpp" #include "src/kernel/activity/SynchroRaw.hpp" +#include "src/kernel/context/Context.hpp" #include "src/simix/smx_synchro_private.hpp" #include "src/surf/cpu_interface.hpp" -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)"); diff --git a/src/simix/smx_synchro_private.hpp b/src/simix/smx_synchro_private.hpp index 22a765a38f..7c05cade35 100644 --- a/src/simix/smx_synchro_private.hpp +++ b/src/simix/smx_synchro_private.hpp @@ -6,9 +6,7 @@ #ifndef SIMIX_SYNCHRO_PRIVATE_H #define SIMIX_SYNCHRO_PRIVATE_H -#include "simgrid/s4u/ConditionVariable.hpp" #include "src/simix/ActorImpl.hpp" -#include smx_activity_t SIMIX_synchro_wait(sg_host_t smx_host, double timeout); diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index 4b0d125e85..f3b50db431 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -4,21 +4,14 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smpi_comm.hpp" -#include "private.hpp" -#include "simgrid/s4u/Host.hpp" #include "smpi_coll.hpp" #include "smpi_datatype.hpp" #include "smpi_process.hpp" #include "smpi_request.hpp" -#include "smpi_status.hpp" #include "smpi_win.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_private.hpp" #include "src/surf/HostImpl.hpp" -#include #include -#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 1fb6e16281..eeb26bca95 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -16,6 +16,7 @@ #include "simgrid/kernel/routing/VivaldiZone.hpp" #include "simgrid/s4u/Engine.hpp" #include "src/include/simgrid/sg_config.hpp" +#include "src/include/surf/surf.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_host_private.hpp" #include "src/simix/smx_private.hpp" diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index 83b24b3dfb..07e3030275 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -4,8 +4,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/Engine.hpp" +#include "src/include/surf/surf.hpp" #include "src/instr/instr_private.hpp" #include "src/plugins/vm/VirtualMachineImpl.hpp" + #include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); -- 2.20.1