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 ---
221 lines
5.3 KiB
Go
221 lines
5.3 KiB
Go
package flate
|
|
|
|
import "fmt"
|
|
|
|
type fastEncL4 struct {
|
|
fastGen
|
|
table [tableSize]tableEntry
|
|
bTable [tableSize]tableEntry
|
|
}
|
|
|
|
func (e *fastEncL4) Encode(dst *tokens, src []byte) {
|
|
const (
|
|
inputMargin = 12 - 1
|
|
minNonLiteralBlockSize = 1 + 1 + inputMargin
|
|
hashShortBytes = 4
|
|
)
|
|
if debugDeflate && e.cur < 0 {
|
|
panic(fmt.Sprint("e.cur < 0: ", e.cur))
|
|
}
|
|
// Protect against e.cur wraparound.
|
|
for e.cur >= bufferReset {
|
|
if len(e.hist) == 0 {
|
|
for i := range e.table[:] {
|
|
e.table[i] = tableEntry{}
|
|
}
|
|
for i := range e.bTable[:] {
|
|
e.bTable[i] = tableEntry{}
|
|
}
|
|
e.cur = maxMatchOffset
|
|
break
|
|
}
|
|
// Shift down everything in the table that isn't already too far away.
|
|
minOff := e.cur + int32(len(e.hist)) - maxMatchOffset
|
|
for i := range e.table[:] {
|
|
v := e.table[i].offset
|
|
if v <= minOff {
|
|
v = 0
|
|
} else {
|
|
v = v - e.cur + maxMatchOffset
|
|
}
|
|
e.table[i].offset = v
|
|
}
|
|
for i := range e.bTable[:] {
|
|
v := e.bTable[i].offset
|
|
if v <= minOff {
|
|
v = 0
|
|
} else {
|
|
v = v - e.cur + maxMatchOffset
|
|
}
|
|
e.bTable[i].offset = v
|
|
}
|
|
e.cur = maxMatchOffset
|
|
}
|
|
|
|
s := e.addBlock(src)
|
|
|
|
// This check isn't in the Snappy implementation, but there, the caller
|
|
// instead of the callee handles this case.
|
|
if len(src) < minNonLiteralBlockSize {
|
|
// We do not fill the token table.
|
|
// This will be picked up by caller.
|
|
dst.n = uint16(len(src))
|
|
return
|
|
}
|
|
|
|
// Override src
|
|
src = e.hist
|
|
nextEmit := s
|
|
|
|
// sLimit is when to stop looking for offset/length copies. The inputMargin
|
|
// lets us use a fast path for emitLiteral in the main loop, while we are
|
|
// looking for copies.
|
|
sLimit := int32(len(src) - inputMargin)
|
|
|
|
// nextEmit is where in src the next emitLiteral should start from.
|
|
cv := load6432(src, s)
|
|
for {
|
|
const skipLog = 6
|
|
const doEvery = 1
|
|
|
|
nextS := s
|
|
var t int32
|
|
for {
|
|
nextHashS := hashLen(cv, tableBits, hashShortBytes)
|
|
nextHashL := hash7(cv, tableBits)
|
|
|
|
s = nextS
|
|
nextS = s + doEvery + (s-nextEmit)>>skipLog
|
|
if nextS > sLimit {
|
|
goto emitRemainder
|
|
}
|
|
// Fetch a short+long candidate
|
|
sCandidate := e.table[nextHashS]
|
|
lCandidate := e.bTable[nextHashL]
|
|
next := load6432(src, nextS)
|
|
entry := tableEntry{offset: s + e.cur}
|
|
e.table[nextHashS] = entry
|
|
e.bTable[nextHashL] = entry
|
|
|
|
t = lCandidate.offset - e.cur
|
|
if s-t < maxMatchOffset && uint32(cv) == load3232(src, t) {
|
|
// We got a long match. Use that.
|
|
break
|
|
}
|
|
|
|
t = sCandidate.offset - e.cur
|
|
if s-t < maxMatchOffset && uint32(cv) == load3232(src, t) {
|
|
// Found a 4 match...
|
|
lCandidate = e.bTable[hash7(next, tableBits)]
|
|
|
|
// If the next long is a candidate, check if we should use that instead...
|
|
lOff := lCandidate.offset - e.cur
|
|
if nextS-lOff < maxMatchOffset && load3232(src, lOff) == uint32(next) {
|
|
l1, l2 := matchLen(src[s+4:], src[t+4:]), matchLen(src[nextS+4:], src[nextS-lOff+4:])
|
|
if l2 > l1 {
|
|
s = nextS
|
|
t = lCandidate.offset - e.cur
|
|
}
|
|
}
|
|
break
|
|
}
|
|
cv = next
|
|
}
|
|
|
|
// A 4-byte match has been found. We'll later see if more than 4 bytes
|
|
// match. But, prior to the match, src[nextEmit:s] are unmatched. Emit
|
|
// them as literal bytes.
|
|
|
|
// Extend the 4-byte match as long as possible.
|
|
l := e.matchlenLong(int(s+4), int(t+4), src) + 4
|
|
|
|
// Extend backwards
|
|
for t > 0 && s > nextEmit && src[t-1] == src[s-1] {
|
|
s--
|
|
t--
|
|
l++
|
|
}
|
|
if nextEmit < s {
|
|
if false {
|
|
emitLiteral(dst, src[nextEmit:s])
|
|
} else {
|
|
for _, v := range src[nextEmit:s] {
|
|
dst.tokens[dst.n] = token(v)
|
|
dst.litHist[v]++
|
|
dst.n++
|
|
}
|
|
}
|
|
}
|
|
if debugDeflate {
|
|
if t >= s {
|
|
panic("s-t")
|
|
}
|
|
if (s - t) > maxMatchOffset {
|
|
panic(fmt.Sprintln("mmo", t))
|
|
}
|
|
if l < baseMatchLength {
|
|
panic("bml")
|
|
}
|
|
}
|
|
|
|
dst.AddMatchLong(l, uint32(s-t-baseMatchOffset))
|
|
s += l
|
|
nextEmit = s
|
|
if nextS >= s {
|
|
s = nextS + 1
|
|
}
|
|
|
|
if s >= sLimit {
|
|
// Index first pair after match end.
|
|
if int(s+8) < len(src) {
|
|
cv := load6432(src, s)
|
|
e.table[hashLen(cv, tableBits, hashShortBytes)] = tableEntry{offset: s + e.cur}
|
|
e.bTable[hash7(cv, tableBits)] = tableEntry{offset: s + e.cur}
|
|
}
|
|
goto emitRemainder
|
|
}
|
|
|
|
// Store every 3rd hash in-between
|
|
if true {
|
|
i := nextS
|
|
if i < s-1 {
|
|
cv := load6432(src, i)
|
|
t := tableEntry{offset: i + e.cur}
|
|
t2 := tableEntry{offset: t.offset + 1}
|
|
e.bTable[hash7(cv, tableBits)] = t
|
|
e.bTable[hash7(cv>>8, tableBits)] = t2
|
|
e.table[hashLen(cv>>8, tableBits, hashShortBytes)] = t2
|
|
|
|
i += 3
|
|
for ; i < s-1; i += 3 {
|
|
cv := load6432(src, i)
|
|
t := tableEntry{offset: i + e.cur}
|
|
t2 := tableEntry{offset: t.offset + 1}
|
|
e.bTable[hash7(cv, tableBits)] = t
|
|
e.bTable[hash7(cv>>8, tableBits)] = t2
|
|
e.table[hashLen(cv>>8, tableBits, hashShortBytes)] = t2
|
|
}
|
|
}
|
|
}
|
|
|
|
// We could immediately start working at s now, but to improve
|
|
// compression we first update the hash table at s-1 and at s.
|
|
x := load6432(src, s-1)
|
|
o := e.cur + s - 1
|
|
prevHashS := hashLen(x, tableBits, hashShortBytes)
|
|
prevHashL := hash7(x, tableBits)
|
|
e.table[prevHashS] = tableEntry{offset: o}
|
|
e.bTable[prevHashL] = tableEntry{offset: o}
|
|
cv = x >> 8
|
|
}
|
|
|
|
emitRemainder:
|
|
if int(nextEmit) < len(src) {
|
|
// If nothing was added, don't encode literals.
|
|
if dst.n == 0 {
|
|
return
|
|
}
|
|
|
|
emitLiteral(dst, src[nextEmit:])
|
|
}
|
|
}
|