X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6ac23e9dc3754bbad244ed95e7aa386f7be5da6..705d7f1d9bb048c715a17cd5e726dbdbbd6b6d71:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index 3e2ac32d93..3fd32c572f 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,96 +1,157 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-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 SG_PLATF_TYPES_H -#define SG_PLATF_TYPES_H +#ifndef SIMGRID_TYPES_H +#define SIMGRID_TYPES_H #ifdef __cplusplus +#include "s4u/forward.hpp" +#include "xbt/base.h" +#include + namespace simgrid { - namespace s4u { - class As; - class Host; - class Mailbox; - } - namespace simix { - class Synchro; - } - namespace surf { - class Resource; - class Cpu; - class NetCard; - class Link; - } - namespace trace_mgr { - class trace; - class future_evt_set; - } +namespace kernel { +namespace context { +class Context; +class ContextFactory; +} +namespace activity { + class ActivityImpl; + using ActivityImplPtr = boost::intrusive_ptr; + XBT_PUBLIC(void) intrusive_ptr_add_ref(ActivityImpl* activity); + XBT_PUBLIC(void) intrusive_ptr_release(ActivityImpl* activity); + + class CommImpl; + using CommImplPtr = boost::intrusive_ptr; + class ExecImpl; + using ExecImplPtr = boost::intrusive_ptr; + class IoImpl; + using IoImplPtr = boost::intrusive_ptr; + class MutexImpl; + using MutexImplPtr = boost::intrusive_ptr; + class RawImpl; + using RawImplPtr = boost::intrusive_ptr; + class SleepImpl; + using SleepImplPtr = boost::intrusive_ptr; + + class MailboxImpl; +} +namespace lmm { +class Element; +class Variable; +class Constraint; +class ConstraintLight; +class System; +} +namespace routing { + class NetPoint; + class NetZoneImpl; +} +} +namespace simix { + class ActorImpl; + using ActorImplPtr = boost::intrusive_ptr; + class Host; + +} +namespace surf { + class Resource; + class Cpu; + class LinkImpl; + class HostImpl; + class StorageImpl; + class StorageType; +} +namespace trace_mgr { + class trace; + class future_evt_set; +} } -typedef simgrid::s4u::As simgrid_As; -typedef simgrid::s4u::Host simgrid_Host; -typedef simgrid::s4u::Mailbox simgrid_Mailbox; -typedef simgrid::simix::Synchro simix_Synchro; -typedef simgrid::surf::Cpu surf_Cpu; -typedef simgrid::surf::NetCard surf_NetCard; -typedef simgrid::surf::Link Link; +typedef simgrid::s4u::Actor s4u_Actor; +typedef simgrid::s4u::Host s4u_Host; +typedef simgrid::s4u::Link s4u_Link; +typedef simgrid::s4u::File s4u_File; +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::kernel::routing::NetPoint routing_NetPoint; typedef simgrid::surf::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::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::Variable* lmm_variable_t; +typedef simgrid::kernel::lmm::Constraint* lmm_constraint_t; +typedef simgrid::kernel::lmm::ConstraintLight* lmm_constraint_light_t; +typedef simgrid::kernel::lmm::System* lmm_system_t; + #else -typedef struct simgrid_As simgrid_As; -typedef struct simgrid_Host simgrid_Host; -typedef struct simgrid_Mailbox simgrid_Mailbox; -typedef struct simix_Synchro simix_Synchro; -typedef struct surf_Cpu surf_Cpu; -typedef struct surf_NetCard surf_NetCard; +typedef struct s4u_Actor s4u_Actor; +typedef struct s4u_Host s4u_Host; +typedef struct s4u_Link s4u_Link; +typedef struct s4u_File s4u_File; +typedef struct s4u_Storage s4u_Storage; +typedef struct s4u_NetZone s4u_NetZone; +typedef struct s4u_VM s4u_VM; +typedef struct kernel_Activity* smx_activity_t; +typedef struct routing_NetPoint routing_NetPoint; typedef struct surf_Resource surf_Resource; -typedef struct Link Link; typedef struct Trace tmgr_Trace; -#endif -typedef simgrid_As *AS_t; -typedef simgrid_Host* sg_host_t; -typedef simgrid_Mailbox* sg_mbox_t; +typedef struct s_smx_context* smx_context_t; +typedef struct s_smx_actor* smx_actor_t; +typedef struct s_smx_mutex* smx_mutex_t; +typedef struct s_smx_mailbox* smx_mailbox_t; +typedef struct s_surf_storage* surf_storage_t; -typedef simix_Synchro *smx_synchro_t; +#endif -typedef surf_Cpu *surf_cpu_t; -typedef surf_NetCard *sg_netcard_t; -typedef surf_Resource *sg_resource_t; +typedef s4u_NetZone* sg_netzone_t; +typedef s4u_Host* sg_host_t; +typedef s4u_Link* sg_link_t; +typedef s4u_Storage* sg_storage_t; +typedef s4u_File* sg_file_t; +typedef s4u_VM* sg_vm_t; -// Types which are in fact dictelmt: -typedef struct s_xbt_dictelm *sg_storage_t; +typedef routing_NetPoint* sg_netpoint_t; +typedef surf_Resource *sg_resource_t; typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ typedef struct s_smx_simcall s_smx_simcall_t; typedef struct s_smx_simcall* smx_simcall_t; -typedef enum { +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_SHARED = 1, + SURF_LINK_FATPIPE = 0 } e_surf_link_sharing_policy_t; -typedef enum { +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_SPEED = 3, SURF_TRACE_CONNECT_KIND_LINK_AVAIL = 2, - SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1, - SURF_TRACE_CONNECT_KIND_LATENCY = 0 + SURF_TRACE_CONNECT_KIND_BANDWIDTH = 1, + SURF_TRACE_CONNECT_KIND_LATENCY = 0 } e_surf_trace_connect_kind_t; -typedef enum { - SURF_PROCESS_ON_FAILURE_DIE = 1, - SURF_PROCESS_ON_FAILURE_RESTART = 0 +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 */ @@ -101,4 +162,6 @@ typedef unsigned long long sg_size_t; */ typedef long long sg_offset_t; -#endif +typedef unsigned long aid_t; + +#endif /* SIMGRID_TYPES_H */