Commit e2318cb49b547325c4ac9cfed485eaba0c0c2714 - golang-github-vbauerster-mpb

free list without sync.Pool Vladimir Bauer 3 years ago

4 changed file(s) with 12 addition(s) and 19 deletion(s). Raw diff Collapse all Expand all

-1

cwriter/cuuAndEd_construction_bench_test.go less more

36	36	}
37	37
38	38	func BenchmarkWithCurrentImpl(b *testing.B) {
	39	w := New(out)
	40	b.ResetTimer()
39	41	for i := 0; i < b.N; i++ {
40		_ = ansiCuuAndEd(out, lines)
	42	_ = w.ew.ansiCuuAndEd(out, lines)
41	43	}
42	44	}

-16

cwriter/writer.go less more

5	5	"io"
6	6	"os"
7	7	"strconv"
8		"sync"
9	8	)
10	9
11	10	// https://github.com/dylanaraps/pure-sh-bible#cursor-movement

14	13	cuuAndEd = "A\x1b[J"
15	14	)
16	15
17		// used by ansiCuuAndEd func
18		var escBuf = sync.Pool{
19		New: func() interface{} {
20		b := make([]byte, 8)
21		return &b
22		},
23		}
24
25	16	// ErrNotTTY not a TeleTYpewriter error.
26	17	var ErrNotTTY = errors.New("not a terminal")
27	18

29	20	// contents of writer will be flushed when Flush is called.
30	21	type Writer struct {
31	22	*bytes.Buffer
	23	ew escWriter
32	24	out io.Writer
33	25	lines int // used by writer_windows only
34	26	fd int

40	32	func New(out io.Writer) *Writer {
41	33	w := &Writer{
42	34	Buffer: new(bytes.Buffer),
	35	ew: escWriter(make([]byte, 8, 16)),
43	36	out: out,
44	37	termSize: func(_ int) (int, int, error) {
45	38	return -1, -1, ErrNotTTY

62	55	return w.termSize(w.fd)
63	56	}
64	57
65		// if n > 99 it will allocate because escBuf.Get returns slice of length 8
66		func ansiCuuAndEd(out io.Writer, n int) error {
67		bufp := escBuf.Get()
68		buf := bufp.([]byte)
69		buf = strconv.AppendInt(buf[:copy(buf, escOpen)], int64(n), 10)
70		_, err := out.Write(append(buf, cuuAndEd...))
71		escBuf.Put(bufp)
	58	type escWriter []byte
	59
	60	func (b escWriter) ansiCuuAndEd(out io.Writer, n int) error {
	61	b = strconv.AppendInt(b[:copy(b, escOpen)], int64(n), 10)
	62	_, err := out.Write(append(b, cuuAndEd...))
72	63	return err
73	64	}

-1

cwriter/writer_posix.go less more

10	10	_, err := w.WriteTo(w.out)
11	11	// some terminals interpret 'cursor up 0' as 'cursor up 1'
12	12	if err == nil && lines > 0 {
13		err = ansiCuuAndEd(w, lines)
	13	err = w.ew.ansiCuuAndEd(w, lines)
14	14	}
15	15	return err
16	16	}

-1

cwriter/writer_windows.go less more

30	30	func (w *Writer) clearLines(n int) error {
31	31	if !w.terminal {
32	32	// hope it's cygwin or similar
33		return ansiCuuAndEd(w.out, n)
	33	return w.ew.ansiCuuAndEd(w.out, n)
34	34	}
35	35
36	36	var info windows.ConsoleScreenBufferInfo