-/* 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. */
namespace s4u {
class Activity;
+
class Actor;
-using ActorPtr = boost::intrusive_ptr<Actor>;
+/** Smart pointer to a simgrid::s4u::Actor */
+typedef boost::intrusive_ptr<Actor> ActorPtr;
XBT_PUBLIC void intrusive_ptr_release(Actor* actor);
XBT_PUBLIC void intrusive_ptr_add_ref(Actor* actor);
+
+class Barrier;
+/** Smart pointer to a simgrid::s4u::Barrier */
+typedef boost::intrusive_ptr<Barrier> BarrierPtr;
+XBT_PUBLIC void intrusive_ptr_release(Barrier* m);
+XBT_PUBLIC void intrusive_ptr_add_ref(Barrier* m);
+
class Comm;
-using CommPtr = boost::intrusive_ptr<Comm>;
+/** Smart pointer to a simgrid::s4u::Comm */
+typedef boost::intrusive_ptr<Comm> CommPtr;
XBT_PUBLIC void intrusive_ptr_release(Comm* c);
XBT_PUBLIC void intrusive_ptr_add_ref(Comm* c);
+
+class ConditionVariable;
+/** Smart pointer to a simgrid::s4u::ConditionVariable */
+typedef boost::intrusive_ptr<ConditionVariable> ConditionVariablePtr;
+XBT_PUBLIC void intrusive_ptr_release(ConditionVariable* c);
+XBT_PUBLIC void intrusive_ptr_add_ref(ConditionVariable* c);
+
class Engine;
+
class Exec;
-using ExecPtr = boost::intrusive_ptr<Exec>;
+/** Smart pointer to a simgrid::s4u::Exec */
+typedef boost::intrusive_ptr<Exec> ExecPtr;
XBT_PUBLIC void intrusive_ptr_release(Exec* e);
XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
+class ExecSeq;
+typedef boost::intrusive_ptr<ExecSeq> ExecSeqPtr;
+class ExecPar;
+typedef boost::intrusive_ptr<ExecPar> ExecParPtr;
+
class Host;
+
+class Io;
+/** Smart pointer to a simgrid::s4u::Io */
+typedef boost::intrusive_ptr<Io> IoPtr;
+XBT_PUBLIC void intrusive_ptr_release(Io* i);
+XBT_PUBLIC void intrusive_ptr_add_ref(Io* i);
+
class Link;
+
class Mailbox;
-using MailboxPtr = boost::intrusive_ptr<Mailbox>;
-XBT_PUBLIC void intrusive_ptr_release(Mailbox* m);
-XBT_PUBLIC void intrusive_ptr_add_ref(Mailbox* m);
+
class Mutex;
XBT_PUBLIC void intrusive_ptr_release(Mutex* m);
XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* m);
+/** Smart pointer to a simgrid::s4u::Mutex */
+typedef boost::intrusive_ptr<Mutex> MutexPtr;
+
class NetZone;
class VirtualMachine;
class File;
+
+class Semaphore;
+/** Smart pointer to a simgrid::s4u::Semaphore */
+typedef boost::intrusive_ptr<Semaphore> SemaphorePtr;
+XBT_PUBLIC void intrusive_ptr_release(Semaphore* m);
+XBT_PUBLIC void intrusive_ptr_add_ref(Semaphore* m);
+
class Storage;
} // namespace s4u
class EngineImpl;
namespace actor {
class ActorImpl;
-using ActorImplPtr = boost::intrusive_ptr<ActorImpl>;
+typedef boost::intrusive_ptr<ActorImpl> ActorImplPtr;
} // namespace actor
namespace activity {
class ActivityImpl;
- using ActivityImplPtr = boost::intrusive_ptr<ActivityImpl>;
+ typedef boost::intrusive_ptr<ActivityImpl> ActivityImplPtr;
XBT_PUBLIC void intrusive_ptr_add_ref(ActivityImpl* activity);
XBT_PUBLIC void intrusive_ptr_release(ActivityImpl* activity);
class ConditionVariableImpl;
class CommImpl;
- using CommImplPtr = boost::intrusive_ptr<CommImpl>;
+ typedef boost::intrusive_ptr<CommImpl> CommImplPtr;
class ExecImpl;
- using ExecImplPtr = boost::intrusive_ptr<ExecImpl>;
+ typedef boost::intrusive_ptr<ExecImpl> ExecImplPtr;
class IoImpl;
- using IoImplPtr = boost::intrusive_ptr<IoImpl>;
+ typedef boost::intrusive_ptr<IoImpl> IoImplPtr;
class MutexImpl;
- using MutexImplPtr = boost::intrusive_ptr<MutexImpl>;
+ typedef boost::intrusive_ptr<MutexImpl> MutexImplPtr;
class RawImpl;
- using RawImplPtr = boost::intrusive_ptr<RawImpl>;
+ typedef boost::intrusive_ptr<RawImpl> RawImplPtr;
+ class SemaphoreImpl;
+ typedef boost::intrusive_ptr<SemaphoreImpl> SemaphoreImplPtr;
class SleepImpl;
- using SleepImplPtr = boost::intrusive_ptr<SleepImpl>;
+ typedef boost::intrusive_ptr<SleepImpl> SleepImplPtr;
class MailboxImpl;
}
}
namespace resource {
class Action;
+class Cpu;
class Model;
class Resource;
-class TraceEvent;
+class CpuModel;
+class NetworkModel;
class LinkImpl;
class NetworkAction;
+class StorageImpl;
+class StorageType;
+class StorageModel;
}
namespace routing {
class ClusterCreationArgs;
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;
- class CpuModel;
class HostImpl;
class HostModel;
- class StorageImpl;
- class StorageType;
- class StorageModel;
}
-namespace trace_mgr {
- class trace;
- class future_evt_set;
+namespace mc {
+class CommunicationDeterminismChecker;
}
namespace vm {
class VMModel;
} // namespace simgrid
typedef simgrid::s4u::Actor s4u_Actor;
+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<simgrid::kernel::activity::ActivityImpl> smx_activity_t;
-typedef simgrid::trace_mgr::trace* tmgr_trace_t;
-typedef simgrid::kernel::context::Context* smx_context_t;
+typedef simgrid::simix::Timer* smx_timer_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::surf::StorageImpl* surf_storage_t;
+typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t;
+typedef simgrid::kernel::activity::SemaphoreImpl* smx_sem_t;
#else
typedef struct s4u_Actor s4u_Actor;
+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;
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_mailbox* smx_mailbox_t;
-typedef struct s_surf_storage* surf_storage_t;
+typedef struct s_smx_mutex* smx_mutex_t;
+typedef struct s_smx_sem* smx_sem_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;
*/
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 */
