Merge pull request #190 from Takishipp/clean_events

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 0c08be8..85d9107 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -1,41 +1,16 @@
-/* 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
-
-#include <functional>
-#include <memory>
-#include <unordered_map>
-#include <vector>
-
-#include <xbt/functional.hpp>
-
-#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"
+#ifndef SIMIX_PRIVATE_H
+#define SIMIX_PRIVATE_H
 
-#include <signal.h>
-#include "src/simix/ActorImpl.hpp"
+#include "simgrid/s4u/Actor.hpp"
 #include "src/kernel/context/Context.hpp"
+#include <signal.h>
+
+#include <map>
 
 /********************************** Simix Global ******************************/
 
@@ -43,13 +18,25 @@ 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;
-  xbt_swag_t process_list = nullptr;
+  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
+   *   to compute the list of the enabled transitions goes to the MCed.
+   * That way, the MCer would not need to have the list of actors on its side.
+   * These info could be published by the MCed to the MCer in a way inspired of vd.so
+   */
+  xbt_dynar_t actors_vector = xbt_dynar_new(sizeof(smx_actor_t), nullptr);
+#endif
   xbt_swag_t process_to_destroy = nullptr;
-  smx_process_t maestro_process = nullptr;
+  smx_actor_t maestro_process = nullptr;
 
   // Maps function names to actor code:
   std::unordered_map<std::string, simgrid::simix::ActorCodeFactory> registered_functions;
@@ -65,6 +52,8 @@ public:
 
   std::vector<simgrid::xbt::Task<void()>> tasks;
   std::vector<simgrid::xbt::Task<void()>> tasksTemp;
+
+  std::vector<simgrid::simix::ActorImpl*> daemons;
 };
 
 }
@@ -80,17 +69,15 @@ XBT_PUBLIC(void) SIMIX_clean();
 /** @brief Ask to the provided simix process to raise the provided exception */
 #define SMX_EXCEPTION(issuer, cat, val, msg) \
   if (1) { \
-  smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
+  smx_actor_t _smx_throw_issuer = (issuer); /* evaluate only once */ \
   xbt_ex e(XBT_THROW_POINT, msg); \
   e.category = cat; \
   e.value = val; \
   _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;