X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=log.go;h=ea81c149375b491fb1642f9dc2693e2047041f24;hb=HEAD;hp=bc0b79ad6d340ddd070afd65f647f151c20cad42;hpb=9edf579be85e74438036dbedd50dea947627fb7d;p=goredo.git

diff --git a/log.go b/log.go
index bc0b79a..ea81c14 100644
--- a/log.go
+++ b/log.go
@@ -1,19 +1,17 @@
-/*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020-2021 Sergey Matveev <stargrave@stargrave.org>
-
-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
-the Free Software Foundation, version 3 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
+// goredo -- djb's redo implementation on pure Go
+// Copyright (C) 2020-2024 Sergey Matveev <stargrave@stargrave.org>
+//
+// 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
+// the Free Software Foundation, version 3 of the License.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // Logging facilities
 
@@ -49,7 +47,7 @@ var (
 	LogWait    bool
 	LogLock    bool
 	LogJS      bool
-	MyPid      int
+	MyPID      int
 
 	CDebug string
 	CRedo  string
@@ -59,17 +57,18 @@ var (
 	CWarn  string
 	CJS    string
 	CReset string
-	CNone  string = "NONE"
+	CNone  = "NONE"
 
-	flagNoProgress = flag.Bool("no-progress", false, fmt.Sprintf("no progress printing (%s=1), also implies -no-status", EnvNoProgress))
 	flagDebug      = flag.Bool("d", false, fmt.Sprintf("enable debug logging (%s=1)", EnvDebug))
-	flagLogWait    = flag.Bool("log-wait", false, fmt.Sprintf("enable wait messages logging (%s=1)", EnvLogWait))
-	flagLogLock    = flag.Bool("log-lock", false, fmt.Sprintf("enable lock messages logging (%s=1)", EnvLogLock))
-	flagLogPid     = flag.Bool("log-pid", false, fmt.Sprintf("append PIDs (%s=1)", EnvLogPid))
-	flagLogJS      = flag.Bool("log-js", false, fmt.Sprintf("enable jobserver messages logging (%s=1)", EnvLogJS))
-
-	LogMutex   sync.Mutex
-	LogLenPrev int
+	flagNoProgress *bool
+	flagLogWait    *bool
+	flagLogLock    *bool
+	flagLogPid     *bool
+	flagLogJS      *bool
+
+	LogMutex      sync.Mutex
+	KeyEraseLine  string
+	LastLoggedTgt string
 )
 
 func init() {
@@ -83,31 +82,68 @@ func init() {
 	CWarn = string(t.Escape.Magenta)
 	CJS = string(t.Escape.White)
 	CReset = string(t.Escape.Reset)
+	KeyEraseLine = fmt.Sprintf("%s[K", CReset[0:1])
+
+	cmdName := CmdName()
+	if !(cmdName == CmdNameRedo || cmdName == CmdNameRedoIfchange) {
+		return
+	}
+	flagNoProgress = flag.Bool("no-progress", false,
+		fmt.Sprintf("no progress printing (%s=1), also implies -no-status", EnvNoProgress))
+	flagLogWait = flag.Bool("log-wait", false,
+		fmt.Sprintf("enable wait messages logging (%s=1)", EnvLogWait))
+	flagLogLock = flag.Bool("log-lock", false,
+		fmt.Sprintf("enable lock messages logging (%s=1)", EnvLogLock))
+	flagLogPid = flag.Bool("log-pid", false,
+		fmt.Sprintf("append PIDs (%s=1)", EnvLogPid))
+	flagLogJS = flag.Bool("log-js", false,
+		fmt.Sprintf("enable jobserver messages logging (%s=1)", EnvLogJS))
 }
 
-func fillUpToTermSize(s, end string) string {
-	sLen := len(s)
-	if sLen < LogLenPrev {
-		s += strings.Repeat(" ", LogLenPrev-sLen)
-		LogLenPrev = sLen
-	} else {
-		LogLenPrev = sLen
+func erasedStatus(s, end string) string {
+	if NoProgress || NoColor {
+		return s + end
 	}
-	return s + end
+	return s + KeyEraseLine + end
 }
 
-func trace(level, format string, args ...interface{}) {
+func withPrependedTgt(s string) {
+	if s[0] != '[' {
+		stderrWrite(erasedStatus(s, "\n"))
+		return
+	}
+	i := strings.IndexByte(s, ']')
+	if i == -1 {
+		stderrWrite(s)
+		return
+	}
+	tgt, s := s[1:i], s[i+1:]
+	if tgt != LastLoggedTgt {
+		LastLoggedTgt = tgt
+		tgt = "redo " + tgt + " ..."
+		if MyPID != 0 {
+			tgt = fmt.Sprintf("[%d] %s", MyPID, tgt)
+		}
+		stderrWrite(erasedStatus(colourize(CDebug, tgt), "\n"))
+	}
+	stderrWrite(erasedStatus(s, "\n"))
+}
+
+func stderrWrite(s string) {
+	LogMutex.Lock()
+	os.Stderr.WriteString(s)
+	LogMutex.Unlock()
+}
+
+func tracef(level, format string, args ...interface{}) {
 	var p string
-	if MyPid != 0 {
-		p = fmt.Sprintf("[%d] ", MyPid)
+	if MyPID != 0 {
+		p = fmt.Sprintf("[%d] ", MyPID)
 	}
 	switch level {
 	case CNone:
-		LogMutex.Lock()
-		os.Stderr.WriteString(fillUpToTermSize(
-			StderrPrefix+p+fmt.Sprintf(format, args...), "\n",
-		))
-		LogMutex.Unlock()
+		p = erasedStatus(StderrPrefix+p+fmt.Sprintf(format, args...), "\n")
+		stderrWrite(p)
 		return
 	case CDebug:
 		if !Debug {
@@ -141,9 +177,8 @@ func trace(level, format string, args ...interface{}) {
 	}
 	msg := fmt.Sprintf(format, args...)
 	msg = StderrPrefix + colourize(level, p+strings.Repeat(". ", Level)+msg)
-	LogMutex.Lock()
-	os.Stderr.WriteString(fillUpToTermSize(msg, "\n"))
-	LogMutex.Unlock()
+	msg = erasedStatus(msg, "\n")
+	stderrWrite(msg)
 }
 
 func colourize(colour, s string) string {