X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..bef9e56fd601b15454f003bb8d0b66db491ddf9f:/include/simgrid/forward.h

diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h
index 9a996b94cc..772a50ab5e 100644
--- a/include/simgrid/forward.h
+++ b/include/simgrid/forward.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-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. */
@@ -14,6 +14,7 @@
 
 namespace simgrid {
 namespace kernel {
+class EngineImpl;
 namespace context {
 class Context;
 class ContextFactory;
@@ -30,6 +31,8 @@ namespace activity {
   using ExecImplPtr = boost::intrusive_ptr<ExecImpl>;
   class IoImpl;
   using IoImplPtr = boost::intrusive_ptr<IoImpl>;
+  class MutexImpl;
+  using MutexImplPtr = boost::intrusive_ptr<MutexImpl>;
   class RawImpl;
   using RawImplPtr = boost::intrusive_ptr<RawImpl>;
   class SleepImpl;
@@ -37,20 +40,30 @@ namespace activity {
 
   class MailboxImpl;
 }
-
+namespace lmm {
+class Element;
+class Variable;
+class Constraint;
+class ConstraintLight;
+class System;
+}
+namespace resource {
+class Action;
+class Model;
+class Resource;
+}
 namespace routing {
   class NetPoint;
+  class NetZoneImpl;
 }
 }
 namespace simix {
   class ActorImpl;
   using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
   class Host;
-
-  class MutexImpl;
 }
+
 namespace surf {
-  class Resource;
   class Cpu;
   class LinkImpl;
   class HostImpl;
@@ -72,15 +85,20 @@ typedef simgrid::s4u::NetZone s4u_NetZone;
 typedef simgrid::s4u::VirtualMachine s4u_VM;
 typedef boost::intrusive_ptr<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
 typedef simgrid::kernel::routing::NetPoint routing_NetPoint;
-typedef simgrid::surf::Resource surf_Resource;
+typedef simgrid::kernel::resource::Resource surf_Resource;
 typedef simgrid::trace_mgr::trace tmgr_Trace;
 
 typedef simgrid::kernel::context::Context* smx_context_t;
 typedef simgrid::simix::ActorImpl* smx_actor_t;
-typedef simgrid::simix::MutexImpl* smx_mutex_t;
+typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t;
 typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t;
 typedef simgrid::surf::StorageImpl* surf_storage_t;
 
+typedef simgrid::kernel::lmm::Element* lmm_element_t;
+typedef const simgrid::kernel::lmm::Element* const_lmm_element_t;
+typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t;
+typedef simgrid::kernel::lmm::System* lmm_system_t;
+
 #else
 
 typedef struct s4u_Actor s4u_Actor;
@@ -119,24 +137,11 @@ typedef struct s_smx_simcall s_smx_simcall_t;
 typedef struct s_smx_simcall* smx_simcall_t;
 
 typedef enum { // FIXME: move this to s4u::Link; make it an enum class
-  SURF_LINK_FULLDUPLEX = 2,
-  SURF_LINK_SHARED     = 1,
-  SURF_LINK_FATPIPE    = 0
+  SURF_LINK_SPLITDUPLEX = 2,
+  SURF_LINK_SHARED      = 1,
+  SURF_LINK_FATPIPE     = 0
 } e_surf_link_sharing_policy_t;
 
-typedef enum { // FIXME: move this away; make it an enum class
-  SURF_TRACE_CONNECT_KIND_HOST_AVAIL = 4,
-  SURF_TRACE_CONNECT_KIND_SPEED      = 3,
-  SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2,
-  SURF_TRACE_CONNECT_KIND_BANDWIDTH  = 1,
-  SURF_TRACE_CONNECT_KIND_LATENCY    = 0
-} e_surf_trace_connect_kind_t;
-
-typedef enum { // FIXME: move this to s4u::Actor; make it an enum class
-  SURF_ACTOR_ON_FAILURE_DIE     = 1,
-  SURF_ACTOR_ON_FAILURE_RESTART = 0
-} e_surf_process_on_failure_t;
-
 /** @ingroup m_datatypes_management_details
  * @brief Type for any simgrid size
  */