Remove extern "C" from cpp files.

[simgrid.git] / src / simix / smx_host_private.hpp

diff --git a/src/simix/smx_host_private.hpp b/src/simix/smx_host_private.hpp
index 6943f19..00f681a 100644 (file)
--- a/src/simix/smx_host_private.hpp
+++ b/src/simix/smx_host_private.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -6,6 +6,7 @@
 #ifndef SIMIX_HOST_PRIVATE_HPP
 #define SIMIX_HOST_PRIVATE_HPP
 
+#include <boost/intrusive/list.hpp>
 #include <functional>
 #include <map>
 #include <vector>
@@ -16,12 +17,12 @@
 #include "popping_private.hpp"
 #include "simgrid/simix.h"
 
+#include "ActorImpl.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 
 /** @brief Host datatype from SIMIX POV */
 namespace simgrid {
 namespace simix {
-class ProcessArg;
 
 class Host {
 public:
@@ -30,9 +31,12 @@ public:
   explicit Host();
   virtual ~Host();
 
-  xbt_swag_t process_list;
-  std::vector<ProcessArg*> auto_restart_processes;
-  std::vector<ProcessArg*> boot_processes;
+  boost::intrusive::list<kernel::actor::ActorImpl,
+                         boost::intrusive::member_hook<kernel::actor::ActorImpl, boost::intrusive::list_member_hook<>,
+                                                       &kernel::actor::ActorImpl::host_process_list_hook>>
+      process_list;
+  std::vector<kernel::actor::ProcessArg*> auto_restart_processes;
+  std::vector<kernel::actor::ProcessArg*> boot_processes;
 
   void turnOn();
 };
@@ -46,13 +50,13 @@ XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, const char*
 
 XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host);
 
-XBT_PRIVATE void SIMIX_execution_finish(simgrid::kernel::activity::ExecImplPtr exec);
+XBT_PRIVATE void SIMIX_execution_finish(smx_activity_t synchro);
 
 XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char* category);
 }
 
 XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
-SIMIX_execution_start(smx_actor_t issuer, const char* name, double flops_amount, double priority, double bound);
+SIMIX_execution_start(const char* name, double flops_amount, double priority, double bound, sg_host_t host);
 XBT_PRIVATE boost::intrusive_ptr<simgrid::kernel::activity::ExecImpl>
 SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list, double* flops_amount,
                                double* bytes_amount, double rate, double timeout);