
Update the Go library to the 1.10beta1 release. Requires a few changes to the compiler for modifications to the map runtime code, and to handle some nowritebarrier cases in the runtime. Reviewed-on: https://go-review.googlesource.com/86455 gotools/: * Makefile.am (go_cmd_vet_files): New variable. (go_cmd_buildid_files, go_cmd_test2json_files): New variables. (s-zdefaultcc): Change from constants to functions. (noinst_PROGRAMS): Add vet, buildid, and test2json. (cgo$(EXEEXT)): Link against $(LIBGOTOOL). (vet$(EXEEXT)): New target. (buildid$(EXEEXT)): New target. (test2json$(EXEEXT)): New target. (install-exec-local): Install all $(noinst_PROGRAMS). (uninstall-local): Uninstasll all $(noinst_PROGRAMS). (check-go-tool): Depend on $(noinst_PROGRAMS). Copy down objabi.go. (check-runtime): Depend on $(noinst_PROGRAMS). (check-cgo-test, check-carchive-test): Likewise. (check-vet): New target. (check): Depend on check-vet. Look at cmd_vet-testlog. (.PHONY): Add check-vet. * Makefile.in: Rebuild. From-SVN: r256365
54 lines
1.3 KiB
Go
54 lines
1.3 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package iotest
|
|
|
|
import (
|
|
"io"
|
|
"log"
|
|
)
|
|
|
|
type writeLogger struct {
|
|
prefix string
|
|
w io.Writer
|
|
}
|
|
|
|
func (l *writeLogger) Write(p []byte) (n int, err error) {
|
|
n, err = l.w.Write(p)
|
|
if err != nil {
|
|
log.Printf("%s %x: %v", l.prefix, p[0:n], err)
|
|
} else {
|
|
log.Printf("%s %x", l.prefix, p[0:n])
|
|
}
|
|
return
|
|
}
|
|
|
|
// NewWriteLogger returns a writer that behaves like w except
|
|
// that it logs (using log.Printf) each write to standard error,
|
|
// printing the prefix and the hexadecimal data written.
|
|
func NewWriteLogger(prefix string, w io.Writer) io.Writer {
|
|
return &writeLogger{prefix, w}
|
|
}
|
|
|
|
type readLogger struct {
|
|
prefix string
|
|
r io.Reader
|
|
}
|
|
|
|
func (l *readLogger) Read(p []byte) (n int, err error) {
|
|
n, err = l.r.Read(p)
|
|
if err != nil {
|
|
log.Printf("%s %x: %v", l.prefix, p[0:n], err)
|
|
} else {
|
|
log.Printf("%s %x", l.prefix, p[0:n])
|
|
}
|
|
return
|
|
}
|
|
|
|
// NewReadLogger returns a reader that behaves like r except
|
|
// that it logs (using log.Printf) each read to standard error,
|
|
// printing the prefix and the hexadecimal data read.
|
|
func NewReadLogger(prefix string, r io.Reader) io.Reader {
|
|
return &readLogger{prefix, r}
|
|
}
|