A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add sorting to project description
[simgrid.git]
/
include
/
simgrid
/
forward.h
diff --git
a/include/simgrid/forward.h
b/include/simgrid/forward.h
index
4da6084
..
233d185
100644
(file)
--- a/
include/simgrid/forward.h
+++ b/
include/simgrid/forward.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2004-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
9
. 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. */
/* 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. */
@@
-48,6
+48,10
@@
class Exec;
typedef boost::intrusive_ptr<Exec> ExecPtr;
XBT_PUBLIC void intrusive_ptr_release(Exec* e);
XBT_PUBLIC void intrusive_ptr_add_ref(Exec* e);
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 Host;
@@
-60,10
+64,6
@@
XBT_PUBLIC void intrusive_ptr_add_ref(Io* i);
class Link;
class Mailbox;
class Link;
class Mailbox;
-/** Smart pointer to a simgrid::s4u::Mailbox */
-typedef boost::intrusive_ptr<Mailbox> MailboxPtr;
-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);
class Mutex;
XBT_PUBLIC void intrusive_ptr_release(Mutex* m);
@@
-113,6
+113,8
@@
namespace activity {
typedef boost::intrusive_ptr<MutexImpl> MutexImplPtr;
class RawImpl;
typedef boost::intrusive_ptr<RawImpl> RawImplPtr;
typedef boost::intrusive_ptr<MutexImpl> MutexImplPtr;
class RawImpl;
typedef boost::intrusive_ptr<RawImpl> RawImplPtr;
+ class SemaphoreImpl;
+ typedef boost::intrusive_ptr<SemaphoreImpl> SemaphoreImplPtr;
class SleepImpl;
typedef boost::intrusive_ptr<SleepImpl> SleepImplPtr;
class SleepImpl;
typedef boost::intrusive_ptr<SleepImpl> SleepImplPtr;
@@
-131,12
+133,16
@@
class System;
}
namespace resource {
class Action;
}
namespace resource {
class Action;
+class Cpu;
class Model;
class Resource;
class Model;
class Resource;
+class CpuModel;
class NetworkModel;
class NetworkModel;
-class TraceEvent;
class LinkImpl;
class NetworkAction;
class LinkImpl;
class NetworkAction;
+class StorageImpl;
+class StorageType;
+class StorageModel;
}
namespace routing {
class ClusterCreationArgs;
}
namespace routing {
class ClusterCreationArgs;
@@
-145,26
+151,23
@@
class NetPoint;
class NetZoneImpl;
class RouteCreationArgs;
}
class NetZoneImpl;
class RouteCreationArgs;
}
+namespace profile {
+class Event;
+class FutureEvtSet;
+class Profile;
+} // namespace profile
} // namespace kernel
namespace simix {
class Host;
} // namespace kernel
namespace simix {
class Host;
+ class Timer;
}
namespace surf {
}
namespace surf {
- class Cpu;
- class CpuModel;
class HostImpl;
class HostModel;
class HostImpl;
class HostModel;
- class StorageImpl;
- class StorageType;
- class StorageModel;
}
namespace mc {
class CommunicationDeterminismChecker;
}
}
namespace mc {
class CommunicationDeterminismChecker;
}
-namespace trace_mgr {
- class trace;
- class future_evt_set;
-}
namespace vm {
class VMModel;
class VirtualMachineImpl;
namespace vm {
class VMModel;
class VirtualMachineImpl;
@@
-181,13
+184,13
@@
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::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::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::MailboxImpl* smx_mailbox_t;
+typedef simgrid::kernel::activity::MutexImpl* smx_mutex_t;
+typedef simgrid::kernel::activity::SemaphoreImpl* smx_sem_t;
#else
#else
@@
-202,11
+205,12
@@
typedef struct s4u_NetZone s4u_NetZone;
typedef struct s4u_VM s4u_VM;
typedef struct kernel_Activity* smx_activity_t;
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_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_smx_mailbox* smx_mailbox_t;
+typedef struct s_smx_mutex* smx_mutex_t;
+typedef struct s_smx_sem* smx_sem_t;
#endif
#endif
@@
-232,6
+236,7
@@
typedef unsigned long long sg_size_t;
*/
typedef long long sg_offset_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 */
typedef long aid_t;
#endif /* SIMGRID_TYPES_H */