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
Merge branch 'fix-wakeup-tree-iterator' into 'master'
[simgrid.git]
/
src
/
mc
/
transition
/
TransitionComm.hpp
diff --git
a/src/mc/transition/TransitionComm.hpp
b/src/mc/transition/TransitionComm.hpp
index
5a8a1e6
..
cf51c18
100644
(file)
--- a/
src/mc/transition/TransitionComm.hpp
+++ b/
src/mc/transition/TransitionComm.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2015-202
2
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-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. */
@@
-21,10
+21,10
@@
class CommTestTransition;
class CommWaitTransition : public Transition {
bool timeout_;
class CommWaitTransition : public Transition {
bool timeout_;
- uintptr_t comm_;
+ unsigned comm_;
+ unsigned mbox_;
aid_t sender_;
aid_t receiver_;
aid_t sender_;
aid_t receiver_;
- unsigned mbox_;
uintptr_t sbuff_;
uintptr_t rbuff_;
size_t size_;
uintptr_t sbuff_;
uintptr_t rbuff_;
size_t size_;
@@
-33,13
+33,15
@@
class CommWaitTransition : public Transition {
friend CommTestTransition;
public:
friend CommTestTransition;
public:
+ CommWaitTransition(aid_t issuer, int times_considered, bool timeout_, unsigned comm_, aid_t sender_, aid_t receiver_,
+ unsigned mbox_, uintptr_t sbuff_, uintptr_t rbuff_, size_t size_);
CommWaitTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
bool get_timeout() const { return timeout_; }
CommWaitTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
bool get_timeout() const { return timeout_; }
- /**
Address of the corresponding Communication object in the applicatio
n */
- u
intptr_t
get_comm() const { return comm_; }
+ /**
ID of the corresponding Communication object in the application, or 0 if unknow
n */
+ u
nsigned
get_comm() const { return comm_; }
/** Sender ID */
aid_t get_sender() const { return sender_; }
/** Receiver ID */
/** Sender ID */
aid_t get_sender() const { return sender_; }
/** Receiver ID */
@@
-54,10
+56,10
@@
public:
size_t get_size() const { return size_; }
};
class CommTestTransition : public Transition {
size_t get_size() const { return size_; }
};
class CommTestTransition : public Transition {
- uintptr_t comm_;
+ unsigned comm_;
+ unsigned mbox_;
aid_t sender_;
aid_t receiver_;
aid_t sender_;
aid_t receiver_;
- unsigned mbox_;
uintptr_t sbuff_;
uintptr_t rbuff_;
size_t size_;
uintptr_t sbuff_;
uintptr_t rbuff_;
size_t size_;
@@
-65,12
+67,14
@@
class CommTestTransition : public Transition {
friend CommRecvTransition;
public:
friend CommRecvTransition;
public:
+ CommTestTransition(aid_t issuer, int times_considered, unsigned comm_, aid_t sender_, aid_t receiver_, unsigned mbox_,
+ uintptr_t sbuff_, uintptr_t rbuff_, size_t size_);
CommTestTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
CommTestTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
- /**
Address of the corresponding Communication object in the applicatio
n */
- u
intptr_t
get_comm() const { return comm_; }
+ /**
ID of the corresponding Communication object in the application, or 0 if unknow
n */
+ u
nsigned
get_comm() const { return comm_; }
/** Sender ID */
aid_t get_sender() const { return sender_; }
/** Receiver ID */
/** Sender ID */
aid_t get_sender() const { return sender_; }
/** Receiver ID */
@@
-86,18
+90,19
@@
public:
};
class CommRecvTransition : public Transition {
};
class CommRecvTransition : public Transition {
- u
intptr_t comm_; /* Addr of the CommImpl
*/
+ u
nsigned comm_; /* ID of the CommImpl or 0 if not known
*/
unsigned mbox_;
uintptr_t rbuff_;
int tag_;
public:
unsigned mbox_;
uintptr_t rbuff_;
int tag_;
public:
+ CommRecvTransition(aid_t issuer, int times_considered, unsigned comm_, unsigned mbox_, uintptr_t rbuff_, int tag_);
CommRecvTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
CommRecvTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
- /**
Address of the corresponding Communication object in the application
*/
- u
intptr_t
get_comm() const { return comm_; }
+ /**
ID of the corresponding Communication object in the application (or 0 if unknown)
*/
+ u
nsigned
get_comm() const { return comm_; }
/** Mailbox ID */
unsigned get_mailbox() const { return mbox_; }
/** Receiver buffer */
/** Mailbox ID */
unsigned get_mailbox() const { return mbox_; }
/** Receiver buffer */
@@
-107,19
+112,21
@@
public:
};
class CommSendTransition : public Transition {
};
class CommSendTransition : public Transition {
- u
intptr_t comm_; /* Addr of the CommImpl */
+ u
nsigned comm_;
unsigned mbox_;
uintptr_t sbuff_;
size_t size_;
int tag_;
public:
unsigned mbox_;
uintptr_t sbuff_;
size_t size_;
int tag_;
public:
+ CommSendTransition(aid_t issuer, int times_considered, unsigned comm_, unsigned mbox_, uintptr_t sbuff_, size_t size_,
+ int tag_);
CommSendTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
CommSendTransition(aid_t issuer, int times_considered, std::stringstream& stream);
std::string to_string(bool verbose) const override;
bool depends(const Transition* other) const override;
- /**
Address of the corresponding Communication object in the applicatio
n */
- u
intptr_t
get_comm() const { return comm_; }
+ /**
ID of the corresponding Communication object in the application, or 0 if unknow
n */
+ u
nsigned
get_comm() const { return comm_; }
/** Mailbox ID */
unsigned get_mailbox() const { return mbox_; }
/** Sender buffer */
/** Mailbox ID */
unsigned get_mailbox() const { return mbox_; }
/** Sender buffer */