X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d000a773b5ebcd411b28c31de68eeddf804e66b..80eb7f52582553eb31ce81b93f359152499c3091:/include/simgrid/forward.h diff --git a/include/simgrid/forward.h b/include/simgrid/forward.h index ecab7aa6f9..f62fa97a29 100644 --- a/include/simgrid/forward.h +++ b/include/simgrid/forward.h @@ -1,91 +1,139 @@ -/* 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 - -#include +#ifndef SIMGRID_TYPES_H +#define SIMGRID_TYPES_H #ifdef __cplusplus +#include "s4u/forward.hpp" +#include "xbt/base.h" +#include + namespace simgrid { - namespace s4u { - class Host; - } - namespace surf { - class Resource; - class Cpu; - class NetCard; - class As; - class Link; - } - namespace trace_mgr { - 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 RawImpl; + using RawImplPtr = boost::intrusive_ptr; + class SleepImpl; + using SleepImplPtr = boost::intrusive_ptr; + + class MailboxImpl; +} + +namespace routing { + class NetPoint; +} } +namespace simix { + class ActorImpl; + using ActorImplPtr = boost::intrusive_ptr; + class Host; -typedef simgrid::s4u::Host simgrid_Host; -typedef simgrid::surf::As surf_As; -typedef simgrid::surf::Cpu surf_Cpu; -typedef simgrid::surf::NetCard surf_NetCard; -typedef simgrid::surf::Link Link; + class MutexImpl; +} +namespace surf { + class Resource; + class Cpu; + class LinkImpl; + class HostImpl; + class StorageImpl; + class FileImpl; +} +namespace trace_mgr { + class trace; + class future_evt_set; +} +} + +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::future_evt_set sg_future_evt_set; +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::MailboxImpl* smx_mailbox_t; +typedef simgrid::surf::FileImpl* surf_file_t; #else -typedef struct simgrid_Host simgrid_Host; -typedef struct surf_As surf_As; -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 future_evt_set sg_future_evt_set; +typedef struct Trace tmgr_Trace; + +typedef struct s_smx_context* smx_context_t; +typedef struct s_smx_actor* smx_actor_t; + #endif -typedef simgrid_Host* sg_host_t; -typedef surf_As *AS_t; -typedef surf_Cpu *surf_cpu_t; -typedef surf_NetCard *sg_netcard_t; -typedef surf_Resource *sg_resource_t; -typedef sg_future_evt_set *sg_future_evt_set_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 xbt_dictelm_t sg_storage_t; +typedef routing_NetPoint* sg_netpoint_t; +typedef surf_Resource *sg_resource_t; -typedef struct tmgr_trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ +typedef tmgr_Trace *tmgr_trace_t; /**< Opaque structure defining an availability trace */ -typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/ +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_POWER = 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; -typedef enum { - SURF_CLUSTER_FAT_TREE=2, - SURF_CLUSTER_FLAT = 1, - SURF_CLUSTER_TORUS = 0 -} e_surf_cluster_topology_t; - - /** @ingroup m_datatypes_management_details * @brief Type for any simgrid size */ @@ -96,223 +144,6 @@ typedef unsigned long long sg_size_t; */ typedef long long sg_offset_t; -/* - * Platform creation functions. Instead of passing 123 arguments to the creation functions - * (one for each possible XML attribute), we pass structures containing them all. It removes the - * chances of switching arguments by error, and reduce the burden when we add a new attribute: - * old models can just continue to ignore it without having to update their headers. - * - * It shouldn't be too costly at runtime, provided that structures living on the stack are - * used, instead of malloced structures. - */ - -typedef struct { - const char* id; - xbt_dynar_t speed_peak; - int pstate; - int core_amount; - double speed_scale; - tmgr_trace_t speed_trace; - int initiallyOn; - tmgr_trace_t state_trace; - const char* coord; - xbt_dict_t properties; -} s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t; - -#define SG_PLATF_HOST_INITIALIZER { \ - NULL, 0, 1, 1, 1., NULL, 1/*ON*/, NULL, \ - NULL, NULL \ -} - -typedef struct { - const char* id; - const char* link_up; - const char* link_down; -} s_sg_platf_host_link_cbarg_t, *sg_platf_host_link_cbarg_t; - -#define SG_PLATF_HOST_LINK_INITIALIZER {NULL,NULL,NULL} - -typedef struct { - const char* id; - const char* coord; -} s_sg_platf_router_cbarg_t, *sg_platf_router_cbarg_t; - -#define SG_PLATF_ROUTER_INITIALIZER {NULL,NULL} - -typedef struct { - const char* id; - double bandwidth; - tmgr_trace_t bandwidth_trace; - double latency; - tmgr_trace_t latency_trace; - int initiallyOn; - tmgr_trace_t state_trace; - e_surf_link_sharing_policy_t policy; - xbt_dict_t properties; -} s_sg_platf_link_cbarg_t, *sg_platf_link_cbarg_t; - -#define SG_PLATF_LINK_INITIALIZER {\ - NULL, 0., NULL, 0., NULL, 1/*ON*/, \ - NULL, SURF_LINK_SHARED, NULL \ -} +typedef unsigned long aid_t; -typedef struct s_sg_platf_peer_cbarg *sg_platf_peer_cbarg_t; -typedef struct s_sg_platf_peer_cbarg { - const char* id; - double speed; - double bw_in; - double bw_out; - double lat; - const char* coord; - tmgr_trace_t availability_trace; - tmgr_trace_t state_trace; -} s_sg_platf_peer_cbarg_t; - -#define SG_PLATF_PEER_INITIALIZER {NULL,0.0,0.0,0.0,0.0,NULL,NULL,NULL} - -typedef struct s_sg_platf_route_cbarg *sg_platf_route_cbarg_t; -typedef struct s_sg_platf_route_cbarg { - int symmetrical; - const char *src; - const char *dst; - sg_netcard_t gw_src; - sg_netcard_t gw_dst; - xbt_dynar_t link_list; -} s_sg_platf_route_cbarg_t; - -#define SG_PLATF_ROUTE_INITIALIZER {1,NULL,NULL,NULL,NULL,NULL} - -typedef struct s_sg_platf_cluster_cbarg *sg_platf_cluster_cbarg_t; -typedef struct s_sg_platf_cluster_cbarg { - const char* id; - const char* prefix; - const char* suffix; - const char* radical; - double speed; - int core_amount; - double bw; - double lat; - double bb_bw; - double bb_lat; - double loopback_bw; - double loopback_lat; - double limiter_link; - e_surf_cluster_topology_t topology; - const char* topo_parameters; - xbt_dict_t properties; - const char* router_id; - e_surf_link_sharing_policy_t sharing_policy; - e_surf_link_sharing_policy_t bb_sharing_policy; - const char* availability_trace; //don't convert to tmgr_trace_t since there is a trace per host and some rewriting is needed - const char* state_trace; -} s_sg_platf_cluster_cbarg_t; - -#define SG_PLATF_CLUSTER_INITIALIZER {NULL,NULL,NULL,NULL,0.0,1 \ - ,1.,1.,0.,0.,0.,0.,0. \ - ,SURF_CLUSTER_FLAT,NULL,NULL,NULL, \ - SURF_LINK_SHARED,SURF_LINK_SHARED,NULL \ - ,NULL} - -typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t; -typedef struct s_sg_platf_cabinet_cbarg { - const char* id; - const char* prefix; - const char* suffix; - const char* radical; - double speed; - double bw; - double lat; -} s_sg_platf_cabinet_cbarg_t; - -#define SG_PLATF_CABINET_INITIALIZER {NULL,NULL,NULL,NULL,0.0,0.0,0.0} - -typedef struct { - const char* id; - const char* type_id; - const char* content; - const char* content_type; - xbt_dict_t properties; - const char* attach; -} s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; - -#define SG_PLATF_STORAGE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL} - -typedef struct { - const char* id; - const char* model; - const char* content; - const char* content_type; - xbt_dict_t properties; - xbt_dict_t model_properties; - sg_size_t size; -} s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; - -#define SG_PLATF_STORAGE_TYPE_INITIALIZER {NULL,NULL,NULL,NULL,NULL,NULL} - -typedef struct { - const char* type_id; - const char* name; -} s_sg_platf_mstorage_cbarg_t, *sg_platf_mstorage_cbarg_t; - -#define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL} - -typedef struct { - const char* storageId; - const char* name; -} s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t; - -#define SG_PLATF_MOUNT_INITIALIZER {NULL,NULL} - -typedef struct s_sg_platf_prop_cbarg *sg_platf_prop_cbarg_t; -typedef struct s_sg_platf_prop_cbarg { - const char *id; - const char *value; -} s_sg_platf_prop_cbarg_t; - -#define SG_PLATF_PROP_INITIALIZER {NULL,NULL} - -typedef struct s_sg_platf_trace_cbarg *sg_platf_trace_cbarg_t; -typedef struct s_sg_platf_trace_cbarg { - const char *id; - const char *file; - double periodicity; - const char *pc_data; -} s_sg_platf_trace_cbarg_t; - -#define SG_PLATF_TRACE_INITIALIZER {NULL,NULL,0.0,NULL} - -typedef struct s_sg_platf_trace_connect_cbarg *sg_platf_trace_connect_cbarg_t; -typedef struct s_sg_platf_trace_connect_cbarg { - e_surf_trace_connect_kind_t kind; - const char *trace; - const char *element; -} s_sg_platf_trace_connect_cbarg_t; - -#define SG_PLATF_TRACE_CONNECT_INITIALIZER {SURF_TRACE_CONNECT_KIND_LATENCY,NULL,NULL} - -typedef struct s_sg_platf_process_cbarg *sg_platf_process_cbarg_t; -typedef struct s_sg_platf_process_cbarg { - const char **argv; - int argc; - xbt_dict_t properties; - const char *host; - const char *function; - double start_time; - double kill_time; - e_surf_process_on_failure_t on_failure; -} s_sg_platf_process_cbarg_t; - -#define SG_PLATF_PROCESS_INITIALIZER {NULL,0,NULL,NULL,NULL,-1.0,-1.0,SURF_PROCESS_ON_FAILURE_DIE} - -typedef struct s_sg_platf_AS_cbarg *sg_platf_AS_cbarg_t; -typedef struct s_sg_platf_AS_cbarg { - const char *id; - int routing; -} s_sg_platf_AS_cbarg_t; - -#define SG_PLATF_AS_INITIALIZER {NULL,0} - -/** opaque structure defining a event generator for availability based on a probability distribution */ -typedef struct probabilist_event_generator *probabilist_event_generator_t; - -#endif +#endif /* SIMGRID_TYPES_H */