mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-10 06:14:22 +00:00
tasks: show resources
This commit is contained in:
+4
-4
@@ -67,7 +67,7 @@ func (list *List) consumer() {
|
||||
task.processReturnValue = retValue
|
||||
}
|
||||
|
||||
list.usedResources.Free(task.resources)
|
||||
list.usedResources.Free(task.Resources)
|
||||
|
||||
task.wgTask.Done()
|
||||
list.wg.Done()
|
||||
@@ -76,9 +76,9 @@ func (list *List) consumer() {
|
||||
for _, t := range list.tasks {
|
||||
if t.State == IDLE {
|
||||
// check resources
|
||||
blockingTasks := list.usedResources.UsedBy(t.resources)
|
||||
blockingTasks := list.usedResources.UsedBy(t.Resources)
|
||||
if len(blockingTasks) == 0 {
|
||||
list.usedResources.MarkInUse(t.resources, t)
|
||||
list.usedResources.MarkInUse(t.Resources, t)
|
||||
// unlock list since queueing may block
|
||||
list.Unlock()
|
||||
unlocked = true
|
||||
@@ -219,7 +219,7 @@ func (list *List) RunTaskInBackground(name string, resources []string, process P
|
||||
// if not, task will be queued by the consumer once resources are available
|
||||
tasks := list.usedResources.UsedBy(resources)
|
||||
if len(tasks) == 0 {
|
||||
list.usedResources.MarkInUse(task.resources, task)
|
||||
list.usedResources.MarkInUse(task.Resources, task)
|
||||
// queueing task might block if channel not ready, unlock list before queueing
|
||||
list.Unlock()
|
||||
list.queue <- task
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ type Task struct {
|
||||
Name string
|
||||
ID int
|
||||
State State
|
||||
resources []string
|
||||
Resources []string
|
||||
wgTask *sync.WaitGroup
|
||||
}
|
||||
|
||||
@@ -65,7 +65,7 @@ func NewTask(process Process, name string, ID int, resources []string, wgTask *s
|
||||
Name: name,
|
||||
ID: ID,
|
||||
State: IDLE,
|
||||
resources: resources,
|
||||
Resources: resources,
|
||||
wgTask: wgTask,
|
||||
}
|
||||
return task
|
||||
|
||||
Reference in New Issue
Block a user