X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4af4eb0eb6fc30e15953afcfeafdc366745defbf..578097cadd95b9203ed14080e1d3c832b56ddca9:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 86a28bd641..7f8dc6c625 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. */ @@ -74,6 +74,13 @@ typedef boost::intrusive_ptr MutexPtr; class NetZone; class VirtualMachine; class File; + +class Semaphore; +/** Smart pointer to a simgrid::s4u::Semaphore */ +typedef boost::intrusive_ptr SemaphorePtr; +XBT_PUBLIC void intrusive_ptr_release(Semaphore* m); +XBT_PUBLIC void intrusive_ptr_add_ref(Semaphore* m); + class Storage; } // namespace s4u @@ -127,7 +134,6 @@ class Action; class Model; class Resource; class NetworkModel; -class TraceEvent; class LinkImpl; class NetworkAction; } @@ -138,6 +144,11 @@ class NetPoint; class NetZoneImpl; class RouteCreationArgs; } +namespace profile { +class Event; +class FutureEvtSet; +class Profile; +} // namespace profile } // namespace kernel namespace simix { class Host; @@ -154,10 +165,6 @@ namespace surf { namespace mc { class CommunicationDeterminismChecker; } -namespace trace_mgr { - class trace; - class future_evt_set; -} namespace vm { class VMModel; class VirtualMachineImpl; @@ -169,11 +176,11 @@ typedef simgrid::s4u::Barrier s4u_Barrier; typedef simgrid::s4u::Host s4u_Host; typedef simgrid::s4u::Link s4u_Link; typedef simgrid::s4u::File s4u_File; +typedef simgrid::s4u::Semaphore s4u_Semaphore; 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::kernel::context::Context* smx_context_t; typedef simgrid::kernel::actor::ActorImpl* smx_actor_t; @@ -188,6 +195,7 @@ typedef struct s4u_Barrier s4u_Barrier; typedef struct s4u_Host s4u_Host; typedef struct s4u_Link s4u_Link; typedef struct s4u_File s4u_File; +typedef struct s4u_Semaphore s4u_Semaphore; typedef struct s4u_Storage s4u_Storage; typedef struct s4u_NetZone s4u_NetZone; typedef struct s4u_VM s4u_VM; @@ -202,6 +210,7 @@ typedef struct s_smx_mailbox* smx_mailbox_t; #endif typedef s4u_Barrier* sg_bar_t; +typedef s4u_Semaphore* sg_sem_t; typedef s4u_NetZone* sg_netzone_t; typedef s4u_Host* sg_host_t; typedef s4u_Link* sg_link_t; @@ -222,6 +231,7 @@ typedef unsigned long long sg_size_t; */ typedef long long sg_offset_t; +/** Actor's ID, just like the classical processes' have PID in UNIX */ typedef long aid_t; #endif /* SIMGRID_TYPES_H */