tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
176 lines
3.4 KiB
Go
176 lines
3.4 KiB
Go
// © Broadcom. All Rights Reserved.
|
|
// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package progress
|
|
|
|
import (
|
|
"container/list"
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"sync/atomic"
|
|
"time"
|
|
)
|
|
|
|
type readerReport struct {
|
|
pos int64 // Keep first to ensure 64-bit alignment
|
|
size int64 // Keep first to ensure 64-bit alignment
|
|
bps *uint64 // Keep first to ensure 64-bit alignment
|
|
|
|
t time.Time
|
|
|
|
err error
|
|
}
|
|
|
|
func (r readerReport) Percentage() float32 {
|
|
if r.size <= 0 {
|
|
return 0
|
|
}
|
|
return 100.0 * float32(r.pos) / float32(r.size)
|
|
}
|
|
|
|
func (r readerReport) Detail() string {
|
|
const (
|
|
KiB = 1024
|
|
MiB = 1024 * KiB
|
|
GiB = 1024 * MiB
|
|
)
|
|
|
|
// Use the reader's bps field, so this report returns an up-to-date number.
|
|
//
|
|
// For example: if there hasn't been progress for the last 5 seconds, the
|
|
// most recent report should return "0B/s".
|
|
//
|
|
bps := atomic.LoadUint64(r.bps)
|
|
|
|
switch {
|
|
case bps >= GiB:
|
|
return fmt.Sprintf("%.1fGiB/s", float32(bps)/float32(GiB))
|
|
case bps >= MiB:
|
|
return fmt.Sprintf("%.1fMiB/s", float32(bps)/float32(MiB))
|
|
case bps >= KiB:
|
|
return fmt.Sprintf("%.1fKiB/s", float32(bps)/float32(KiB))
|
|
default:
|
|
return fmt.Sprintf("%dB/s", bps)
|
|
}
|
|
}
|
|
|
|
func (p readerReport) Error() error {
|
|
return p.err
|
|
}
|
|
|
|
// reader wraps an io.Reader and sends a progress report over a channel for
|
|
// every read it handles.
|
|
type reader struct {
|
|
r io.Reader
|
|
|
|
pos int64
|
|
size int64
|
|
bps uint64
|
|
|
|
ch chan<- Report
|
|
ctx context.Context
|
|
}
|
|
|
|
func NewReader(ctx context.Context, s Sinker, r io.Reader, size int64) *reader {
|
|
pr := reader{
|
|
r: r,
|
|
ctx: ctx,
|
|
size: size,
|
|
}
|
|
|
|
// Reports must be sent downstream and to the bps computation loop.
|
|
pr.ch = Tee(s, newBpsLoop(&pr.bps)).Sink()
|
|
|
|
return &pr
|
|
}
|
|
|
|
// Read calls the Read function on the underlying io.Reader. Additionally,
|
|
// every read causes a progress report to be sent to the progress reader's
|
|
// underlying channel.
|
|
func (r *reader) Read(b []byte) (int, error) {
|
|
n, err := r.r.Read(b)
|
|
r.pos += int64(n)
|
|
|
|
if err != nil && err != io.EOF {
|
|
return n, err
|
|
}
|
|
|
|
q := readerReport{
|
|
t: time.Now(),
|
|
pos: r.pos,
|
|
size: r.size,
|
|
bps: &r.bps,
|
|
}
|
|
|
|
select {
|
|
case r.ch <- q:
|
|
case <-r.ctx.Done():
|
|
}
|
|
|
|
return n, err
|
|
}
|
|
|
|
// Done marks the progress reader as done, optionally including an error in the
|
|
// progress report. After sending it, the underlying channel is closed.
|
|
func (r *reader) Done(err error) {
|
|
q := readerReport{
|
|
t: time.Now(),
|
|
pos: r.pos,
|
|
size: r.size,
|
|
bps: &r.bps,
|
|
err: err,
|
|
}
|
|
|
|
select {
|
|
case r.ch <- q:
|
|
close(r.ch)
|
|
case <-r.ctx.Done():
|
|
}
|
|
}
|
|
|
|
// newBpsLoop returns a sink that monitors and stores throughput.
|
|
func newBpsLoop(dst *uint64) SinkFunc {
|
|
fn := func() chan<- Report {
|
|
sink := make(chan Report)
|
|
go bpsLoop(sink, dst)
|
|
return sink
|
|
}
|
|
|
|
return fn
|
|
}
|
|
|
|
func bpsLoop(ch <-chan Report, dst *uint64) {
|
|
l := list.New()
|
|
|
|
for {
|
|
var tch <-chan time.Time
|
|
|
|
// Setup timer for front of list to become stale.
|
|
if e := l.Front(); e != nil {
|
|
dt := time.Second - time.Since(e.Value.(readerReport).t)
|
|
tch = time.After(dt)
|
|
}
|
|
|
|
select {
|
|
case q, ok := <-ch:
|
|
if !ok {
|
|
return
|
|
}
|
|
|
|
l.PushBack(q)
|
|
case <-tch:
|
|
l.Remove(l.Front())
|
|
}
|
|
|
|
// Compute new bps
|
|
if l.Len() == 0 {
|
|
atomic.StoreUint64(dst, 0)
|
|
} else {
|
|
f := l.Front().Value.(readerReport)
|
|
b := l.Back().Value.(readerReport)
|
|
atomic.StoreUint64(dst, uint64(b.pos-f.pos))
|
|
}
|
|
}
|
|
}
|