cut some useless includes

diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp
index 88a9c08852bbdc0352ef850e08b8171dd522961c..cef2ced0f2c72e298ad7a474938dde3ba7f786b3 100644 (file)
--- a/src/kernel/activity/SynchroIo.cpp
+++ b/src/kernel/activity/SynchroIo.cpp
@@ -5,7 +5,6 @@
 
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/surf/surf_interface.hpp"
-#include "src/simix/popping_private.h"
 #include "src/simix/smx_private.h"
 
 void simgrid::kernel::activity::Io::suspend()

diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 550172e6ce4b667db72c1650ae2f2e32940c376a..226236e1b6307350e5431bc12961e520ab2be13b 100644 (file)
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -1,20 +1,16 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-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. */
 
-/* \file UContext.cpp Context switching with ucontexts from System V         */
+/* \file UContext.cpp Context switching with ucontexts from System V        */
 
-#include <stdarg.h>
-
-#include <functional>
 #include <ucontext.h>           /* context relative declarations */
 
-#include "xbt/parmap.h"
-#include "src/simix/smx_private.h"
-#include "src/internal_config.h"
 #include "mc/mc.h"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_private.h"
+#include "xbt/parmap.h"
 
 /** Many integers are needed to store a pointer
  *

diff --git a/src/msg/instr_msg_process.cpp b/src/msg/instr_msg_process.cpp
index c1c7ea87b3878212929193e41d020afaf78d8eda..6243a29f635336081d79b62d97e997a455979fb2 100644 (file)
--- a/src/msg/instr_msg_process.cpp
+++ b/src/msg/instr_msg_process.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 "msg_private.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 #include "src/simix/ActorImpl.hpp"
-#include <simgrid/s4u/host.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
 

diff --git a/src/msg/instr_msg_task.cpp b/src/msg/instr_msg_task.cpp
index c450a220c0ca40afc169980248856281a26aade0..ae50dfb8ba28e1ec94dd094a70830ebfe8c09cbb 100644 (file)
--- a/src/msg/instr_msg_task.cpp
+++ b/src/msg/instr_msg_task.cpp
@@ -4,11 +4,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 "src/instr/instr_private.h"
-#include "msg_private.h"
 #include "mc/mc.h"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
 
 void TRACE_msg_set_task_category(msg_task_t task, const char *category)
 {

diff --git a/src/msg/msg_actions.cpp b/src/msg/msg_actions.cpp
index 85f009f5a9234a44de6c5eaadf6d7cf37af1940e..2ad8a580b593cd73cce8b34555e5c209d4c6df04 100644 (file)
--- a/src/msg/msg_actions.cpp
+++ b/src/msg/msg_actions.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2009-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-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 "msg_private.h"
-#include "xbt/dynar.h"
+#include "src/msg/msg_private.h"
 #include "xbt/replay.h"
 
 #include <errno.h>

diff --git a/src/msg/msg_deployment.cpp b/src/msg/msg_deployment.cpp
index 015d748e8ce562c73c7c577cebfd6cca6302253b..f21b33b32b355c188031e8d8ba72c2eefefadf8f 100644 (file)
--- a/src/msg/msg_deployment.cpp
+++ b/src/msg/msg_deployment.cpp
@@ -1,12 +1,9 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2014. 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.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
+#include "src/msg/msg_private.h"
 
 /** \ingroup msg_simulation
  * \brief An application deployer.

diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp
index 9783390f54098fed93e35798b47a580c1d9836db..15f3b151c76b3686a8fd89876cee21e52daef599 100644 (file)
--- a/src/msg/msg_environment.cpp
+++ b/src/msg/msg_environment.cpp
@@ -1,15 +1,11 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. 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.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-
 #include "simgrid/s4u/NetZone.hpp"
 #include "simgrid/s4u/engine.hpp"
+#include "src/msg/msg_private.h"
 
 #if HAVE_LUA
 #include <lua.h>

diff --git a/src/msg/msg_global.cpp b/src/msg/msg_global.cpp
index 77bd28c8ad52b63ce48b658b4740f450e8c51c53..f4dd8abf8502a98789f38ef7aed39d70233f4084 100644 (file)
--- a/src/msg/msg_global.cpp
+++ b/src/msg/msg_global.cpp
@@ -1,18 +1,13 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-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 <simgrid/s4u/host.hpp>
+#include "simgrid/s4u/host.hpp"
 
-#include "simgrid/msg.h"
 #include "instr/instr_interface.h"
-#include "msg_private.h"
 #include "mc/mc.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/sg_config.h" /* Configuration mechanism of SimGrid */
+#include "src/msg/msg_private.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME by removing MSG_post_create_environment()
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index d7d611927543d6e6e8eae8c1c12c900fc21686ed..6ac5ddf57cae5198c4610e6917c9f8cbdfa75d5f 100644 (file)
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -5,11 +5,8 @@
 
 #include <xbt/ex.hpp>
 
+#include "src/msg/msg_private.h"
 #include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */
-#include "msg_private.h"
-#include "mc/mc.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)");
 

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index b676e16beb4e8a51ab0439f9f2eadf97c7c3404c..2be2e10d4e00f65a5e4eccaa0479d3e5c23e59dc 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -4,11 +4,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 "simgrid/s4u/host.hpp"
 #include "src/msg/msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "simgrid/simix.h"
-#include <simgrid/s4u/host.hpp>
+
 #include <numeric>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);

diff --git a/src/msg/msg_io.cpp b/src/msg/msg_io.cpp
index d7548f79e1f33c0934fad3456d87d2bf7536bb17..aff8c7e8847d41b6a9940030daf168eb13262e7b 100644 (file)
--- a/src/msg/msg_io.cpp
+++ b/src/msg/msg_io.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. 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/host.hpp>
-
-#include "msg_private.h"
-#include "xbt/log.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/msg/msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_io, msg, "Logging specific to MSG (io)");
 

diff --git a/src/msg/msg_mailbox.cpp b/src/msg/msg_mailbox.cpp
index 218671054d02f0e5f2c2328e0a3f44d05ae6518a..b4d55aa829fba987b6885c760b55e1371c55efe0 100644 (file)
--- a/src/msg/msg_mailbox.cpp
+++ b/src/msg/msg_mailbox.cpp
@@ -1,17 +1,12 @@
 /* Mailboxes in MSG */
 
-/* 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. */
 
-#include <xbt/ex.hpp>
-
-#include "simgrid/msg.h"
-#include "msg_private.h"
-#include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
+#include "src/msg/msg_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg, "Logging specific to MSG (mailbox)");
 

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index fa1262c91cf9dd5b91d845f0e049efdcd4f31961..053679675e9d019cdae5d45a7bce28673e4f1ebe 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -7,19 +7,7 @@
 #ifndef METASIMGRID_PRIVATE_H
 #define METASIMGRID_PRIVATE_H
 
-#include <exception>
-#include <functional>
-
 #include "simgrid/msg.h"
-#include "simgrid/simix.h"
-#include "src/include/surf/surf.h"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/dynar.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/config.h"
-#include "src/instr/instr_private.h"
 
 #include "src/kernel/activity/SynchroExec.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
@@ -108,13 +96,6 @@ typedef struct msg_comm {
   msg_error_t status;           /* status of the communication once finished */
 } s_msg_comm_t;
 
-/******************************* VM *************************************/
-typedef struct dirty_page {
-  double prev_clock;
-  double prev_remaining;
-  msg_task_t task;
-} s_dirty_page, *dirty_page_t;
-
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   int debug_multiple_use;       /* whether we want an error message when reusing the same Task for 2 things */

diff --git a/src/msg/msg_process.cpp b/src/msg/msg_process.cpp
index 6189fe77bad45bad1effeeed985bd5a51101f649..14f9fc9ea4587056ef0d06b03cbcd4cfa35b2283 100644 (file)
--- a/src/msg/msg_process.cpp
+++ b/src/msg/msg_process.cpp
@@ -4,14 +4,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 <functional>
-
 #include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/functional.hpp"
+#include "simgrid/s4u/host.hpp"
 #include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_process, msg, "Logging specific to MSG (process)");
 

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index 4090fb391122910f25529dccb381b9e983cfdd0e..a4801868e9bb6c6762a6ada03f8525533af0a1a9 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -4,12 +4,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 <xbt/ex.hpp>
+#include "xbt/ex.hpp"
 
 #include "msg_private.h"
-#include "xbt/log.h"
 #include "xbt/synchro.h"
-#include "xbt/sysdep.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_synchro, msg, "Logging specific to MSG (synchro)");
 

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index a8b0c6b5ee09d79da026461bccbb6383d1898fd8..d0cbebb9db813e79b880ee9d20ede42a874b2514 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -5,8 +5,6 @@
 
 #include "msg_private.h"
 #include "src/simix/smx_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 
 /** @addtogroup m_task_management
  *

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index e2bd5085cb6714640ce8d983bcac8ce3dfe7ecb9..3cf519b9e434e2b1ddfbb9c3064152281f2087f4 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -11,22 +11,22 @@
 
 #include <xbt/ex.hpp>
 
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/plugins/vm/VmHostExt.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include <simgrid/s4u/VirtualMachine.hpp>
-#include <simgrid/s4u/host.hpp>
 
-#include "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
 #include "simgrid/host.h"
+#include "simgrid/simix.hpp"
 
-#include "src/simix/smx_host_private.h" /* don't ask me why the VM functions are in there (FIXME:KILLME) */
+typedef struct dirty_page {
+  double prev_clock;
+  double prev_remaining;
+  msg_task_t task;
+} s_dirty_page, *dirty_page_t;
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API");
 
-
 /* **** ******** GENERAL ********* **** */
 
 /** \ingroup m_vm_management
@@ -117,8 +117,8 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char* name, int ramsize, int mig_net
   params.dp_cap = params.ramsize * 0.9; // assume working set memory is 90% of ramsize
   params.mig_speed = (double)mig_netspeed * 1024 * 1024; // mig_speed
 
-  //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate,
-  //         params.mig_speed, dp_intensity, update_speed, host_speed);
+  XBT_DEBUG("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f", params.dp_rate,
+            params.mig_speed, dp_intensity, update_speed, host_speed);
   static_cast<simgrid::s4u::VirtualMachine*>(vm)->setParameters(&params);
 
   return vm;

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 67cd7bfd1516728543913abee1eea72657c4890d..0f5dcc591e68e7c12400ece31529381e89e9531c 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -5,14 +5,9 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/simix/ActorImpl.hpp"
 #include "src/simix/smx_host_private.h"
 
-#include <xbt/signal.hpp>
-
-#include "src/surf/cpu_cas01.hpp"
-
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_vm, surf, "Logging specific to the SURF VM module");
 
 simgrid::vm::VMModel* surf_vm_model = nullptr;

diff --git a/src/plugins/vm/VirtualMachineImpl.hpp b/src/plugins/vm/VirtualMachineImpl.hpp
index 82b3d9ea1af34c3df5176cd7e3212e15c47da9a9..be85c44173da2a51658751bfb7a83182d904a06a 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.hpp
+++ b/src/plugins/vm/VirtualMachineImpl.hpp
@@ -1,14 +1,8 @@
-/* Copyright (c) 2004-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2016. 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 <boost/intrusive/list.hpp>
-#include <deque>
-
-#include <xbt/base.h>
-
 #include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/surf/HostImpl.hpp"
 

diff --git a/src/plugins/vm/VmHostExt.hpp b/src/plugins/vm/VmHostExt.hpp
index 46a26c8ff71f0718a8cbcd252e8790fc0cc71884..0a0bedbbf819ef540a4cc3d08947d8e524b3823a 100644 (file)
--- a/src/plugins/vm/VmHostExt.hpp
+++ b/src/plugins/vm/VmHostExt.hpp
@@ -3,8 +3,6 @@
 /* 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 "src/surf/HostImpl.hpp"
 
 #ifndef VM_HOST_INFO_HPP_

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index 05d21f9ecd2d7b9f3c99cc5baf8c6d1d88f2b56d..f0884c937877c55c785347221a561dd34e6d067e 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -3,16 +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 "simgrid/datatypes.h"
-#include "simgrid/s4u/VirtualMachine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/simix.hpp"
 #include "src/instr/instr_private.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "src/simix/smx_host_private.h"
-#include "src/surf/HostImpl.hpp"
 #include "src/surf/cpu_cas01.hpp"
-#include "xbt/asserts.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_vm, "S4U virtual machines");
 

diff --git a/src/s4u/s4u_activity.cpp b/src/s4u/s4u_activity.cpp
index 4568abb6c37d1d456f6cce3683a134011174ecb9..4e8caaa89f3937b2ab187bbbbaeae3254833f36b 100644 (file)
--- a/src/s4u/s4u_activity.cpp
+++ b/src/s4u/s4u_activity.cpp
@@ -4,8 +4,8 @@
 /* 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/asserts.h"
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/Activity.hpp"
 

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index fbd34dc674022b17b08997e9faadf3b1dd8eafc2..6b6f990c468a0398f55221f8799af7b765383ef7 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,7 +5,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "xbt/log.h"
-#include "src/msg/msg_private.h"
 
 #include "simgrid/s4u/Actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -13,7 +12,6 @@
 #include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"
-#include "src/simix/smx_private.h"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index ffc3d902a37e01741f471124b74a3de1eb7ceb5f..492e147ac4dc0abf4c676cbc127a0e0601beee69 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -7,12 +7,13 @@
 #include <string>
 #include <vector>
 
+#include "simgrid/s4u/host.hpp"
 #include "smx_private.h"
-#include <xbt/ex.hpp>
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
-#include "xbt/dict.h"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
+#include "xbt/dict.h"
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
+#include <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 

diff --git a/src/simix/smx_host.cpp b/src/simix/smx_host.cpp
index 0f311424b8ae0fdd6e56643f6b81ffd895bf4309..989eade224067935b43f32fed5ddb2fa439bdb8a 100644 (file)
--- a/src/simix/smx_host.cpp
+++ b/src/simix/smx_host.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-2016. 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. */
@@ -8,11 +7,8 @@
 #include "smx_private.h"
 #include "src/mc/mc_replay.h"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/surf/HostImpl.hpp"
-#include "xbt/sysdep.h"
 #include <xbt/ex.hpp>
 
-#include "src/kernel/activity/SynchroExec.hpp"
 #include "src/kernel/activity/SynchroComm.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_host, simix, "SIMIX hosts");

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 0db918899943809bdf5221be271ef9cdac2764e9..c4594df501b82322b57460bf9d7b853c11aa9731 100644 (file)
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -16,7 +16,6 @@
 #include "simgrid/simix.h"
 #include "popping_private.h"
 
-#include "simgrid/s4u/VirtualMachine.hpp"
 #include "src/kernel/activity/SynchroExec.hpp"
 
 /** @brief Host datatype from SIMIX POV */

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 51b017684d3122311ca8c97078a2dd446cfc1ce1..157decaa919ba8b7ee4d579e3eced185b5473ba7 100644 (file)
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -7,9 +7,6 @@
 #ifndef _SIMIX_NETWORK_PRIVATE_H
 #define _SIMIX_NETWORK_PRIVATE_H
 
-#include <string>
-
-#include <boost/intrusive_ptr.hpp>
 #include <boost/circular_buffer.hpp>
 
 #include <xbt/base.h>

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index ab1a6dad23045b88ecfe5437a29658bcea4fad08..e78326f6a8674195806a41c39a74602dd86be5c8 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -17,24 +17,13 @@
 #include "src/internal_config.h"
 #include "simgrid/simix.h"
 #include "surf/surf.h"
-#include "xbt/base.h"
-#include "xbt/fifo.h"
-#include "xbt/swag.h"
-#include "xbt/dict.h"
-#include "xbt/mallocator.h"
 #include "xbt/config.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/function_types.h"
 #include "src/xbt/ex_interface.h"
 #include "src/instr/instr_private.h"
-#include "smx_host_private.h"
-#include "smx_io_private.h"
-#include "smx_network_private.h"
-#include "popping_private.h"
-#include "smx_synchro_private.h"
 
 #include <signal.h>
-#include "src/simix/ActorImpl.hpp"
 #include "src/kernel/context/Context.hpp"
 
 /********************************** Simix Global ******************************/

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 3ffb2835192f0805c14aa0ba13ed355eaf436e13..59f55b00a935ba9ce3fc73bce06214f70b2a6c38 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -3,14 +3,7 @@
 /* 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/host.hpp>
-
-#include "src/simix/smx_private.h"
-#include "cpu_cas01.hpp"
 #include "src/surf/HostImpl.hpp"
-#include "simgrid/sg_config.h"
-
-#include "network_interface.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");