X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ifchange.go;h=4a43872c2cf35b4ec4a8ae0a97739f6b0de5bb1b;hb=b4eefdd675c9aef9ff8bd1089d031ee05733195b;hp=43cfdb3e387e12474aec2034b719a8046ab6e6be;hpb=d8abe40c66df8d79a025524c0d230959cacf9465;p=goredo.git diff --git a/ifchange.go b/ifchange.go index 43cfdb3..4a43872 100644 --- a/ifchange.go +++ b/ifchange.go @@ -1,6 +1,6 @@ /* goredo -- djb's redo implementation on pure Go -Copyright (C) 2020-2021 Sergey Matveev +Copyright (C) 2020-2023 Sergey Matveev This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -98,7 +98,7 @@ func buildDependants(tgts []string) map[string]struct{} { } } if len(seen) == 0 { - return nil + return seen } levelOrig := Level @@ -135,17 +135,18 @@ func buildDependants(tgts []string) map[string]struct{} { RebuildDeps: tracef(CDebug, "checking %d dependant targets: %v", len(queueSrc), queueSrc) - queue := []string{} + queue := map[string]struct{}{} for _, tgt := range queueSrc { for dep := range deps[tgt] { - queue = append(queue, dep) + queue[dep] = struct{}{} } } + tracef(CDebug, "building %d dependant targets: %v", len(queue), queue) errs = make(chan error, len(queue)) jobs := 0 queueSrc = []string{} - for _, tgt := range queue { + for tgt := range queue { ood, err := isOODWithTrace(Cwd, tgt, 0, seen) if err != nil { tracef(CErr, "dependant error: %s, skipping dependants", err) @@ -179,12 +180,26 @@ RebuildDeps: } func ifchange(tgts []string, forced, traced bool) (bool, error) { + // only unique elements + m := make(map[string]struct{}) + for _, t := range tgts { + m[t] = struct{}{} + } + tgts = tgts[:0] + for t := range m { + tgts = append(tgts, t) + } + m = nil + jsInit() if !IsTopRedo { defer jsAcquire("ifchange exiting") } defer Jobs.Wait() seen := buildDependants(tgts) + if seen == nil { + return false, nil + } oodTgtsClear() tracef(CDebug, "building %d targets: %v", len(tgts), tgts) jobs := 0