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
Respect member order according to the initialisation order
[simgrid.git]
/
src
/
kernel
/
actor
/
ActorImpl.hpp
diff --git
a/src/kernel/actor/ActorImpl.hpp
b/src/kernel/actor/ActorImpl.hpp
index 044bbf5cd0fe943d0cad064a2c8dbcb2ea17808c..69741aceee503bf8cda2259dfe479ea86977771f 100644
(file)
--- a/
src/kernel/actor/ActorImpl.hpp
+++ b/
src/kernel/actor/ActorImpl.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
@@
-17,6
+17,8
@@
#include <functional>
#include <list>
#include <map>
#include <functional>
#include <list>
#include <map>
+#include <set>
+#include <unordered_set>
#include <memory>
namespace simgrid::kernel::actor {
#include <memory>
namespace simgrid::kernel::actor {
@@
-38,8
+40,6
@@
public:
aid_t get_ppid() const { return ppid_; }
static unsigned long get_maxpid() { return maxpid_; }
aid_t get_ppid() const { return ppid_; }
static unsigned long get_maxpid() { return maxpid_; }
- // In MC mode, the application sends this pointer to the MC
- static unsigned long* get_maxpid_addr() { return &maxpid_; }
};
/*------------------------- [ ActorRestartingTrait ] -------------------------*/
};
/*------------------------- [ ActorRestartingTrait ] -------------------------*/
@@
-67,7
+67,7
@@
class XBT_PUBLIC ActorImpl : public xbt::PropertyHolder, public ActorIDTrait, pu
friend activity::MailboxImpl;
public:
friend activity::MailboxImpl;
public:
- ActorImpl(
std::string
name, s4u::Host* host, aid_t ppid);
+ ActorImpl(
const std::string&
name, s4u::Host* host, aid_t ppid);
ActorImpl(const ActorImpl&) = delete;
ActorImpl& operator=(const ActorImpl&) = delete;
~ActorImpl();
ActorImpl(const ActorImpl&) = delete;
ActorImpl& operator=(const ActorImpl&) = delete;
~ActorImpl();
@@
-105,7
+105,7
@@
public:
bool suspended_ = false;
activity::ActivityImplPtr waiting_synchro_ = nullptr; /* the current blocking synchro if any */
bool suspended_ = false;
activity::ActivityImplPtr waiting_synchro_ = nullptr; /* the current blocking synchro if any */
- std::
lis
t<activity::ActivityImplPtr> activities_; /* the current non-blocking synchros */
+ std::
se
t<activity::ActivityImplPtr> activities_; /* the current non-blocking synchros */
Simcall simcall_;
/* list of functions executed when the actor dies */
std::shared_ptr<std::vector<std::function<void(bool)>>> on_exit =
Simcall simcall_;
/* list of functions executed when the actor dies */
std::shared_ptr<std::vector<std::function<void(bool)>>> on_exit =