Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TTool
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mbe-tools
TTool
Merge requests
!233
Daemon3
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Daemon3
daemon3
into
master
Overview
0
Commits
2
Pipelines
0
Changes
1
Merged
Siyuan Niu
requested to merge
daemon3
into
master
5 years ago
Overview
0
Commits
2
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Viewing commit
6990cf08
Prev
Next
Show latest version
1 file
+
0
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
6990cf08
daemon task change2
· 6990cf08
Siyuan Niu
authored
5 years ago
simulators/c++2/src_simulator/sim/Simulator.cpp
+
4
−
4
Options
@@ -858,10 +858,8 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
if
(
transLET
!=
0
&&
transLET
->
getCommand
()
->
getTask
()
->
getIsDaemon
()
==
true
){
if
(
transLET
->
getStartTime
()
>=
deviceLET
->
getSimulatedTime
()){
// std::cout<<"bigger time"<<std::endl;
bool
isFinish
=
true
;
if
(
_simComp
->
getNonDaemonTaskList
().
empty
())
isFinish
=
false
;
break
;
for
(
TaskList
::
const_iterator
i
=
_simComp
->
getNonDaemonTaskList
().
begin
();
i
!=
_simComp
->
getNonDaemonTaskList
().
end
();
++
i
){
// std::cout<<"non dameon task"<<(*i)->toString()<<" state is "<<(*i)->getState()<<(*i)->getCurrCommand()->toString()<<std::endl;
if
((
*
i
)
->
getState
()
!=
3
){
@@ -1011,8 +1009,10 @@ bool Simulator::simulate(TMLTransaction*& oLastTrans){
}
bool
aSimCompleted
=
(
transLET
==
0
&&
!
_simComp
->
getStoppedOnAction
());
if
(
isFinish
==
true
)
if
(
isFinish
==
true
){
// std::cout<<"terminated!!!"<<std::endl;
aSimCompleted
=
true
;
}
if
(
aSimCompleted
){
#ifdef LISTENERS_ENABLED
Loading