I'm sick of recompiling everything each time I change a line.
#define SURF_SURF_H
#include "simgrid/forward.h"
-#include "src/internal_config.h"
-#include "xbt/config.h"
-#include "xbt/dict.h"
-#include "xbt/dynar.h"
#include "xbt/graph.h"
-#include "xbt/misc.h"
namespace simgrid {
namespace surf {
#include "src/instr/instr_paje_values.hpp"
#include "src/internal_config.h"
#include "xbt/graph.h"
+
#include <iomanip> /** std::setprecision **/
#include <map>
#include <memory>
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
-
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mutex, simix_synchro, "Mutex kernel-space implementation");
#include "src/kernel/activity/SynchroIo.hpp"
#include "simgrid/kernel/resource/Action.hpp"
-#include "src/simix/smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "src/simix/smx_io_private.hpp"
void simgrid::kernel::activity::IoImpl::suspend()
{
#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
-#include <functional>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include <xbt/functional.hpp>
-
-#include "simgrid/simix.h"
-#include "src/instr/instr_private.hpp"
+#include "instr/instr_interface.h"
#include "src/internal_config.h"
-#include "src/simix/popping_private.hpp"
-#include "src/simix/smx_host_private.hpp"
-#include "src/simix/smx_io_private.hpp"
#include "src/simix/smx_network_private.hpp"
-#include "src/simix/smx_synchro_private.hpp"
-#include "surf/surf.hpp"
-#include "xbt/base.h"
-#include "xbt/config.h"
-#include "xbt/function_types.h"
-#include "xbt/mallocator.h"
-#include "xbt/xbt_os_time.h"
-
-#include "src/simix/ActorImpl.hpp"
-#include <csignal>
-#include <simgrid/simix.hpp>
+#include <csignal>
namespace simgrid {
namespace kernel {
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/log.h"
+#include "src/surf/surf_interface.hpp"
#include "xbt/sysdep.h"
+
#include <algorithm>
#include <cfloat>
#include <cmath>
* "ssh://username@scm.gforge.inria.fr/svn/memo/people/pvelho/lagrange/ppf.ps".
*/
#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/surf_interface.hpp"
#include "xbt/log.h"
#include "xbt/sysdep.h"
/* 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. */
-/* \file callbacks.h */
-
#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/surf_interface.hpp"
#include "xbt/backtrace.hpp"
-#include "xbt/log.h"
-#include "xbt/mallocator.h"
-#include "xbt/sysdep.h"
-#include "xbt/utility.hpp"
-#include <algorithm>
-#include <cmath>
-#include <cstdlib>
-#include <cxxabi.h>
-#include <limits>
-#include <vector>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_maxmin, surf, "Logging specific to SURF (maxmin)");
#define SURF_MAXMIN_HPP
#include "simgrid/kernel/resource/Action.hpp"
-#include "src/internal_config.h"
-#include "src/surf/surf_interface.hpp"
-#include "surf/surf.hpp"
#include "xbt/asserts.h"
#include "xbt/mallocator.h"
-#include "xbt/misc.h"
-#include "xbt/utility.hpp"
#include <boost/intrusive/list.hpp>
#include <cmath>
#include "simgrid/kernel/resource/Model.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_CATEGORY(kernel, "Logging specific to the internals of SimGrid");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(resource, kernel, "Logging specific to the resources");
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
#include <cfloat>
#include <queue>
#include "simgrid/kernel/routing/FloydZone.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
#include <cfloat>
#include <limits>
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_full, surf, "Routing part of surf");
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
-#include "xbt/log.h"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
#include "simgrid/s4u/Host.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
#include <boost/algorithm/string.hpp>
#include <xbt/ex.hpp>
+#include "src/instr/instr_private.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp" /* MSG_task_listen looks inside the rdv directly. Not clean. */
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/ExecImpl.hpp"
-#include "xbt/Extendable.hpp"
-
-#include <atomic>
/**************** datatypes **********************************/
/********************************* Task **************************************/
#include "msg_private.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "src/instr/instr_private.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/smx_private.hpp"
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-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 "msg_private.hpp"
#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "xbt/synchro.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
/* 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 <simgrid/plugins/live_migration.h>
-#include <simgrid/s4u.hpp>
-#include <simgrid/s4u/VirtualMachine.hpp>
-#include <simgrid/vm.h>
-#include <src/instr/instr_private.hpp>
-#include <src/plugins/vm/VirtualMachineImpl.hpp>
-#include <src/plugins/vm/VmHostExt.hpp>
-#include <src/plugins/vm/VmLiveMigration.hpp>
-#include <xbt/ex.hpp>
+#include "src/plugins/vm/VmLiveMigration.hpp"
+#include "src/instr/instr_private.hpp"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/plugins/vm/VmHostExt.hpp"
+#include "xbt/ex.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(vm_live_migration, "S4U virtual machines live migration");
-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-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 "simgrid/s4u.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "simgrid/s4u/VirtualMachine.hpp"
#ifndef VM_LIVE_MIGRATION_HPP_
#define VM_LIVE_MIGRATION_HPP_
#include "src/plugins/vm/VmHostExt.hpp"
#include "src/simix/smx_host_private.hpp"
#include "src/surf/cpu_cas01.hpp"
-#include <simgrid/vm.h>
-#include <src/plugins/vm/VmLiveMigration.hpp>
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
/* 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 "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Exec.hpp"
#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Mailbox.hpp"
-
-#include "src/kernel/context/Context.hpp"
+#include "src/instr/instr_private.hpp"
#include "src/simix/smx_private.hpp"
-#include <sstream>
-
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
namespace simgrid {
-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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 <string>
-#include <functional>
-#include <stdexcept>
-
-#include <map>
-
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "simgrid/s4u/Storage.hpp"
-#include "simgrid/simix.hpp"
-#include "src/msg/msg_private.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.hpp"
+#include "src/simix/smx_host_private.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "xbt/log.h"
+
+#include <string>
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
#include "instr/instr_interface.h"
#include "mc/mc.h"
#include "simgrid/instr.h"
-#include "simgrid/simix.h"
-#include "simgrid_config.h" /* what was compiled in? */
+#include "src/internal_config.h"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "xbt/config.h"
#include "xbt/config.hpp"
-#include "xbt/log.h"
-#include "xbt/mallocator.h"
-#include "xbt/misc.h"
-#include "xbt/sysdep.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of SimGrid");
/* 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 <exception>
-#include <functional>
-#include <map>
-#include <string>
-#include <utility>
-
-#include <boost/range/algorithm.hpp>
-
-#include "xbt/ex.hpp"
-#include "xbt/functional.hpp"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-#include "xbt/utility.hpp"
-
-#include "simgrid/s4u/Host.hpp"
-
#include "mc/mc.h"
-
#include "smx_private.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/remote/Client.hpp"
-#include "src/msg/msg_private.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_io_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
+#include "xbt/ex.hpp"
#ifdef HAVE_SMPI
#include "src/smpi/include/private.hpp"
#endif
+#include <boost/range/algorithm.hpp>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
unsigned long simix_process_maxpid = 0;
#include "smx_private.hpp"
#include "src/mc/mc_forward.hpp"
+#include "src/simix/smx_synchro_private.hpp"
#include "xbt/ex.h"
#include <functional>
#include <simgrid/simix.hpp>
#if SIMGRID_HAVE_MC
#include "src/mc/mc_forward.hpp"
#endif
+#include "src/simix/smx_host_private.hpp"
+#include "src/simix/smx_synchro_private.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);
fd.write('#if SIMGRID_HAVE_MC\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#endif\n')
+ fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
+ fd.write('#include "src/simix/smx_host_private.hpp"\n')
+
fd.write('\n')
fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
+ fd.write('#include "src/simix/smx_synchro_private.hpp"\n')
+
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
template<class R, class... T>
/* 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 <boost/heap/fibonacci_heap.hpp>
-#include <functional>
-#include <memory>
-
-#include "src/internal_config.h"
-#include <csignal> /* Signal handling */
-#include <cstdlib>
-
-#include <xbt/functional.hpp>
-#include <xbt/utility.hpp>
-
+#include "mc/mc.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
-
-#include "smx_private.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "xbt/ex.h" /* ex_backtrace_display */
-
-#include "mc/mc.h"
#include "simgrid/sg_config.hpp"
-#include "src/mc/mc_replay.hpp"
-#include "src/surf/StorageImpl.hpp"
-
-#include "src/smpi/include/smpi_process.hpp"
-
-#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/activity/ExecImpl.hpp"
+#include "smx_private.hpp"
#include "src/kernel/activity/SleepImpl.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/mc_replay.hpp"
+#include "src/simix/smx_host_private.hpp"
+#include "src/smpi/include/smpi_process.hpp"
+#include "src/surf/StorageImpl.hpp"
+#include "src/surf/xml/platf.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/mc_private.hpp"
#include "src/mc/remote/mc_protocol.h"
#endif
-#include "src/mc/mc_record.hpp"
-
#if HAVE_SMPI
#include "src/smpi/include/private.hpp"
#endif
+#include <boost/heap/fibonacci_heap.hpp>
+
XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix, "Logging specific to SIMIX (kernel)");
#include "mc/mc.h"
#include "smx_private.hpp"
-#include "src/kernel/activity/CommImpl.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"
-#include <algorithm>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");
#include <map>
#include <vector>
-#include <xbt/Extendable.hpp>
-#include <xbt/base.h>
-
-#include "popping_private.hpp"
-#include "simgrid/simix.h"
-
-#include "ActorImpl.hpp"
-#include "src/kernel/activity/ExecImpl.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/popping_private.hpp"
+#include "xbt/Extendable.hpp"
/** @brief Host datatype from SIMIX POV */
namespace simgrid {
#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Storage.hpp"
+#include "smx_private.hpp"
+#include "src/simix/smx_io_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "src/surf/StorageImpl.hpp"
-#include "surf/surf.hpp"
-
-#include "smx_private.hpp"
#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
#include "src/kernel/activity/SynchroIo.hpp"
#include "simgrid/s4u/Actor.hpp"
#include "src/kernel/context/Context.hpp"
-#include <csignal>
-#include <boost/intrusive/list.hpp>
-#include <map>
+#include <unordered_map>
#include <vector>
/********************************** Simix Global ******************************/
-/* Copyright (c) 2007-2017. 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 "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include <xbt/ex.hpp>
-#include <xbt/log.h>
-#include <xbt/utility.hpp>
-
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/simix/smx_synchro_private.hpp"
+#include "src/surf/cpu_interface.hpp"
+#include <xbt/ex.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_synchro, simix, "SIMIX Synchronization (mutex, semaphores and conditions)");
#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 <algorithm>
#include <climits>
#include <vector>
/* 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 "surf_interface.hpp"
#include "cpu_interface.hpp"
#include "network_interface.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "StorageImpl.hpp"
-#include <xbt/base.h>
#ifndef SURF_HOST_INTERFACE_HPP_
#define SURF_HOST_INTERFACE_HPP_
-/*********
- * Tools *
- *********/
-
-XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
-
/*********
* Model *
*********/
}
}
+XBT_PUBLIC_DATA simgrid::surf::HostModel* surf_host_model;
+
#endif /* SURF_Host_INTERFACE_HPP_ */
/* 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/base.h>
-#include <xbt/signal.hpp>
-
#include "simgrid/kernel/resource/Action.hpp"
#include "simgrid/kernel/resource/Model.hpp"
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/surf/PropertyHolder.hpp"
+#include "src/surf/trace_mgr.hpp"
#include "surf_interface.hpp"
#include <map>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_cas01.hpp"
-#include "cpu_ti.hpp"
#include "simgrid/sg_config.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/config.hpp"
-#include "xbt/utility.hpp"
-
-#include <algorithm>
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module");
#include "cpu_interface.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include <xbt/dynar.h>
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu, surf, "Logging specific to the SURF cpu module");
#include "simgrid/kernel/resource/Resource.hpp"
#include "simgrid/s4u/Host.hpp"
#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/trace_mgr.hpp"
#include <list>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "cpu_ti.hpp"
+#include "src/surf/surf_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-#include "xbt/utility.hpp"
-#include <algorithm>
+#include "surf/surf.hpp"
#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
-/* Copyright (c) 2013-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-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 <cstdlib>
-
-#include <algorithm>
-
#include "host_clm03.hpp"
-
-#include "cpu_cas01.hpp"
#include "simgrid/sg_config.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
/* 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 <algorithm>
-
#include "network_cm02.hpp"
#include "simgrid/s4u/Host.hpp"
#include "simgrid/sg_config.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/lmm/maxmin.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "network_constant.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-/* Copyright (c) 2014-2018. The SimGrid Team.
-*All rights reserved. */
+/* Copyright (c) 2014-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 <utility>
-
+#include "src/surf/network_ib.hpp"
#include "simgrid/sg_config.hpp"
-#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/network_ib.hpp"
#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
+
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
/* 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 <algorithm>
-
#include "network_interface.hpp"
#include "simgrid/sg_config.hpp"
+#include "src/surf/surf_interface.hpp"
#ifndef NETWORK_INTERFACE_CPP_
#define NETWORK_INTERFACE_CPP_
#include "simgrid/s4u/Link.hpp"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/surf/PropertyHolder.hpp"
-#include "src/surf/surf_interface.hpp"
-#include "xbt/base.h"
+#include "src/surf/trace_mgr.hpp"
#include <list>
#include <unordered_map>
#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "src/surf/xml/platf_private.hpp"
#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
+#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ns3, surf, "Logging specific to the SURF network NS3 module");
-/* Copyright (c) 2013-2018. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2013-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 <cstddef>
-#include <algorithm>
-
-#include <xbt/log.h>
-
#include "network_smpi.hpp"
#include "simgrid/sg_config.hpp"
#include "smpi_utils.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
#include "simgrid/plugins/energy.h"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/simix.hpp"
#include "src/surf/network_interface.hpp"
+#include "surf/surf.hpp"
+
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <map>
#include <string>
-#include <utility>
-#include <vector>
/** @addtogroup SURF_plugin_energy
/* 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 <cstdlib>
-
-#include <algorithm>
-#include <unordered_set>
-
#include "ptask_L07.hpp"
-
-#include "cpu_interface.hpp"
+#include "surf/surf.hpp"
#include "xbt/config.hpp"
-#include "xbt/utility.hpp"
+
+#include <unordered_set>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_EXTERNAL_CATEGORY(xbt_cfg);
#include "simgrid/kernel/routing/TorusZone.hpp"
#include "simgrid/kernel/routing/VivaldiZone.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Storage.hpp"
#include "src/include/simgrid/sg_config.hpp"
#include "src/kernel/EngineImpl.hpp"
+#include "src/simix/smx_host_private.hpp"
#include "src/simix/smx_private.hpp"
#include "src/surf/HostImpl.hpp"
-#include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include <string>
#include "storage_n11.hpp"
#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/surf/xml/platf.hpp"
#include "src/kernel/lmm/maxmin.hpp"
-#include "xbt/utility.hpp"
-#include <cmath> /*ceil*/
+#include "src/surf/xml/platf.hpp"
+#include "surf/surf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "surf_interface.hpp"
+#include "instr/instr_interface.h" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "mc/mc.h"
-#include "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/kernel/lmm/maxmin.hpp" // Constraint
+#include "src/internal_config.h"
#include "src/surf/HostImpl.hpp"
#include "src/surf/xml/platf.hpp"
-#include "xbt/utility.hpp"
+#include "surf/surf.hpp"
#include <fstream>
-#include <set>
#include <string>
-#include <vector>
#ifdef _WIN32
#include <windows.h>
#ifndef SURF_MODEL_H_
#define SURF_MODEL_H_
-#include "xbt/signal.hpp"
-#include "xbt/utility.hpp"
-
#include "src/surf/surf_private.hpp"
-#include "surf/surf.hpp"
-#include "xbt/str.h"
-#include <boost/heap/pairing_heap.hpp>
-#include <boost/intrusive/list.hpp>
-#include <boost/optional.hpp>
#include <cmath>
#include <set>
#include <string>
#include <unordered_map>
+#include <vector>
/*********
* Utils *
#ifndef SURF_SURF_PRIVATE_HPP
#define SURF_SURF_PRIVATE_HPP
-#include "src/surf/trace_mgr.hpp"
-#include "surf/surf.hpp"
+#include "simgrid/forward.h"
+#include "xbt/sysdep.h"
extern "C" {
*/
XBT_PRIVATE int __surf_is_absolute_file_path(const char* file_path);
-extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set* future_evt_set;
-
XBT_PUBLIC void storage_register_callbacks();
XBT_PRIVATE void parse_after_config();
#include "simgrid/forward.h"
#include "xbt/sysdep.h"
+
#include <queue>
#include <vector>
-
/* Iterator within a trace */
namespace simgrid {
namespace kernel {
} // namespace kernel
} // namespace simgrid
typedef simgrid::kernel::resource::TraceEvent* tmgr_trace_event_t;
+extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set* future_evt_set;
/**
* \brief Free a trace event structure
/* 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/instr/instr_private.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
+#include "instr/instr_interface.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
-#include "xbt/misc.h"
+#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
+
#include <vector>
-#include "src/surf/xml/platf_private.hpp"
#if SIMGRID_HAVE_LUA
#include "src/bindings/lua/simgrid_lua.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/sg_config.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
#include "xbt/file.hpp"
-#include "src/surf/xml/platf_private.hpp"
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
-#include <initializer_list>
#include <string>
#include <tuple>
#include <unordered_map>
#include "simgrid/host.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
#include "simgrid/host.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_interface.hpp"
+#include "surf/surf.hpp"
+#include "xbt/config.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");