simplifications

[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 ab59350..fe4c5dc 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,56 +6,22 @@
 #ifndef SIMIX_HOST_PRIVATE_HPP
 #define SIMIX_HOST_PRIVATE_HPP
 
-#include <functional>
-#include <map>
-#include <vector>
+#include "src/simix/ActorImpl.hpp"
 
-#include <xbt/base.h>
-#include <xbt/Extendable.hpp>
-
-#include "simgrid/simix.h"
-#include "popping_private.hpp"
-
-#include "src/kernel/activity/ExecImpl.hpp"
-
-/** @brief Host datatype from SIMIX POV */
-namespace simgrid {
-  namespace simix {
-    class ProcessArg;
-
-    class Host {
-    public:
-      static simgrid::xbt::Extension<simgrid::s4u::Host, Host> EXTENSION_ID;
-
-      explicit Host();
-      virtual ~Host();
-
-      xbt_swag_t process_list;
-      std::vector<ProcessArg*> auto_restart_processes;
-      std::vector<ProcessArg*> boot_processes;
-
-      void turnOn();
-    };
-  }
-}
-
-extern "C" {
-XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host, const char* name, std::function<void()> code,
-                                                     void* data, double kill_time,
-                                                     std::map<std::string, std::string>* properties, int auto_restart);
+#include <boost/intrusive/list.hpp>
 
+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);
 
-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 void SIMIX_set_category(smx_activity_t synchro, std::string 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);
-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,
+XBT_PRIVATE simgrid::kernel::activity::ExecImplPtr SIMIX_execution_start(std::string name, std::string category,
+                                                                         double flops_amount, double priority,
+                                                                         double bound, sg_host_t host);
+XBT_PRIVATE simgrid::kernel::activity::ExecImplPtr
+SIMIX_execution_parallel_start(std::string name, int host_nb, sg_host_t* host_list, double* flops_amount,
                                double* bytes_amount, double rate, double timeout);
 
 #endif
-