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 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_state.h
diff --git
a/src/mc/mc_state.h
b/src/mc/mc_state.h
index
9ee934f
..
6955b68
100644
(file)
--- a/
src/mc/mc_state.h
+++ b/
src/mc/mc_state.h
@@
-70,45
+70,45
@@
struct PatternCommunication {
};
};
-/* On every state, each process has an entry of the following type */
+/* On every state, each process has an entry of the following type.
+ * This represents both the process and its transition because
+ * a process cannot have more than one enabled transition at a given time.
+ */
class ProcessState {
class ProcessState {
- /* Possible exploration status of a process in a state */
+ /* Possible exploration status of a process transition in a state.
+ * Either the checker did not consider the transition, or it was considered and to do, or considered and done.
+ */
enum class InterleavingType {
enum class InterleavingType {
- /**
We do not have to execute this process transitions
*/
+ /**
This process transition is not considered by the checker (yet?)
*/
disabled = 0,
disabled = 0,
- /**
We still have to execute (some of) this process transitions
*/
-
interleave
,
- /**
We have already executed this process transitions
*/
+ /**
The checker algorithm decided that this process transitions should be done at some point
*/
+
todo
,
+ /**
The checker algorithm decided that this should be done, but it was done in the meanwhile
*/
done,
};
/** Exploration control information */
InterleavingType state = InterleavingType::disabled;
public:
done,
};
/** Exploration control information */
InterleavingType state = InterleavingType::disabled;
public:
-
- /** Number of times that the process was interleaved */
+ /** Number of times that the process was considered to be executed */
// TODO, make this private
// TODO, make this private
- unsigned int
interleave_count
= 0;
+ unsigned int
times_considered
= 0;
- bool isDisabled() const
- {
+ bool isDisabled() const {
return this->state == InterleavingType::disabled;
}
return this->state == InterleavingType::disabled;
}
- bool isDone() const
- {
+ bool isDone() const {
return this->state == InterleavingType::done;
}
return this->state == InterleavingType::done;
}
- bool isToInterleave() const
- {
- return this->state == InterleavingType::interleave;
+ bool isTodo() const {
+ return this->state == InterleavingType::todo;
}
}
- void interleave()
- {
- this->state
= InterleavingType::interleave
;
- this->
interleave_count
= 0;
+ /** Mark that we should try executing this process at some point in the future of the checker algorithm */
+
void consider()
{
+ this->state
= InterleavingType::todo
;
+ this->
times_considered
= 0;
}
}
- void setDone()
- {
+ void setDone() {
this->state = InterleavingType::done;
}
};
this->state = InterleavingType::done;
}
};
@@
-121,7
+121,7
@@
struct XBT_PRIVATE State {
int num = 0;
/** State's exploration status by process */
int num = 0;
/** State's exploration status by process */
- std::vector<ProcessState>
process
States;
+ std::vector<ProcessState>
actor
States;
Transition transition;
Transition transition;
@@
-148,8
+148,8
@@
struct XBT_PRIVATE State {
State(unsigned long state_number);
std::size_t interleaveSize() const;
State(unsigned long state_number);
std::size_t interleaveSize() const;
- void interleave(smx_actor_t
process
) {
- this->
processStates[process->pid].interleave
();
+ void interleave(smx_actor_t
actor
) {
+ this->
actorStates[actor->pid].consider
();
}
Transition getTransition() const;
};
}
Transition getTransition() const;
};