X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d6fc96fb24bb0006584d44bee70df5f67b37f5fb..71c99a9d63794db4887045de2512d3a06ff62344:/src/simix/smx_host_private.h

diff --git a/src/simix/smx_host_private.h b/src/simix/smx_host_private.h
index 1399100115..72a46ccaf6 100644
--- a/src/simix/smx_host_private.h
+++ b/src/simix/smx_host_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,54 +7,63 @@
 #ifndef _SIMIX_HOST_PRIVATE_H
 #define _SIMIX_HOST_PRIVATE_H
 
+#include <vector>
+#include <functional>
+
+#include <xbt/base.h>
+#include <xbt/Extendable.hpp>
+
 #include "simgrid/simix.h"
-#include "smx_smurf_private.h"
+#include "popping_private.h"
+
+#include "src/kernel/activity/SynchroExec.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;
 
-/** @brief Host datatype */
-typedef struct s_smx_host {
-  char *name;              /**< @brief host name if any */
-  void *host;                   /* SURF modeling */
-  xbt_swag_t process_list;
-  xbt_dynar_t auto_restart_processes;
-  void *data;              /**< @brief user data */
-} s_smx_host_t;
+      explicit Host();
+      virtual ~Host();
 
-smx_host_t SIMIX_host_create(const char *name, void *workstation, void *data);
-void SIMIX_host_destroy(void *host);
+      xbt_swag_t process_list;
+      std::vector<ProcessArg*> auto_restart_processes;
+      std::vector<ProcessArg*> boot_processes;
 
-void SIMIX_host_add_auto_restart_process(smx_host_t host,
+      void turnOn();
+    };
+  }
+}
+typedef simgrid::simix::Host s_smx_host_priv_t;
+
+SG_BEGIN_DECL()
+XBT_PRIVATE void SIMIX_host_add_auto_restart_process(sg_host_t host,
                                          const char *name,
-                                         xbt_main_func_t code,
+                                         std::function<void()> code,
                                          void *data,
-                                         const char *hostname,
                                          double kill_time,
-                                         int argc, char **argv,
                                          xbt_dict_t properties,
                                          int auto_restart);
 
-void SIMIX_host_restart_processes(smx_host_t host);
-void SIMIX_host_autorestart(smx_host_t host);
-xbt_dict_t SIMIX_host_get_properties(u_smx_scalar_t *args);
-double SIMIX_host_get_speed(u_smx_scalar_t *args);
-double SIMIX_host_get_available_speed(u_smx_scalar_t *args);
-int SIMIX_host_get_state(u_smx_scalar_t *args);
-smx_action_t SIMIX_host_execute(u_smx_scalar_t *args);
-smx_action_t SIMIX_host_parallel_execute(u_smx_scalar_t *args);
-void SIMIX_host_execution_destroy(u_smx_scalar_t *args);
-void SIMIX_host_execution_cancel(u_smx_scalar_t *args);
-double SIMIX_host_execution_get_remains(u_smx_scalar_t *args);
-e_smx_state_t SIMIX_host_execution_get_state(u_smx_scalar_t *args);
-void SIMIX_host_execution_set_priority(u_smx_scalar_t *args);
-void SIMIX_pre_host_execution_wait(u_smx_scalar_t *args);
-
-void SIMIX_host_execution_suspend(smx_action_t action);
-void SIMIX_host_execution_resume(smx_action_t action);
-
-void SIMIX_post_host_execute(smx_action_t action);
-
-#ifdef HAVE_TRACING
-void SIMIX_set_category(smx_action_t action, const char *category);
-#endif
+XBT_PRIVATE void SIMIX_host_autorestart(sg_host_t host);
+XBT_PRIVATE smx_activity_t SIMIX_execution_start(smx_actor_t issuer, const char *name,
+    double flops_amount, double priority, double bound);
+XBT_PRIVATE smx_activity_t SIMIX_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list,
+                                                          double* flops_amount, double* bytes_amount, double amount,
+                                                          double rate, double timeout);
+XBT_PRIVATE void SIMIX_execution_cancel(smx_activity_t synchro);
+XBT_PRIVATE void SIMIX_execution_set_priority(smx_activity_t synchro, double priority);
+XBT_PRIVATE void SIMIX_execution_set_bound(smx_activity_t synchro, double bound);
+
+XBT_PRIVATE void SIMIX_execution_finish(simgrid::kernel::activity::Exec *exec);
+
+XBT_PRIVATE void SIMIX_set_category(smx_activity_t synchro, const char *category);
+
+SG_END_DECL()
 
 #endif