Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tapasco
tapasco
Commits
6ea82dc4
Commit
6ea82dc4
authored
Jan 16, 2018
by
Jens Korinth
Browse files
Closes
#137
- TaPaSCo is stuck after all jobs finished in verbose mode
parent
961d9bc6
Pipeline
#91
passed with stage
in 3 minutes and 27 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/main/scala/tapasco/activity/composers/VivadoComposer.scala
View file @
6ea82dc4
...
@@ -83,6 +83,7 @@ class VivadoComposer()(implicit cfg: Configuration) extends Composer {
...
@@ -83,6 +83,7 @@ class VivadoComposer()(implicit cfg: Configuration) extends Composer {
stdoutString
=>
logger
.
trace
(
"Vivado: {}"
,
stdoutString
),
stdoutString
=>
logger
.
trace
(
"Vivado: {}"
,
stdoutString
),
stderrString
=>
logger
.
trace
(
"Vivado ERR: {}"
,
stderrString
)
stderrString
=>
logger
.
trace
(
"Vivado ERR: {}"
,
stderrString
)
))
))
lt
.
closeAll
// check retcode
// check retcode
if
(
r
==
InterruptibleProcess
.
TIMEOUT_RETCODE
)
{
if
(
r
==
InterruptibleProcess
.
TIMEOUT_RETCODE
)
{
...
...
src/main/scala/tapasco/filemgmt/MultiFileWatcher.scala
View file @
6ea82dc4
...
@@ -104,6 +104,7 @@ class MultiFileWatcher(pollInterval: Int = MultiFileWatcher.POLL_INTERVAL) exten
...
@@ -104,6 +104,7 @@ class MultiFileWatcher(pollInterval: Int = MultiFileWatcher.POLL_INTERVAL) exten
def
run
()
{
def
run
()
{
try
{
try
{
while
(!
_files
.
isEmpty
||
!
_waitingFor
.
isEmpty
)
{
while
(!
_files
.
isEmpty
||
!
_waitingFor
.
isEmpty
)
{
Thread
.
sleep
(
pollInterval
)
val
waits
=
_waitingFor
.
synchronized
{
_waitingFor
.
toList
}
val
waits
=
_waitingFor
.
synchronized
{
_waitingFor
.
toList
}
waits
foreach
{
p
=>
waits
foreach
{
p
=>
logger
.
trace
(
"waiting for {}"
,
p
)
logger
.
trace
(
"waiting for {}"
,
p
)
...
@@ -117,7 +118,6 @@ class MultiFileWatcher(pollInterval: Int = MultiFileWatcher.POLL_INTERVAL) exten
...
@@ -117,7 +118,6 @@ class MultiFileWatcher(pollInterval: Int = MultiFileWatcher.POLL_INTERVAL) exten
publish
(
LinesAdded
(
p
,
lines
))
publish
(
LinesAdded
(
p
,
lines
))
}
}
}
}
Thread
.
sleep
(
pollInterval
)
}
}
_watchThread
.
set
(
None
)
_watchThread
.
set
(
None
)
}
catch
{
case
e
:
InterruptedException
=>
_watchThread
.
set
(
None
)
}
}
catch
{
case
e
:
InterruptedException
=>
_watchThread
.
set
(
None
)
}
...
...
src/main/scala/tapasco/task/ResourceMonitor.scala
View file @
6ea82dc4
...
@@ -56,8 +56,8 @@ private class DefaultResourceMonitor extends ResourceMonitor {
...
@@ -56,8 +56,8 @@ private class DefaultResourceMonitor extends ResourceMonitor {
!
((
cons
fold
ResourceConsumer
.
NullConsumer
)
(
_
+
_
)
usesMoreThan
_available
)
!
((
cons
fold
ResourceConsumer
.
NullConsumer
)
(
_
+
_
)
usesMoreThan
_available
)
}
}
def
doStart
(
t
:
ResourceConsumer
)
:
Unit
=
if
(
canStart
(
t
))
_cons
+=
t
def
doStart
(
t
:
ResourceConsumer
)
:
Unit
=
if
(
canStart
(
t
))
_cons
.
synchronized
{
_cons
+=
t
}
def
didFinish
(
t
:
ResourceConsumer
)
:
Unit
=
_cons
-=
t
def
didFinish
(
t
:
ResourceConsumer
)
:
Unit
=
_cons
.
synchronized
{
_cons
-=
t
}
def
canStart
(
t
:
ResourceConsumer
)
:
Boolean
=
Slurm
.
enabled
||
(
t
.
canStart
&&
check
(
_cons
+
t
))
def
canStart
(
t
:
ResourceConsumer
)
:
Boolean
=
Slurm
.
enabled
||
(
t
.
canStart
&&
check
(
_cons
+
t
))
def
status
:
String
=
"%d active consumers, %d/%d CPUs, %1.1f/%1.1f GiB RAM, %d total licences in use"
.
format
(
def
status
:
String
=
"%d active consumers, %d/%d CPUs, %1.1f/%1.1f GiB RAM, %d total licences in use"
.
format
(
_cons
.
size
,
current
.
cpus
,
_cpus
,
_cons
.
size
,
current
.
cpus
,
_cpus
,
...
...
Jens Korinth
@jk
mentioned in commit
17f0d672
·
Mar 05, 2018
mentioned in commit
17f0d672
mentioned in commit 17f0d67240ebf5d7e1d0be9162d272b04256c47d
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment