X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b52f0fc50553e96f5bb8a8f8f2b2cf74c5a1d38e..e36a2202155d007c72d9f54fdddf3f422a8503f8:/src/kernel/context/Context.hpp

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index 72f73ec1ee..090e7f4876 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -1,11 +1,12 @@
-/* Copyright (c) 2007-2016. 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 _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
-#define _SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
+#ifndef SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
+#define SIMGRID_KERNEL_CONTEXT_CONTEXT_HPP
 
+#include <exception>
 #include <functional>
 #include <memory>
 #include <unordered_map>
@@ -13,27 +14,23 @@
 
 #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 "src/internal_config.h"
+#include "src/simix/popping_private.h"
 #include "src/simix/smx_host_private.h"
 #include "src/simix/smx_io_private.h"
 #include "src/simix/smx_network_private.h"
-#include "src/simix/popping_private.h"
-#include "src/simix/smx_synchro_private.h"
+#include "src/simix/smx_synchro_private.hpp"
+#include "surf/surf.h"
+#include "xbt/base.h"
+#include "xbt/config.h"
+#include "xbt/function_types.h"
+#include "xbt/mallocator.h"
+#include "xbt/xbt_os_time.h"
 
-#include <signal.h>
 #include "src/simix/ActorImpl.hpp"
+#include <csignal>
 
 #include <simgrid/simix.hpp>
 
@@ -49,7 +46,7 @@ namespace context {
     explicit ContextFactory(std::string name) : name_(std::move(name)) {}
     virtual ~ContextFactory();
     virtual Context* create_context(std::function<void()> code,
-      void_pfn_smxprocess_t cleanup, smx_process_t process) = 0;
+      void_pfn_smxprocess_t cleanup, smx_actor_t process) = 0;
 
     // Optional methods for attaching main() as a context:
 
@@ -57,8 +54,8 @@ namespace context {
      *
      *  This will not work on all implementation of `ContextFactory`.
      */
-    virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_process_t process);
-    virtual Context* create_maestro(std::function<void()> code, smx_process_t process);
+    virtual Context* attach(void_pfn_smxprocess_t cleanup_func, smx_actor_t process);
+    virtual Context* create_maestro(std::function<void()> code, smx_actor_t process);
 
     virtual void run_all() = 0;
     virtual Context* self();
@@ -82,22 +79,24 @@ namespace context {
   private:
     std::function<void()> code_;
     void_pfn_smxprocess_t cleanup_func_ = nullptr;
-    smx_process_t process_ = nullptr;
+    smx_actor_t process_ = nullptr;
   public:
+    class StopRequest : public std::exception {
+    };
     bool iwannadie;
-  public:
+
     Context(std::function<void()> code,
             void_pfn_smxprocess_t cleanup_func,
-            smx_process_t process);
+            smx_actor_t process);
     void operator()()
     {
       code_();
     }
     bool has_code() const
     {
-      return (bool) code_;
+      return static_cast<bool>(code_);
     }
-    smx_process_t process()
+    smx_actor_t process()
     {
       return this->process_;
     }
@@ -117,7 +116,7 @@ namespace context {
 
     AttachContext(std::function<void()> code,
             void_pfn_smxprocess_t cleanup_func,
-            smx_process_t process)
+            smx_actor_t process)
       : Context(std::move(code), cleanup_func, process)
     {}
 
@@ -151,10 +150,8 @@ SG_BEGIN_DECL()
 XBT_PRIVATE void SIMIX_context_mod_init();
 XBT_PRIVATE void SIMIX_context_mod_exit();
 
-XBT_PRIVATE smx_context_t SIMIX_context_new(
-  std::function<void()> code,
-  void_pfn_smxprocess_t cleanup_func,
-  smx_process_t simix_process);
+XBT_PUBLIC(smx_context_t)
+SIMIX_context_new(std::function<void()> code, void_pfn_smxprocess_t cleanup_func, smx_actor_t simix_process);
 
 #ifndef WIN32
 XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
@@ -162,12 +159,12 @@ XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
 
 /* We are using the bottom of the stack to save some information, like the
  * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
- * size for the stack. */
+ * size for the stack. Round its value to a multiple of 16 (for stack alignment). */
 #if HAVE_VALGRIND_H
-# define smx_context_usable_stack_size                                  \
-  (smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
+#define smx_context_usable_stack_size                                                                                  \
+  ((smx_context_stack_size - sizeof(unsigned int)) & ~0xf) /* for valgrind_stack_id */
 #else
-# define smx_context_usable_stack_size smx_context_stack_size
+#define smx_context_usable_stack_size (smx_context_stack_size & ~0xf)
 #endif
 
 /** @brief Executes all the processes to run (in parallel if possible). */
@@ -178,7 +175,7 @@ XBT_PUBLIC(smx_context_t) SIMIX_context_self(); // public because it's used in s
 XBT_PRIVATE void *SIMIX_context_stack_new();
 XBT_PRIVATE void SIMIX_context_stack_delete(void *stack);
 
-XBT_PRIVATE void SIMIX_context_set_current(smx_context_t context);
+XBT_PUBLIC(void) SIMIX_context_set_current(smx_context_t context);
 XBT_PRIVATE smx_context_t SIMIX_context_get_current();
 
 XBT_PUBLIC(int) SIMIX_process_get_maxpid();