X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/df24d1f9b8d85ff3f81c5d4f816310303d7186ab..96dda69f064a064487a0fd9a01639e7c17d7bc11:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 2ebb20b27d..ef576ad250 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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. */ @@ -113,6 +113,8 @@ namespace activity { typedef boost::intrusive_ptr MutexImplPtr; class RawImpl; typedef boost::intrusive_ptr RawImplPtr; + class SemaphoreImpl; + typedef boost::intrusive_ptr SemaphoreImplPtr; class SleepImpl; typedef boost::intrusive_ptr SleepImplPtr; @@ -134,7 +136,6 @@ class Action; class Model; class Resource; class NetworkModel; -class TraceEvent; class LinkImpl; class NetworkAction; } @@ -145,9 +146,15 @@ class NetPoint; class NetZoneImpl; class RouteCreationArgs; } +namespace profile { +class Event; +class FutureEvtSet; +class Profile; +} // namespace profile } // namespace kernel namespace simix { class Host; + class Timer; } namespace surf { class Cpu; @@ -161,10 +168,6 @@ namespace surf { namespace mc { class CommunicationDeterminismChecker; } -namespace trace_mgr { - class trace; - class future_evt_set; -} namespace vm { class VMModel; class VirtualMachineImpl; @@ -181,13 +184,14 @@ typedef simgrid::s4u::Storage s4u_Storage; typedef simgrid::s4u::NetZone s4u_NetZone; typedef simgrid::s4u::VirtualMachine s4u_VM; typedef boost::intrusive_ptr smx_activity_t; -typedef simgrid::trace_mgr::trace* tmgr_trace_t; +typedef simgrid::simix::Timer* smx_timer_t; typedef simgrid::kernel::context::Context* smx_context_t; typedef simgrid::kernel::actor::ActorImpl* smx_actor_t; typedef simgrid::kernel::activity::ConditionVariableImpl* smx_cond_t; -typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t; typedef simgrid::kernel::activity::MailboxImpl* smx_mailbox_t; +typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t; +typedef simgrid::kernel::activity::SemaphoreImpl* smx_sem_t; #else @@ -202,11 +206,13 @@ typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; typedef struct kernel_Activity* smx_activity_t; -typedef struct s_smx_context* smx_context_t; +typedef struct s_smx_timer* smx_timer_t; typedef struct s_smx_actor* smx_actor_t; typedef struct s_smx_cond_t* smx_cond_t; -typedef struct s_smx_mutex* smx_mutex_t; +typedef struct s_smx_context* smx_context_t; typedef struct s_smx_mailbox* smx_mailbox_t; +typedef struct s_smx_mutex* smx_mutex_t; +typedef struct s_smx_sem* smx_sem_t; #endif