X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbef7c255d1e1bebb88d6986817557648289aec8..f5ad0a2a3554dc8f10c8fbba5715b7c92ff1d350:/src/simix/smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index d8fff8b9ae..f10bf4d126 100644
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -1,16 +1,17 @@
-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2007-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. */
 
-#ifndef _SIMIX_PRIVATE_H
-#define _SIMIX_PRIVATE_H
+#ifndef SIMIX_PRIVATE_H
+#define SIMIX_PRIVATE_H
 
-#include <signal.h>
+#include "simgrid/s4u/Actor.hpp"
 #include "src/kernel/context/Context.hpp"
+#include <signal.h>
 
 #include <map>
+#include <vector>
 
 /********************************** Simix Global ******************************/
 
@@ -18,12 +19,14 @@ namespace simgrid {
 namespace simix {
 
 class Global {
+  friend bool simgrid::s4u::this_actor::isMaestro();
+
 public:
   smx_context_factory_t context_factory = nullptr;
-  xbt_dynar_t process_to_run = nullptr;
-  xbt_dynar_t process_that_ran = nullptr;
-  std::map<int, smx_actor_t> process_list = std::map<int, smx_actor_t>();
-#if HAVE_MC
+  std::vector<smx_actor_t> process_to_run;
+  std::vector<smx_actor_t> process_that_ran;
+  std::map<aid_t, smx_actor_t> process_list;
+#if SIMGRID_HAVE_MC
   /* MCer cannot read the std::map above in the remote process, so we copy the info it needs in a dynar.
    * FIXME: This is supposed to be a temporary hack.
    * A better solution would be to change the split between MCer and MCed, where the responsibility
@@ -50,6 +53,8 @@ public:
 
   std::vector<simgrid::xbt::Task<void()>> tasks;
   std::vector<simgrid::xbt::Task<void()>> tasksTemp;
+
+  std::vector<simgrid::simix::ActorImpl*> daemons;
 };
 
 }
@@ -72,13 +77,6 @@ XBT_PUBLIC(void) SIMIX_clean();
   _smx_throw_issuer->exception = std::make_exception_ptr(e); \
   } else ((void)0)
 
-/* ******************************** File ************************************ */
-typedef struct s_smx_file {
-  surf_file_t surf_file;
-  void* data;                   /**< @brief user data */
-} s_smx_file_t;
-
-
 SG_END_DECL()
 
 #endif