Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
484bfa9ba0 | ||
|
|
8f8073ca3e | ||
|
|
7bcc407857 | ||
|
|
8c24a1d8c6 | ||
|
|
4ca2fffb33 | ||
|
|
d198741b37 | ||
|
|
afe6e5384d | ||
|
|
b6f8cf9155 | ||
|
|
9bac4fb257 | ||
|
|
7958db9c0d | ||
|
|
4869c146fe |
83
.golangci.yml
Normal file
83
.golangci.yml
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
version: "2"
|
||||||
|
run:
|
||||||
|
go: "1.21"
|
||||||
|
modules-download-mode: readonly
|
||||||
|
tests: false
|
||||||
|
allow-parallel-runners: true
|
||||||
|
linters:
|
||||||
|
default: none
|
||||||
|
enable:
|
||||||
|
- asasalint
|
||||||
|
- asciicheck
|
||||||
|
- bodyclose
|
||||||
|
- containedctx
|
||||||
|
- contextcheck
|
||||||
|
- decorder
|
||||||
|
- durationcheck
|
||||||
|
- errcheck
|
||||||
|
- errchkjson
|
||||||
|
- errorlint
|
||||||
|
- exhaustive
|
||||||
|
- ginkgolinter
|
||||||
|
- gocheckcompilerdirectives
|
||||||
|
- gocritic
|
||||||
|
- godot
|
||||||
|
- gosec
|
||||||
|
- gosmopolitan
|
||||||
|
- govet
|
||||||
|
- grouper
|
||||||
|
- importas
|
||||||
|
- ineffassign
|
||||||
|
- ireturn
|
||||||
|
- makezero
|
||||||
|
- mirror
|
||||||
|
- nakedret
|
||||||
|
- nilerr
|
||||||
|
- nilnil
|
||||||
|
- nlreturn
|
||||||
|
- noctx
|
||||||
|
- nolintlint
|
||||||
|
- nonamedreturns
|
||||||
|
- predeclared
|
||||||
|
- promlinter
|
||||||
|
- reassign
|
||||||
|
- revive
|
||||||
|
- rowserrcheck
|
||||||
|
- staticcheck
|
||||||
|
- unconvert
|
||||||
|
- unused
|
||||||
|
- wastedassign
|
||||||
|
- whitespace
|
||||||
|
- wsl
|
||||||
|
settings:
|
||||||
|
gosec:
|
||||||
|
excludes:
|
||||||
|
# Оно не используется для повышения безопасности или каких-то таких секъюрных вещей, оно используется для выборки
|
||||||
|
# произвольного элемента из массива, так что ИДИ НАХУЙ с этой проверкой и не еби мозги липовой безопасностью.
|
||||||
|
- G404
|
||||||
|
# Не еби мозги. Сертификаты для локалхоста или для локальной сети могут быть невалидными, если ты сможешь
|
||||||
|
# выписать валидный серт для локалхоста, тебе миллионы разработчиков поставят золотой памятник. Просто потому
|
||||||
|
# что эти пидоры-безпасники всрали всё что только можно всрать своими дебильными политиками.
|
||||||
|
- G402
|
||||||
|
exclusions:
|
||||||
|
generated: lax
|
||||||
|
presets:
|
||||||
|
- comments
|
||||||
|
- common-false-positives
|
||||||
|
- legacy
|
||||||
|
- std-error-handling
|
||||||
|
paths:
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
formatters:
|
||||||
|
enable:
|
||||||
|
- gofmt
|
||||||
|
- goimports
|
||||||
|
exclusions:
|
||||||
|
generated: lax
|
||||||
|
paths:
|
||||||
|
- third_party$
|
||||||
|
- builtin$
|
||||||
|
- examples$
|
||||||
|
- vendor$
|
||||||
12
DESIGN
Normal file
12
DESIGN
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
Для irc admin-модуля:
|
||||||
|
|
||||||
|
1. берём pebbledb как бэкэнд сохранения настроек.
|
||||||
|
|
||||||
|
2. имплементировать trusted-участников чятика для настройки бота под конкретный канальчик.
|
||||||
|
Есть два варианта:
|
||||||
|
- ручной список в конфиге, где прописывается owner бота и доверенные лица (опционально доверенных можно прописывать в pebbledb admin_db)
|
||||||
|
- доверенными являются op-ы
|
||||||
|
|
||||||
|
Первый вариант - довольно гибкий, но у нас всегда bot owner является доверенным. Не то чтобы это неправильно. Но с другой стороны можно сделать owner-а суперадмином, а другим админам дать возможность добавлять user-ов для своего канальчика в список доверенных. И запретить удалять себя из списка доверенных.
|
||||||
|
|
||||||
|
Второй вариант проще. И выглядит более привычным в текущих реалиях. Но есть нюанс - у нас нету простой возможности вынуть список участников вместе с флагами (предположительно). Кроме того, необходимо писать обработчк ивентов для всех изменений состояний юзеров (join/part и op/deop) для поддержания списка участников в актуальном состоянии.
|
||||||
3
Makefile
3
Makefile
@@ -6,8 +6,7 @@ BUILDOPTS=-ldflags="-s -w" -a -gcflags=all=-l -trimpath
|
|||||||
all: clean build
|
all: clean build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
${GOOPTS} go build ${BUILDOPTS} -o aleesa-irc-go types.go globals.go collection.go irc-user-mode.go \
|
${GOOPTS} go build ${BUILDOPTS} -o aleesa-irc-go .
|
||||||
settings-db-util.go util.go msg-parsers.go aleesa-irc-go-lib.go main.go
|
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
go clean
|
go clean
|
||||||
|
|||||||
@@ -1,74 +1,74 @@
|
|||||||
aleesa-irc-go
|
# aleesa-irc-go
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
Сервис для aleesa-bot, работающий с протоколом IRC. С основными сервисами бота работает по протоколу Redis pubsub.
|
Сервис для aleesa-bot, работающий с протоколом IRC. С основными сервисами бота работает по протоколу Redis pubsub.
|
||||||
|
|
||||||
|
## Механика работы
|
||||||
|
|
||||||
Механика работы
|
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
Сервис подписан на pub-sub redis-канал irc. В этот канал пишут остальные сервисы aleesa-bot-а в ответ на запросы этого
|
Сервис подписан на pub-sub redis-канал irc. В этот канал пишут остальные сервисы aleesa-bot-а в ответ на запросы этого
|
||||||
сервиса.
|
сервиса.
|
||||||
|
|
||||||
Формат протокола общения по redis pub-sub - см README от aleesa-misc-go.
|
Формат протокола общения по redis pub-sub - см. документацию в репозитории aleesa-doc.
|
||||||
|
|
||||||
|
## Как это собрать?
|
||||||
|
|
||||||
Как это собрать?
|
Понадобится компилятор go версии 1.22 или более новый.
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
Понадобится golang версии 1.19 или более новая.
|
|
||||||
|
|
||||||
Сам процесс сборки простой, достаточно запустить:
|
Сам процесс сборки простой, достаточно запустить:
|
||||||
|
|
||||||
|
```bash
|
||||||
make
|
make
|
||||||
|
```
|
||||||
|
|
||||||
и через некоторое время мы получаем бинарник aleesa-irc-go. Это и есть наше приложение.
|
и через некоторое время мы получаем бинарник **aleesa-irc-go**. Это и есть наше приложение.
|
||||||
|
|
||||||
|
|
||||||
Как это запустить?
|
## Как это запустить?
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
Приложение тестировалось на alpine linux x86_64 3.16, но должно работать на любом (более свежем) linux-е.
|
Приложение тестировалось на alpine linux x86_64 3.16, но должно работать на любом (более свежем) linux-е.
|
||||||
|
|
||||||
После создания data/config.json из data/config_sample.json, можно запускать приложение.
|
После создания **data/config.json** из **data/config_sample.json**, можно запускать приложение.
|
||||||
|
|
||||||
Предполагается, что конфиг написан в формате human json (https://hjson.github.io), который допускает коментарии и
|
Предполагается, что конфиг написан в формате [human json](https://hjson.github.io), который допускает коментарии и
|
||||||
некоторые другие вольности в форматировании json-а. Конфиг ищется последовательно по следующим путям по принципу "кто
|
некоторые другие вольности в форматировании json-а. Конфиг ищется последовательно по следующим путям по принципу "кто
|
||||||
первый того и тапки":
|
первый того и тапки":
|
||||||
|
|
||||||
|
```
|
||||||
~/.aleesa-irc-go.json
|
~/.aleesa-irc-go.json
|
||||||
~/aleesa-irc-go.json
|
~/aleesa-irc-go.json
|
||||||
/etc/aleesa-irc-go.json
|
/etc/aleesa-irc-go.json
|
||||||
data/config.json
|
data/config.json
|
||||||
|
```
|
||||||
|
|
||||||
В каталоге contrib находится скрипт для alpine linux, системы инициализации openrc. Этот скрипт достаточно положить в
|
В каталоге contrib находится скрипт для alpine linux, системы инициализации openrc. Этот скрипт достаточно положить в
|
||||||
/etc/init.d/aleesa-irc-go. После чего скопировать бинарник в каталог /var/lib/aleesa-irc-go, положить конфиг в одну
|
**/etc/init.d/aleesa-irc-go**. После чего скопировать бинарник в каталог **/var/lib/aleesa-irc-go**, положить конфиг в
|
||||||
из дефолтных локаций (тестировалась /var/lib/aleesa-irc-go/data/config.json) и после этого сервис запускается
|
одну из дефолтных локаций (тестировалась **/var/lib/aleesa-irc-go/data/config.json**) и после этого сервис запускается
|
||||||
командой:
|
командой:
|
||||||
|
|
||||||
|
```bash
|
||||||
service aleesa-irc-go start
|
service aleesa-irc-go start
|
||||||
|
```
|
||||||
|
|
||||||
В автозагрузку его можно прописать через команду:
|
В автозагрузку его можно прописать через команду:
|
||||||
|
|
||||||
|
```bash
|
||||||
rc-update add aleesa-irc-go default
|
rc-update add aleesa-irc-go default
|
||||||
|
```
|
||||||
|
|
||||||
|
## Nota Bene
|
||||||
|
|
||||||
Nota Bene
|
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
По механике, в процессе работы мы форкаем горутинки на каждое входящее сообщение, особо не контроллируя этот процесс.
|
|
||||||
Предполагается, что на это приложение не будет большой нагрузки - ограничения irc не должны дать возможности развить
|
|
||||||
достаточно большой message rate, чтобы об это споткнуться.
|
|
||||||
|
|
||||||
Формально, более удачным было бы иметь автоматический пул воркеров-горутинок и раскидывать им через channel-ы
|
|
||||||
сообщения. Внутри каждой горутинки можно было бы повиcнуть в бесконечном цикле на канале входящих сообщений и так и
|
|
||||||
работать. Но на практике оно того не стОит.
|
|
||||||
|
|
||||||
|
|
||||||
Nota Bene #2
|
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
Go не поддерживает системный вызов fork() из-за чего демонизация программ на гошке средствами самой гошки - это в
|
Go не поддерживает системный вызов fork() из-за чего демонизация программ на гошке средствами самой гошки - это в
|
||||||
некотором роде проблема. Решается она с помощью утилиты daemonize (https://github.com/bmc/daemonize).
|
некотором роде проблема. Решается она с помощью утилиты [daemonize](https://github.com/bmc/daemonize).
|
||||||
|
|
||||||
Соответствено, если для запуска этой программы предполагается использовать возможности демонизации, то можно
|
Соответствено, если для запуска этой программы предполагается использовать возможности демонизации, то можно
|
||||||
воспользоваться этой программой.
|
воспользоваться этой программой.
|
||||||
|
|
||||||
В alpine linux есть средства openrc для супервайзинга foreground-сервисов.
|
В alpine linux есть средства openrc для супервайзинга foreground-сервисов.
|
||||||
|
|
||||||
|
Технически, можно было бы решить эту проблему fork()-а с помощью "github.com/sevlyar/go-daemon", но на текущий момент
|
||||||
|
она не стоит остро, поэтому решения не требуется.
|
||||||
|
|
||||||
|
## Nota Bene 2
|
||||||
|
|
||||||
Nota Bene #3
|
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
К сожалению, в боте не подразумевается функциональность invite-ов. Причина банальна - слишком жёсткие ограничения у
|
К сожалению, в боте не подразумевается функциональность invite-ов. Причина банальна - слишком жёсткие ограничения у
|
||||||
многих irc-сетей на количество сообщений в единицу времени, а по механике в большинстве случаев ограничение работает не
|
многих irc-сетей на количество сообщений в единицу времени, а по механике в большинстве случаев ограничение работает не
|
||||||
client-client или client-channel, а глобально, client-server (за исключением случаев, когда на канале у бота есть +v
|
client-client или client-channel, а глобально, client-server (за исключением случаев, когда на канале у бота есть +v
|
||||||
@@ -77,6 +77,6 @@ client-client или client-channel, а глобально, client-server (за
|
|||||||
Сообщения об invite-ах пишутся в лог с уровнем info.
|
Сообщения об invite-ах пишутся в лог с уровнем info.
|
||||||
|
|
||||||
|
|
||||||
Special Thanks
|
## Special Thanks
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
|
||||||
https://github.com/akyoto/cache за "простой" кэш, из которого я сделал collection.go
|
https://github.com/akyoto/cache за "простой" кэш, из которого я сделал collection.go.
|
||||||
14
TODO
Normal file
14
TODO
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
[ ] Имплементировать IRC (например, через https://github.com/thoj/go-ircevent)
|
||||||
|
[*] irc в виде горутинки на вход, как irc-клиент + обработчик входящих ивентов - ctcp-сообщений, dcc и вот это всё
|
||||||
|
[ ] подумать про настройки и нужность админской части (скорее всего нужно, для настройки функций ботов для канала)
|
||||||
|
[ ] подумать, про инвайт бота и про удаление бота средствами !nick get lost, если бот заапрувлен, но уже надоел.
|
||||||
|
[+] irc в виде функи для сообщений на выход, собственно, её будут дёргать как обработчик redis-сообщений, так модуль протокола irc
|
||||||
|
[+] реализовать ограничитель сообщений в единицу времени
|
||||||
|
|
||||||
|
[+] Исправить парсер конфига
|
||||||
|
|
||||||
|
[ ] Мульти-инстанс. В формате нескольких сервисов с отдельными конфигами. (Описать мульти-инстанс в readme)
|
||||||
|
[ ] Вариант запуска как с помощью симлинка (поиск конфига по имени бинаря).
|
||||||
|
[ ] Вариант запуска с указанием положения конфига.
|
||||||
|
|
||||||
|
[ ] Дописать всякие необязательные .md-файлы :)
|
||||||
@@ -4,22 +4,22 @@ import (
|
|||||||
"crypto/tls"
|
"crypto/tls"
|
||||||
"fmt"
|
"fmt"
|
||||||
"regexp"
|
"regexp"
|
||||||
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"aleesa-irc-go/internal/boolcollection"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
irc "github.com/thoj/go-ircevent"
|
irc "github.com/thoj/go-ircevent"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ircClientInit горутинка для работы с протоколом irc
|
// ircClientInit горутинка для работы с протоколом irc.
|
||||||
func ircClientRun() {
|
func ircClientRun() {
|
||||||
for {
|
for !shutdown {
|
||||||
if shutdown {
|
// Иницализируем irc-клиента.
|
||||||
// Если мы завершаем работу программы, то нам ничего обрабатывать не надо
|
// TODO: make use of capabilities: https://defs.ircdocs.horse/defs/clientcaps .
|
||||||
break
|
// TODO: make use of tags caps https://defs.ircdocs.horse/defs/tags .
|
||||||
}
|
|
||||||
|
|
||||||
// Иницализируем irc-клиента
|
|
||||||
serverString := fmt.Sprintf("%s:%d", config.Irc.Server, config.Irc.Port)
|
serverString := fmt.Sprintf("%s:%d", config.Irc.Server, config.Irc.Port)
|
||||||
log.Debugf("Preparing to connect to %s", serverString)
|
log.Debugf("Preparing to connect to %s", serverString)
|
||||||
log.Debugf("Using nick %s and username %s", config.Irc.Nick, config.Irc.User)
|
log.Debugf("Using nick %s and username %s", config.Irc.Nick, config.Irc.User)
|
||||||
@@ -29,10 +29,12 @@ func ircClientRun() {
|
|||||||
|
|
||||||
if config.Irc.Ssl {
|
if config.Irc.Ssl {
|
||||||
log.Debug("Force use ssl for connection")
|
log.Debug("Force use ssl for connection")
|
||||||
|
|
||||||
ircClient.UseTLS = true
|
ircClient.UseTLS = true
|
||||||
|
|
||||||
if !config.Irc.SslVerify {
|
if !config.Irc.SslVerify {
|
||||||
log.Debug("Skip server certificate validation")
|
log.Debug("Skip server certificate validation")
|
||||||
|
|
||||||
ircClient.TLSConfig = &tls.Config{InsecureSkipVerify: true}
|
ircClient.TLSConfig = &tls.Config{InsecureSkipVerify: true}
|
||||||
} else {
|
} else {
|
||||||
log.Debug("Force server certificate validation")
|
log.Debug("Force server certificate validation")
|
||||||
@@ -47,13 +49,48 @@ func ircClientRun() {
|
|||||||
ircClient.UseSASL = true
|
ircClient.UseSASL = true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Навесим коллбэков на некоторые ответы сервера на наши запросы
|
// Навесим коллбэков на некоторые ответы сервера на наши запросы.
|
||||||
|
|
||||||
|
// 001 RPL_WELCOME уже есть в github.com/thoj/go-ircevent/irc_callback.go.
|
||||||
|
|
||||||
|
// Сделаем уже что-то полезное! Motd нам уже прислали и теперь можно авторизоваться и джойниться
|
||||||
|
ircClient.AddCallback("004", func(e *irc.Event) {
|
||||||
|
// Из это строки мы можем узнать, какие флаги для user MODE и channem MODE можно навешивать.
|
||||||
|
// Как минимум, эта строка нам нужна, чтобы выяснить, можем ли мы взять себе +B, мы же бот :).
|
||||||
|
e.Connection.Lock()
|
||||||
|
|
||||||
|
// Формат строки с MODE-ами https://datatracker.ietf.org/doc/html/rfc2812#section-5.1 .
|
||||||
|
availableUserModes = boolcollection.NewCollection()
|
||||||
|
availableChanModes = boolcollection.NewCollection()
|
||||||
|
|
||||||
|
log.Debugf("Add %s to list of available user modes", e.Arguments[3])
|
||||||
|
|
||||||
|
for _, mode := range strings.Split(e.Arguments[3], "") {
|
||||||
|
availableUserModes.Set(mode, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
availableUserModes.Set("announced", true)
|
||||||
|
|
||||||
|
log.Debugf("Add %s to list available channel modes", e.Arguments[4])
|
||||||
|
|
||||||
|
for _, mode := range strings.Split(e.Arguments[4], "") {
|
||||||
|
availableChanModes.Set(mode, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
availableChanModes.Set("announced", true)
|
||||||
|
|
||||||
|
e.Connection.Unlock()
|
||||||
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("005", func(e *irc.Event) {
|
||||||
|
// TODO: Make use of it. https://defs.ircdocs.horse/defs/isupport
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("319", func(e *irc.Event) {
|
ircClient.AddCallback("319", func(e *irc.Event) {
|
||||||
/* Это одна из строк с данными, прилетающая в ответ на запрос whois на определённого юзера
|
/* Это одна из строк с данными, прилетающая в ответ на запрос whois на определённого юзера
|
||||||
* Из этой строки нас интересует, на каких каналах пользователь op (то есть с префиксом @) или имеет voice
|
* Из этой строки нас интересует, на каких каналах пользователь op (то есть с префиксом @) или имеет voice
|
||||||
* (то есть с префиксом +) чтобы внести его в свою базу mode-ов.
|
* (то есть с префиксом +) чтобы внести его в свою базу mode-ов.
|
||||||
*/
|
*/
|
||||||
log.Debugf("319 RPL_WHOISCHANNELS, %s", e.Raw)
|
|
||||||
channelsWithModes := strings.Split(e.Arguments[2], " ")
|
channelsWithModes := strings.Split(e.Arguments[2], " ")
|
||||||
dstNick := e.Arguments[1]
|
dstNick := e.Arguments[1]
|
||||||
|
|
||||||
@@ -65,27 +102,30 @@ func ircClientRun() {
|
|||||||
|
|
||||||
if channel == mychannel {
|
if channel == mychannel {
|
||||||
// Для каждого канала формат строго 1 из 4-х: #channel | @#channel | +#channel | @+#channel
|
// Для каждого канала формат строго 1 из 4-х: #channel | @#channel | +#channel | @+#channel
|
||||||
switch {
|
switch modes {
|
||||||
case modes == "@+":
|
case "@+":
|
||||||
userModeUpdateUser(channel, dstNick, "+o")
|
userModeUpdateUser(channel, dstNick, "+o")
|
||||||
userModeUpdateUser(channel, dstNick, "+v")
|
userModeUpdateUser(channel, dstNick, "+v")
|
||||||
case modes == "@":
|
case "@":
|
||||||
userModeUpdateUser(channel, dstNick, "+o")
|
userModeUpdateUser(channel, dstNick, "+o")
|
||||||
case modes == "+":
|
case "+":
|
||||||
userModeUpdateUser(channel, dstNick, "+v")
|
userModeUpdateUser(channel, dstNick, "+v")
|
||||||
default:
|
default:
|
||||||
userModeUpdateUser(channel, dstNick, "-o")
|
userModeUpdateUser(channel, dstNick, "-o")
|
||||||
userModeUpdateUser(channel, dstNick, "-v")
|
userModeUpdateUser(channel, dstNick, "-v")
|
||||||
}
|
}
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 433 ERR_NICKNAMEINUSE уже есть в github.com/thoj/go-ircevent/irc_callback.go.
|
||||||
|
|
||||||
ircClient.AddCallback("353", func(e *irc.Event) {
|
ircClient.AddCallback("353", func(e *irc.Event) {
|
||||||
// Это одна из строк данных, прилетающая в ответ на запрос names, на канале
|
// Это одна из строк данных, прилетающая в ответ на запрос names, на канале
|
||||||
log.Debugf("353 RPL_NAMREPLY, %s", e.Raw)
|
e.Connection.Lock()
|
||||||
namesString := e.Arguments[3]
|
namesString := e.Arguments[3]
|
||||||
channel := e.Arguments[2]
|
channel := e.Arguments[2]
|
||||||
|
|
||||||
@@ -93,6 +133,7 @@ func ircClientRun() {
|
|||||||
if channel == mychannel {
|
if channel == mychannel {
|
||||||
for _, name := range strings.Split(namesString, " ") {
|
for _, name := range strings.Split(namesString, " ") {
|
||||||
mode := name[:1]
|
mode := name[:1]
|
||||||
|
|
||||||
var nick string
|
var nick string
|
||||||
|
|
||||||
if mode == "@" || mode == "+" {
|
if mode == "@" || mode == "+" {
|
||||||
@@ -101,25 +142,58 @@ func ircClientRun() {
|
|||||||
nick = name
|
nick = name
|
||||||
}
|
}
|
||||||
|
|
||||||
switch {
|
switch mode {
|
||||||
case mode == "@":
|
case "@":
|
||||||
userModeUpdateUser(channel, nick, "+o")
|
userModeUpdateUser(channel, nick, "+o")
|
||||||
case mode == "+":
|
case "+":
|
||||||
userModeUpdateUser(channel, nick, "+v")
|
userModeUpdateUser(channel, nick, "+v")
|
||||||
default:
|
default:
|
||||||
userModeUpdateUser(channel, nick, "-o")
|
userModeUpdateUser(channel, nick, "-o")
|
||||||
userModeUpdateUser(channel, nick, "-v")
|
userModeUpdateUser(channel, nick, "-v")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
e.Connection.Unlock()
|
||||||
})
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("352", func(e *irc.Event) {
|
// Если сервер не может прочитать MOTD, то он может вернуть 422 ERR_NOMOTD, тоде самое навесим и туда тоже.
|
||||||
// Относительно бесполезная для нас команда. Не возвращает канала (в случае с ngircd), так что узнать mode
|
ircClient.AddCallback("376", func(e *irc.Event) {
|
||||||
// юзера на конкретном канале из этого невозможно. А остальные данные пока непонятно куда применять.
|
// TODO: make use of modes https://defs.ircdocs.horse/defs/usermodes
|
||||||
log.Warnf("352 RPL_WHOREPLY, %s", e.Raw)
|
// Если у нас есть доступный +B возьмём его себе, мы же бот.
|
||||||
|
announced, _ := availableUserModes.Get("announced")
|
||||||
|
botFlag, _ := availableUserModes.Get("B")
|
||||||
|
|
||||||
|
if announced {
|
||||||
|
if botFlag {
|
||||||
|
log.Info("Grabbing +B flag to mark me as bot")
|
||||||
|
ircClient.Mode(ircClient.GetNick(), "+B")
|
||||||
|
// TODO: Wait for it.
|
||||||
|
} else {
|
||||||
|
log.Info("Skip +B flag, server does not support it, noone will know that I am bot")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Этого по идее не должно быть.
|
||||||
|
log.Info("Skip +B flag, server did not announce modes (yet?), noone will know that I am bot")
|
||||||
|
}
|
||||||
|
|
||||||
|
if !config.Irc.Sasl && config.Irc.Password != "" && !nickIsUsed {
|
||||||
|
log.Info("Identifying via NickServ")
|
||||||
|
|
||||||
|
message := fmt.Sprintf("identify %s %s", config.Irc.Nick, config.Irc.Password)
|
||||||
|
imChan <- iMsg{ChatID: "NickServ", Text: message}
|
||||||
|
}
|
||||||
|
// TODO: wait until +R flag been set? could be implemented with waiting for channel message.
|
||||||
|
|
||||||
|
log.Debug("Trying to join to preconfigured channels")
|
||||||
|
|
||||||
|
for _, channel := range config.Irc.Channels {
|
||||||
|
log.Infof("Joining to %s channel", channel)
|
||||||
|
ircClient.Join(channel)
|
||||||
|
}
|
||||||
|
// TODO: wait for join or join error.
|
||||||
})
|
})
|
||||||
|
|
||||||
// Навесим коллбэков на все возможные и невозможные error status code, которые мы можем получить и сдампим это
|
// Навесим коллбэков на все возможные и невозможные error status code, которые мы можем получить и сдампим это
|
||||||
@@ -157,6 +231,39 @@ func ircClientRun() {
|
|||||||
log.Errorf("421 ERR_UNKNOWNCOMMAND, %s", e.Raw)
|
log.Errorf("421 ERR_UNKNOWNCOMMAND, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Аналогичный коллбэк висит на 376 RPL_ENDOFMOTD.
|
||||||
|
ircClient.AddCallback("422", func(e *irc.Event) {
|
||||||
|
// TODO: make use of modes https://defs.ircdocs.horse/defs/usermodes
|
||||||
|
// Если у нас есть доступный +B возьмём его себе, мы же бот.
|
||||||
|
botFlag, ok := availableUserModes.Get("B")
|
||||||
|
|
||||||
|
if ok && botFlag {
|
||||||
|
log.Info("Grabbing +B flag to mark me as bot")
|
||||||
|
ircClient.Mode(ircClient.GetNick(), "+B")
|
||||||
|
} else {
|
||||||
|
if ok {
|
||||||
|
log.Info("Skip +B flag, server does not support it, noone will know that I am bot")
|
||||||
|
} else {
|
||||||
|
log.Info("Skip +B flag, server did not announce modes (yet?), noone will know that I am bot")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !config.Irc.Sasl && config.Irc.Password != "" && !nickIsUsed {
|
||||||
|
log.Info("Identifying via NickServ")
|
||||||
|
|
||||||
|
message := fmt.Sprintf("identify %s %s", config.Irc.Nick, config.Irc.Password)
|
||||||
|
imChan <- iMsg{ChatID: "NickServ", Text: message}
|
||||||
|
}
|
||||||
|
// TODO: wait until +R flag been set? could be implemented with waiting for channel message.
|
||||||
|
|
||||||
|
log.Debug("Trying to join to preconfigured channels")
|
||||||
|
|
||||||
|
for _, channel := range config.Irc.Channels {
|
||||||
|
log.Infof("Joining to %s channel", channel)
|
||||||
|
ircClient.Join(channel)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("431", func(e *irc.Event) {
|
ircClient.AddCallback("431", func(e *irc.Event) {
|
||||||
log.Errorf("431 ERR_NONICKNAMEGIVEN, %s", e.Raw)
|
log.Errorf("431 ERR_NONICKNAMEGIVEN, %s", e.Raw)
|
||||||
})
|
})
|
||||||
@@ -167,8 +274,11 @@ func ircClientRun() {
|
|||||||
|
|
||||||
ircClient.AddCallback("433", func(e *irc.Event) {
|
ircClient.AddCallback("433", func(e *irc.Event) {
|
||||||
log.Errorf("433 ERR_NICKNAMEINUSE, %s", e.Raw)
|
log.Errorf("433 ERR_NICKNAMEINUSE, %s", e.Raw)
|
||||||
|
|
||||||
nickIsUsed = true
|
nickIsUsed = true
|
||||||
time.Sleep(60 * time.Second)
|
|
||||||
|
<-time.NewTimer(60 * time.Second).C // 1 minute sleep.
|
||||||
|
|
||||||
ircClient.Nick(config.Irc.Nick)
|
ircClient.Nick(config.Irc.Nick)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -179,6 +289,7 @@ func ircClientRun() {
|
|||||||
log.Errorf("436 ERR_NICKCOLLISION, %s", e.Raw)
|
log.Errorf("436 ERR_NICKCOLLISION, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// 437: ERR_UNAVAILRESOURCE уже есть в github.com/thoj/go-ircevent/irc_callback.go.
|
||||||
ircClient.AddCallback("437", func(e *irc.Event) {
|
ircClient.AddCallback("437", func(e *irc.Event) {
|
||||||
log.Errorf("437 ERR_UNAVAILRESOURCE, %s", e.Raw)
|
log.Errorf("437 ERR_UNAVAILRESOURCE, %s", e.Raw)
|
||||||
})
|
})
|
||||||
@@ -191,6 +302,16 @@ func ircClientRun() {
|
|||||||
log.Warnf("442 ERR_NOTONCHANNEL, %s", e.Raw)
|
log.Warnf("442 ERR_NOTONCHANNEL, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("443", func(e *irc.Event) {
|
||||||
|
// Returned when a client tries to invite a user to a channel they're already on.
|
||||||
|
log.Errorf("443 ERR_USERONCHANNEL, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("446", func(e *irc.Event) {
|
||||||
|
// Returned by USERS when it has been disabled or not implemented.
|
||||||
|
log.Errorf("446 ERR_USERSDISABLED, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("451", func(e *irc.Event) {
|
ircClient.AddCallback("451", func(e *irc.Event) {
|
||||||
// Предполагается, что надо авторизоваться, перед тем как что-то делать на сервере
|
// Предполагается, что надо авторизоваться, перед тем как что-то делать на сервере
|
||||||
log.Errorf("451 ERR_NOTREGISTERED, %s", e.Raw)
|
log.Errorf("451 ERR_NOTREGISTERED, %s", e.Raw)
|
||||||
@@ -213,18 +334,19 @@ func ircClientRun() {
|
|||||||
log.Errorf("465 ERR_YOUREBANNEDCREEP, %s", e.Raw)
|
log.Errorf("465 ERR_YOUREBANNEDCREEP, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("467", func(e *irc.Event) {
|
||||||
|
log.Errorf("467 ERR_KEYSET, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("471", func(e *irc.Event) {
|
ircClient.AddCallback("471", func(e *irc.Event) {
|
||||||
// Это значит, что народу на канале максимальное количество. Будем пробовать присунуться раз в 30 сек.
|
// Это значит, что народу на канале максимальное количество. Будем пробовать присунуться раз в 30 сек.
|
||||||
channel := e.Arguments[1]
|
channel := e.Arguments[1]
|
||||||
log.Warnf("471 ERR_CHANNELISFULL, %s", e.Raw)
|
log.Warnf("471 ERR_CHANNELISFULL, %s", e.Raw)
|
||||||
time.Sleep(30 * time.Second)
|
<-time.NewTimer(30 * time.Second).C
|
||||||
|
|
||||||
// Проверяем, а должны ли мы быть заджоенныеми к указанному, каналу, а то вдруг нет?
|
// Проверяем, а должны ли мы быть заджоенныеми к указанному, каналу, а то вдруг нет?
|
||||||
for _, ircChan := range config.Irc.Channels {
|
if slices.Contains(config.Irc.Channels, channel) {
|
||||||
if ircChan == channel {
|
ircClient.Join(channel)
|
||||||
ircClient.Join(channel)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -237,14 +359,11 @@ func ircClientRun() {
|
|||||||
// По завершении работ +i снимают.
|
// По завершении работ +i снимают.
|
||||||
channel := e.Arguments[1]
|
channel := e.Arguments[1]
|
||||||
log.Errorf("473 ERR_INVITEONLYCHAN, %s", e.Raw)
|
log.Errorf("473 ERR_INVITEONLYCHAN, %s", e.Raw)
|
||||||
time.Sleep(30 * time.Second)
|
<-time.NewTimer(30 * time.Second).C
|
||||||
|
|
||||||
// Проверяем, а должны ли мы быть заджоенныеми к указанному, каналу, а то вдруг нет?
|
// Проверяем, а должны ли мы быть заджоенными к указанному, каналу, а то вдруг нет?
|
||||||
for _, ircChan := range config.Irc.Channels {
|
if slices.Contains(config.Irc.Channels, channel) {
|
||||||
if ircChan == channel {
|
ircClient.Join(channel)
|
||||||
ircClient.Join(channel)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -254,18 +373,21 @@ func ircClientRun() {
|
|||||||
|
|
||||||
log.Errorf("474 ERR_BANNEDFROMCHAN, %s", e.Raw)
|
log.Errorf("474 ERR_BANNEDFROMCHAN, %s", e.Raw)
|
||||||
// Если нас забанили, то информацию о MODE-ах пользователей мы теряем
|
// Если нас забанили, то информацию о MODE-ах пользователей мы теряем
|
||||||
time.Sleep(30 * time.Second)
|
<-time.NewTimer(30 * time.Second).C
|
||||||
|
|
||||||
// Вдруг, нас забанили, но какбэ не навсегда?
|
// Вдруг, нас забанили, но какбэ не навсегда?
|
||||||
|
// TODO: вынести в настройки?
|
||||||
|
|
||||||
// Проверяем, а должны ли мы быть заджоенныеми к указанному, каналу, а то вдруг нет?
|
// Проверяем, а должны ли мы быть заджоенныеми к указанному, каналу, а то вдруг нет?
|
||||||
for _, ircChan := range config.Irc.Channels {
|
if slices.Contains(config.Irc.Channels, channel) {
|
||||||
if ircChan == channel {
|
ircClient.Join(channel)
|
||||||
ircClient.Join(channel)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("475", func(e *irc.Event) {
|
||||||
|
log.Errorf("475 ERR_BADCHANNELKEY, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("477", func(e *irc.Event) {
|
ircClient.AddCallback("477", func(e *irc.Event) {
|
||||||
log.Errorf("477 ERR_NOCHANMODES, %s", e.Raw)
|
log.Errorf("477 ERR_NOCHANMODES, %s", e.Raw)
|
||||||
})
|
})
|
||||||
@@ -274,6 +396,10 @@ func ircClientRun() {
|
|||||||
log.Errorf("478 ERR_BANLISTFULL, %s", e.Raw)
|
log.Errorf("478 ERR_BANLISTFULL, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("481", func(e *irc.Event) {
|
||||||
|
log.Errorf("481 ERR_NOPRIVILEGES, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("482", func(e *irc.Event) {
|
ircClient.AddCallback("482", func(e *irc.Event) {
|
||||||
log.Errorf("482 ERR_CHANOPRIVSNEEDED, %s", e.Raw)
|
log.Errorf("482 ERR_CHANOPRIVSNEEDED, %s", e.Raw)
|
||||||
})
|
})
|
||||||
@@ -286,6 +412,10 @@ func ircClientRun() {
|
|||||||
log.Errorf("485 ERR_UNIQOPPRIVSNEEDED, %s", e.Raw)
|
log.Errorf("485 ERR_UNIQOPPRIVSNEEDED, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
ircClient.AddCallback("491", func(e *irc.Event) {
|
||||||
|
log.Errorf("491 ERR_NOOPERHOST, %s", e.Raw)
|
||||||
|
})
|
||||||
|
|
||||||
ircClient.AddCallback("501", func(e *irc.Event) {
|
ircClient.AddCallback("501", func(e *irc.Event) {
|
||||||
log.Errorf("501 ERR_UMODEUNKNOWNFLAG, %s", e.Raw)
|
log.Errorf("501 ERR_UMODEUNKNOWNFLAG, %s", e.Raw)
|
||||||
})
|
})
|
||||||
@@ -294,22 +424,6 @@ func ircClientRun() {
|
|||||||
log.Errorf("502 ERR_USERSDONTMATCH, %s", e.Raw)
|
log.Errorf("502 ERR_USERSDONTMATCH, %s", e.Raw)
|
||||||
})
|
})
|
||||||
|
|
||||||
// Сделаем уже что-то полезное! Motd нам уже прислали и теперь можно авторизоваться и джойниться
|
|
||||||
ircClient.AddCallback("001", func(e *irc.Event) {
|
|
||||||
if !config.Irc.Sasl && config.Irc.Password != "" && !nickIsUsed {
|
|
||||||
log.Info("Identifying via NickServ")
|
|
||||||
message := fmt.Sprintf("identify %s %s", config.Irc.Nick, config.Irc.Password)
|
|
||||||
imChan <- iMsg{ChatId: "NickServ", Text: message}
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Debug("Trying to join to preconfigured channels")
|
|
||||||
|
|
||||||
for _, channel := range config.Irc.Channels {
|
|
||||||
log.Infof("Joining to %s channel", channel)
|
|
||||||
ircClient.Join(channel)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
// Навесим коллбэков на другие, интересные нам события
|
// Навесим коллбэков на другие, интересные нам события
|
||||||
ircClient.AddCallback("KICK", func(e *irc.Event) {
|
ircClient.AddCallback("KICK", func(e *irc.Event) {
|
||||||
dstNick := e.Arguments[1]
|
dstNick := e.Arguments[1]
|
||||||
@@ -321,7 +435,8 @@ func ircClientRun() {
|
|||||||
userMode.Delete(channel)
|
userMode.Delete(channel)
|
||||||
// TODO: reason?
|
// TODO: reason?
|
||||||
log.Warnf("%s kicks us from %s", srcFullNick, channel)
|
log.Warnf("%s kicks us from %s", srcFullNick, channel)
|
||||||
time.Sleep(10 * time.Second)
|
<-time.NewTimer(10 * time.Second).C
|
||||||
|
|
||||||
ircClient.Join(channel)
|
ircClient.Join(channel)
|
||||||
} else {
|
} else {
|
||||||
// Кого-то другого кикнули с канала
|
// Кого-то другого кикнули с канала
|
||||||
@@ -341,14 +456,15 @@ func ircClientRun() {
|
|||||||
log.Warn("I regain my nick")
|
log.Warn("I regain my nick")
|
||||||
} else {
|
} else {
|
||||||
log.Warn("I regain my nick, trying to identify myself via NickServ")
|
log.Warn("I regain my nick, trying to identify myself via NickServ")
|
||||||
|
|
||||||
message := fmt.Sprintf("identify %s %s", config.Irc.Nick, config.Irc.Password)
|
message := fmt.Sprintf("identify %s %s", config.Irc.Nick, config.Irc.Password)
|
||||||
imChan <- iMsg{ChatId: "NickServ", Text: message}
|
imChan <- iMsg{ChatID: "NickServ", Text: message}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Infof("%s renames themself to %s", srcNick, dstNick)
|
log.Infof("%s renames themself to %s", srcNick, dstNick)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Неважно чей ник сменился, надо забыть, что было и снова узнать mode-ы сменишего nick джентельмена
|
// Неважно чей ник сменился, надо забыть, что было и снова узнать mode-ы сменишего nick джентельмена.
|
||||||
// TODO: реализовать userModeRenameUser()
|
// TODO: реализовать userModeRenameUser()
|
||||||
userModePurgeUser(srcNick)
|
userModePurgeUser(srcNick)
|
||||||
ircClient.Whois(dstNick)
|
ircClient.Whois(dstNick)
|
||||||
@@ -360,12 +476,12 @@ func ircClientRun() {
|
|||||||
channel := e.Arguments[0]
|
channel := e.Arguments[0]
|
||||||
|
|
||||||
if nick == ircClient.GetNick() {
|
if nick == ircClient.GetNick() {
|
||||||
|
// Команда names отправляется автоматом.
|
||||||
log.Infof("I joined to %s", channel)
|
log.Infof("I joined to %s", channel)
|
||||||
// Команда names отправляется автоматом
|
|
||||||
} else {
|
} else {
|
||||||
log.Infof("%s joined to %s", fullNick, channel)
|
log.Infof("%s joined to %s", fullNick, channel)
|
||||||
// Технически, тут не надо спрашивать whois на пользователя, но мы спрашиваем, чтобы уточнить mode,
|
// Технически, тут не надо спрашивать whois на пользователя, но мы спрашиваем, чтобы уточнить mode,
|
||||||
// вдруг сервер проставляет mode заранее (хотя не должен)
|
// вдруг сервер проставляет mode заранее (хотя не должен).
|
||||||
ircClient.Whois(nick)
|
ircClient.Whois(nick)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -403,6 +519,7 @@ func ircClientRun() {
|
|||||||
channel := e.Arguments[0]
|
channel := e.Arguments[0]
|
||||||
fullSrcNick := e.Source
|
fullSrcNick := e.Source
|
||||||
srcNick := e.Nick
|
srcNick := e.Nick
|
||||||
|
|
||||||
var dstNick string
|
var dstNick string
|
||||||
|
|
||||||
if len(e.Arguments) >= 3 { // кого-то по-MODE-или на канале
|
if len(e.Arguments) >= 3 { // кого-то по-MODE-или на канале
|
||||||
@@ -415,6 +532,7 @@ func ircClientRun() {
|
|||||||
}
|
}
|
||||||
} else { // Установка mode-а при заходе на сервер
|
} else { // Установка mode-а при заходе на сервер
|
||||||
dstNick = e.Arguments[0]
|
dstNick = e.Arguments[0]
|
||||||
|
|
||||||
log.Infof("Server set my mode to %s", mode)
|
log.Infof("Server set my mode to %s", mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,17 +572,16 @@ func ircClientRun() {
|
|||||||
ircMsgParser(e.Arguments[0], e.Nick, e.User, e.Source, e.Arguments[1])
|
ircMsgParser(e.Arguments[0], e.Nick, e.User, e.Source, e.Arguments[1])
|
||||||
})
|
})
|
||||||
|
|
||||||
/*
|
ircClient.AddCallback("*", func(e *irc.Event) {
|
||||||
ircClient.AddCallback("*", func(e *irc.Event) {
|
log.Debugf("Incoming EVENT (Raw): %s", e.Raw)
|
||||||
log.Debugf("Incoming EVENT (Raw): %s", e.Raw)
|
})
|
||||||
})
|
|
||||||
*/
|
|
||||||
|
|
||||||
log.Debugf("Make an actual connection to irc")
|
log.Debugf("Make an actual connection to irc")
|
||||||
|
|
||||||
if err := ircClient.Connect(serverString); err != nil {
|
if err := ircClient.Connect(serverString); err != nil {
|
||||||
log.Fatalf("Unable to prepare irc connection: %s", err)
|
log.Errorf("Unable to prepare irc connection: %s", err)
|
||||||
time.Sleep(3 * time.Second)
|
<-time.NewTimer(3 * time.Second).C // Sleep for 3 seconds.
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -478,21 +595,22 @@ func ircSend() {
|
|||||||
for {
|
for {
|
||||||
m := <-imChan
|
m := <-imChan
|
||||||
|
|
||||||
switch {
|
switch config.Irc.RateLimit.Type {
|
||||||
case config.Irc.RateLimit.Type == "simple_delay":
|
case "simple_delay":
|
||||||
log.Debugf("Sending to chat %s message: %s", m.ChatId, m.Text)
|
log.Debugf("Sending to chat %s message: %s", m.ChatID, m.Text)
|
||||||
|
|
||||||
if m.Text[0:4] == "/me " {
|
if m.Text[0:4] == "/me " {
|
||||||
ircClient.Action(m.ChatId, m.Text)
|
ircClient.Action(m.ChatID, m.Text)
|
||||||
} else {
|
} else {
|
||||||
ircClient.Privmsg(m.ChatId, m.Text)
|
ircClient.Privmsg(m.ChatID, m.Text)
|
||||||
}
|
}
|
||||||
|
|
||||||
sleepDelay := time.Duration(config.Irc.RateLimit.SimpleDelay) * time.Millisecond
|
sleepDelay := time.Duration(config.Irc.RateLimit.SimpleDelay) * time.Millisecond
|
||||||
log.Debugf("Due to delay type simple_delay waiting for %d milliseconds", int(sleepDelay))
|
log.Debugf("Due to delay type simple_delay waiting for %d milliseconds", int(sleepDelay))
|
||||||
time.Sleep(sleepDelay)
|
<-time.NewTimer(sleepDelay).C
|
||||||
case config.Irc.RateLimit.Type == "token_bucket":
|
case "token_bucket":
|
||||||
var currentTimeMs = time.Now().UnixMilli()
|
var currentTimeMs = time.Now().UnixMilli()
|
||||||
|
|
||||||
var expirationTimeMs = config.Irc.RateLimit.TokenBucket.ExpirationTime * 1000
|
var expirationTimeMs = config.Irc.RateLimit.TokenBucket.ExpirationTime * 1000
|
||||||
|
|
||||||
if len(msgBucket.Timestamps) > 0 {
|
if len(msgBucket.Timestamps) > 0 {
|
||||||
@@ -506,6 +624,7 @@ func ircSend() {
|
|||||||
|
|
||||||
bucketFill := len(newBucket.Timestamps)
|
bucketFill := len(newBucket.Timestamps)
|
||||||
log.Debugf("Message bucket filled with %d/%d messages", bucketFill, config.Irc.RateLimit.TokenBucket.Size)
|
log.Debugf("Message bucket filled with %d/%d messages", bucketFill, config.Irc.RateLimit.TokenBucket.Size)
|
||||||
|
|
||||||
newBucket.Timestamps = append(newBucket.Timestamps, currentTimeMs)
|
newBucket.Timestamps = append(newBucket.Timestamps, currentTimeMs)
|
||||||
|
|
||||||
if bucketFill >= config.Irc.RateLimit.TokenBucket.Size {
|
if bucketFill >= config.Irc.RateLimit.TokenBucket.Size {
|
||||||
@@ -516,38 +635,41 @@ func ircSend() {
|
|||||||
} else {
|
} else {
|
||||||
// Проставим время отправки сообщения
|
// Проставим время отправки сообщения
|
||||||
log.Debug("Message bucket is empty")
|
log.Debug("Message bucket is empty")
|
||||||
|
|
||||||
msgBucket.Timestamps = append(msgBucket.Timestamps, currentTimeMs)
|
msgBucket.Timestamps = append(msgBucket.Timestamps, currentTimeMs)
|
||||||
}
|
}
|
||||||
|
|
||||||
if msgBucket.IsFull {
|
if msgBucket.IsFull {
|
||||||
log.Debug("Message bucket overflowed, hitting ratelimit")
|
log.Debug("Message bucket overflowed, hitting ratelimit")
|
||||||
|
|
||||||
sleepPeriod := expirationTimeMs - (currentTimeMs - msgBucket.Timestamps[len(msgBucket.Timestamps)-1])
|
sleepPeriod := expirationTimeMs - (currentTimeMs - msgBucket.Timestamps[len(msgBucket.Timestamps)-1])
|
||||||
|
|
||||||
if config.Irc.RateLimit.TokenBucket.Limit > 0 {
|
if config.Irc.RateLimit.TokenBucket.Limit > 0 {
|
||||||
sleepPeriod = sleepPeriod / int64(config.Irc.RateLimit.TokenBucket.Limit)
|
sleepPeriod /= int64(config.Irc.RateLimit.TokenBucket.Limit)
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debugf("Sleeping for %d milliseconds", sleepPeriod)
|
log.Debugf("Sleeping for %d milliseconds", sleepPeriod)
|
||||||
time.Sleep(time.Duration(sleepPeriod) * time.Millisecond)
|
<-time.NewTimer(time.Duration(sleepPeriod) * time.Millisecond).C
|
||||||
|
|
||||||
currentTimeMs = time.Now().UnixMilli()
|
currentTimeMs = time.Now().UnixMilli()
|
||||||
// Обновим время отправки сообщения
|
// Обновим время отправки сообщения
|
||||||
msgBucket.Timestamps[len(msgBucket.Timestamps)-1] = currentTimeMs
|
msgBucket.Timestamps[len(msgBucket.Timestamps)-1] = currentTimeMs
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Debugf("Sending to chat %s message: %s", m.ChatId, m.Text)
|
log.Debugf("Sending to chat %s message: %s", m.ChatID, m.Text)
|
||||||
|
|
||||||
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
||||||
ircClient.Action(m.ChatId, m.Text[4:])
|
ircClient.Action(m.ChatID, m.Text[4:])
|
||||||
} else {
|
} else {
|
||||||
ircClient.Privmsg(m.ChatId, m.Text)
|
ircClient.Privmsg(m.ChatID, m.Text)
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
log.Debugf("Sending to chat %s message: %s", m.ChatId, m.Text)
|
log.Debugf("Sending to chat %s message: %s", m.ChatID, m.Text)
|
||||||
|
|
||||||
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
||||||
ircClient.Action(m.ChatId, m.Text[4:])
|
ircClient.Action(m.ChatID, m.Text[4:])
|
||||||
} else {
|
} else {
|
||||||
ircClient.Privmsg(m.ChatId, m.Text)
|
ircClient.Privmsg(m.ChatID, m.Text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -556,12 +678,12 @@ func ircSend() {
|
|||||||
func ircSendUnrestricted() {
|
func ircSendUnrestricted() {
|
||||||
for {
|
for {
|
||||||
m := <-imChanUnrestricted
|
m := <-imChanUnrestricted
|
||||||
log.Debugf("Skipping ratelimit and sending to chat %s message: %s", m.ChatId, m.Text)
|
log.Debugf("Skipping ratelimit and sending to chat %s message: %s", m.ChatID, m.Text)
|
||||||
|
|
||||||
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
if len(m.Text) > 4 && m.Text[0:4] == "/me " {
|
||||||
ircClient.Action(m.ChatId, m.Text[4:])
|
ircClient.Action(m.ChatID, m.Text[4:])
|
||||||
} else {
|
} else {
|
||||||
ircClient.Privmsg(m.ChatId, m.Text)
|
ircClient.Privmsg(m.ChatID, m.Text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
35
globals.go
35
globals.go
@@ -4,47 +4,56 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
|
"aleesa-irc-go/internal/anycollection"
|
||||||
|
"aleesa-irc-go/internal/boolcollection"
|
||||||
|
|
||||||
"github.com/cockroachdb/pebble"
|
"github.com/cockroachdb/pebble"
|
||||||
"github.com/go-redis/redis/v8"
|
"github.com/go-redis/redis/v8"
|
||||||
irc "github.com/thoj/go-ircevent"
|
irc "github.com/thoj/go-ircevent"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Config - это у нас глобальная штука :)
|
// Config - это у нас глобальная штука :).
|
||||||
var config myConfig
|
var config myConfig
|
||||||
|
|
||||||
// To break circular message forwarding we must set some sane default, it can be overridden via config
|
// To break circular message forwarding we must set some sane default, it can be overridden via config.
|
||||||
var forwardMax int64 = 5
|
var forwardMax int64 = 5
|
||||||
|
|
||||||
// Объектики irc-клиента
|
// Объектики irc-клиента.
|
||||||
var ircClient *irc.Connection
|
var ircClient *irc.Connection
|
||||||
var nickIsUsed = false
|
var nickIsUsed = false
|
||||||
|
|
||||||
// Объектики клиента-редиски
|
// Объектики клиента-редиски.
|
||||||
var redisClient *redis.Client
|
var redisClient *redis.Client
|
||||||
var subscriber *redis.PubSub
|
var subscriber *redis.PubSub
|
||||||
|
|
||||||
// Main context
|
// Main context.
|
||||||
var ctx = context.Background()
|
var ctx = context.Background()
|
||||||
|
|
||||||
// Ставится в true, если мы получили сигнал на выключение
|
// Ставится в true, если мы получили сигнал на выключение.
|
||||||
var shutdown = false
|
var shutdown = false
|
||||||
|
|
||||||
// Канал, в который приходят уведомления для хэндлера сигналов от траппера сигналов
|
// Канал, в который приходят уведомления для хэндлера сигналов от траппера сигналов.
|
||||||
var sigChan = make(chan os.Signal, 1)
|
var sigChan = make(chan os.Signal, 1)
|
||||||
|
|
||||||
// Канал, в который пишутся сообщения для отправки в IRC в обычном порядке
|
// Канал, в который пишутся сообщения для отправки в IRC в обычном порядке.
|
||||||
var imChan = make(chan iMsg, 10000)
|
var imChan = make(chan iMsg, 10000)
|
||||||
|
|
||||||
// Канал, в который пишутся сообщения для отправки в IRC, если ограничений нет (у бота +o или +v на канале)
|
// Канал, в который пишутся сообщения для отправки в IRC, если ограничений нет (у бота +o или +v на канале).
|
||||||
var imChanUnrestricted = make(chan iMsg, 100)
|
var imChanUnrestricted = make(chan iMsg, 100)
|
||||||
|
|
||||||
// "Ведёрко" с timestamp-ами последних отправленных сообщений
|
// "Ведёрко" с timestamp-ами последних отправленных сообщений.
|
||||||
var msgBucket bucket
|
var msgBucket bucket
|
||||||
|
|
||||||
// Мапка с открытыми дескрипторами баз с настройками
|
// Мапка с открытыми дескрипторами баз с настройками.
|
||||||
var settingsDB = make(map[string]*pebble.DB)
|
var settingsDB = make(map[string]*pebble.DB)
|
||||||
|
|
||||||
// "Базюлька" с MODE-ами пользователей на каналах
|
// "Базюлька" с MODE-ами пользователей на каналах.
|
||||||
var userMode = NewCollection()
|
var userMode = anycollection.NewCollection()
|
||||||
|
|
||||||
|
// "Базюлька" с доступными MODE-ами пользователя.
|
||||||
|
var availableUserModes = boolcollection.NewCollection()
|
||||||
|
|
||||||
|
// "Базюлька" c с доступными MODE-ами каналов.
|
||||||
|
var availableChanModes = boolcollection.NewCollection()
|
||||||
|
|
||||||
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
47
go.mod
47
go.mod
@@ -1,40 +1,43 @@
|
|||||||
module aleesa-irc-go
|
module aleesa-irc-go
|
||||||
|
|
||||||
go 1.19
|
go 1.22.0
|
||||||
|
|
||||||
|
toolchain go1.23.4
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/cockroachdb/errors v1.9.0
|
github.com/cockroachdb/errors v1.11.3
|
||||||
github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861
|
github.com/cockroachdb/pebble v1.1.4
|
||||||
github.com/go-redis/redis/v8 v8.11.5
|
github.com/go-redis/redis/v8 v8.11.5
|
||||||
github.com/hjson/hjson-go v3.3.0+incompatible
|
github.com/hjson/hjson-go v3.3.0+incompatible
|
||||||
github.com/sirupsen/logrus v1.9.0
|
github.com/sirupsen/logrus v1.9.3
|
||||||
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64
|
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/DataDog/zstd v1.5.2 // indirect
|
github.com/DataDog/zstd v1.5.6 // indirect
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
github.com/beorn7/perks v1.0.1 // indirect
|
||||||
github.com/cespare/xxhash/v2 v2.1.2 // indirect
|
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
||||||
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
|
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
|
||||||
github.com/cockroachdb/redact v1.1.3 // indirect
|
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
|
||||||
|
github.com/cockroachdb/redact v1.1.6 // indirect
|
||||||
|
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
||||||
github.com/getsentry/sentry-go v0.14.0 // indirect
|
github.com/getsentry/sentry-go v0.31.1 // indirect
|
||||||
github.com/gogo/protobuf v1.3.2 // indirect
|
github.com/gogo/protobuf v1.3.2 // indirect
|
||||||
github.com/golang/protobuf v1.5.2 // indirect
|
|
||||||
github.com/golang/snappy v0.0.4 // indirect
|
github.com/golang/snappy v0.0.4 // indirect
|
||||||
github.com/klauspost/compress v1.15.12 // indirect
|
github.com/klauspost/compress v1.17.11 // indirect
|
||||||
github.com/kr/pretty v0.3.1 // indirect
|
github.com/kr/pretty v0.3.1 // indirect
|
||||||
github.com/kr/text v0.2.0 // indirect
|
github.com/kr/text v0.2.0 // indirect
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/prometheus/client_golang v1.13.1 // indirect
|
github.com/prometheus/client_golang v1.20.5 // indirect
|
||||||
github.com/prometheus/client_model v0.3.0 // indirect
|
github.com/prometheus/client_model v0.6.1 // indirect
|
||||||
github.com/prometheus/common v0.37.0 // indirect
|
github.com/prometheus/common v0.62.0 // indirect
|
||||||
github.com/prometheus/procfs v0.8.0 // indirect
|
github.com/prometheus/procfs v0.15.1 // indirect
|
||||||
github.com/rogpeppe/go-internal v1.9.0 // indirect
|
github.com/rogpeppe/go-internal v1.13.1 // indirect
|
||||||
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect
|
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
|
||||||
golang.org/x/net v0.1.0 // indirect
|
golang.org/x/net v0.34.0 // indirect
|
||||||
golang.org/x/sys v0.1.0 // indirect
|
golang.org/x/sys v0.30.0 // indirect
|
||||||
golang.org/x/text v0.4.0 // indirect
|
golang.org/x/text v0.22.0 // indirect
|
||||||
google.golang.org/protobuf v1.28.1 // indirect
|
google.golang.org/protobuf v1.36.5 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
739
go.sum
739
go.sum
@@ -1,760 +1,139 @@
|
|||||||
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY=
|
||||||
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
|
github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
|
||||||
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
|
|
||||||
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
|
|
||||||
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
|
|
||||||
cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
|
|
||||||
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
|
|
||||||
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
|
|
||||||
cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
|
|
||||||
cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
|
|
||||||
cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
|
|
||||||
cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
|
|
||||||
cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
|
|
||||||
cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
|
|
||||||
cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
|
|
||||||
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
|
|
||||||
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
|
|
||||||
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
|
|
||||||
cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
|
|
||||||
cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
|
|
||||||
cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
|
|
||||||
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
|
|
||||||
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
|
|
||||||
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
|
|
||||||
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
|
|
||||||
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
|
|
||||||
cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
|
|
||||||
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
|
|
||||||
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
|
|
||||||
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
|
|
||||||
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
|
|
||||||
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
|
|
||||||
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
|
|
||||||
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
|
|
||||||
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
|
|
||||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
|
||||||
github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw=
|
|
||||||
github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
|
|
||||||
github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w=
|
|
||||||
github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
|
|
||||||
github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
|
|
||||||
github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
|
|
||||||
github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
|
|
||||||
github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM=
|
|
||||||
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
|
|
||||||
github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
|
|
||||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
|
||||||
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
|
||||||
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
|
||||||
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
|
|
||||||
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
|
|
||||||
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
|
|
||||||
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
|
|
||||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
|
||||||
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
|
|
||||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
||||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
||||||
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
|
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
||||||
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
||||||
github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
|
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
|
||||||
github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
|
||||||
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
|
github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
|
||||||
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
|
github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8=
|
||||||
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
|
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 h1:pU88SPhIFid6/k0egdR5V6eALQYq2qbSmukrkgIh/0A=
|
||||||
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
|
github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
|
||||||
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
|
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILMqgNeV5jiqR4j+sTuvQNHdf2chuKj1M5k=
|
||||||
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
|
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
|
||||||
github.com/cockroachdb/datadriven v1.0.1-0.20211007161720-b558070c3be0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4=
|
github.com/cockroachdb/pebble v1.1.4 h1:5II1uEP4MyHLDnsrbv/EZ36arcb9Mxg3n+owhZ3GrG8=
|
||||||
github.com/cockroachdb/datadriven v1.0.1-0.20220214170620-9913f5bc19b7/go.mod h1:hi0MtSY3AYDQNDi83kDkMH5/yqM/CsIrsOITkSoH7KI=
|
github.com/cockroachdb/pebble v1.1.4/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU=
|
||||||
github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
|
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
|
||||||
github.com/cockroachdb/errors v1.8.8/go.mod h1:z6VnEL3hZ/2ONZEvG7S5Ym0bU2AqPcEKnIiA1wbsSu0=
|
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
|
||||||
github.com/cockroachdb/errors v1.9.0 h1:B48dYem5SlAY7iU8AKsgedb4gH6mo+bDkbtLIvM/a88=
|
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
|
||||||
github.com/cockroachdb/errors v1.9.0/go.mod h1:vaNcEYYqbIqB5JhKBhFV9CneUqeuEbB2OYJBK4GBNYQ=
|
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
|
||||||
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
|
|
||||||
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74=
|
|
||||||
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
|
|
||||||
github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861 h1:YarvrMA6pv032mYkBakTCkzqKpatcAZrdIknHJv+yVg=
|
|
||||||
github.com/cockroachdb/pebble v0.0.0-20221103174942-7486bbcf2861/go.mod h1:qf9bLis2yy1XyNYD01wvIHPabuC1STzQsvGibYVsom4=
|
|
||||||
github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
|
|
||||||
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
|
|
||||||
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
|
|
||||||
github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
|
|
||||||
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
|
|
||||||
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
|
|
||||||
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
|
|
||||||
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
|
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
|
|
||||||
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
|
||||||
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
||||||
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
|
|
||||||
github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
|
|
||||||
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
|
||||||
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
|
|
||||||
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
|
|
||||||
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
|
|
||||||
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
|
|
||||||
github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
|
|
||||||
github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
|
|
||||||
github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
|
|
||||||
github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA=
|
|
||||||
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
|
|
||||||
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
|
||||||
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
|
||||||
github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
|
github.com/getsentry/sentry-go v0.31.1 h1:ELVc0h7gwyhnXHDouXkhqTFSO5oslsRDk0++eyE0KJ4=
|
||||||
github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c=
|
github.com/getsentry/sentry-go v0.31.1/go.mod h1:CYNcMMz73YigoHljQRG+qPF+eMq8gG72XcGN/p71BAY=
|
||||||
github.com/getsentry/sentry-go v0.14.0 h1:rlOBkuFZRKKdUnKO+0U3JclRDQKlRu5vVQtkWSQvC70=
|
|
||||||
github.com/getsentry/sentry-go v0.14.0/go.mod h1:RZPJKSw+adu8PBNygiri/A98FqVr2HtRckJk9XVxJ9I=
|
|
||||||
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
|
|
||||||
github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
|
|
||||||
github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
|
|
||||||
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
|
|
||||||
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
||||||
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
|
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
|
||||||
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
|
|
||||||
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
|
||||||
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
|
|
||||||
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
|
|
||||||
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
|
|
||||||
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
|
|
||||||
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
|
|
||||||
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
|
|
||||||
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
|
|
||||||
github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
|
|
||||||
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
|
github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
|
||||||
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
|
github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
|
||||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
|
||||||
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
|
|
||||||
github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
|
|
||||||
github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
|
|
||||||
github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
|
|
||||||
github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
|
|
||||||
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
|
||||||
github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
|
|
||||||
github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
|
|
||||||
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
|
||||||
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
|
||||||
github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM=
|
|
||||||
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
|
|
||||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
|
||||||
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
|
||||||
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
|
||||||
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
|
||||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
|
||||||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
|
||||||
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
|
|
||||||
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
|
||||||
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
|
||||||
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
|
|
||||||
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
|
|
||||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
|
||||||
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
|
||||||
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
|
|
||||||
github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
|
|
||||||
github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
|
|
||||||
github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
|
|
||||||
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
|
|
||||||
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
|
||||||
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
|
|
||||||
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
|
|
||||||
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
|
|
||||||
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
|
|
||||||
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
|
||||||
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
|
||||||
github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
|
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||||
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||||
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
|
|
||||||
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
|
|
||||||
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
|
|
||||||
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
|
|
||||||
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
|
|
||||||
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
|
|
||||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
|
||||||
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
|
|
||||||
github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
|
|
||||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
|
||||||
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
|
||||||
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
|
||||||
github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
|
||||||
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
|
||||||
github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
|
||||||
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
|
|
||||||
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
|
|
||||||
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
|
||||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
|
||||||
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
|
|
||||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
|
||||||
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
|
||||||
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
|
||||||
github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
|
||||||
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
||||||
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
|
|
||||||
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
|
|
||||||
github.com/hjson/hjson-go v3.3.0+incompatible h1:Rqr+Ya+0aCJMjaE4s8E9YKvuJLuLVpEvz4ONum52vnI=
|
github.com/hjson/hjson-go v3.3.0+incompatible h1:Rqr+Ya+0aCJMjaE4s8E9YKvuJLuLVpEvz4ONum52vnI=
|
||||||
github.com/hjson/hjson-go v3.3.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
|
github.com/hjson/hjson-go v3.3.0+incompatible/go.mod h1:qsetwF8NlsTsOTwZTApNlTCerV+b2GjYRRcIk4JMFio=
|
||||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
|
||||||
github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
|
|
||||||
github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
|
|
||||||
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
|
|
||||||
github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
|
|
||||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
|
||||||
github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
|
|
||||||
github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
|
|
||||||
github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI=
|
|
||||||
github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
|
|
||||||
github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
|
|
||||||
github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
|
|
||||||
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
|
|
||||||
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
|
|
||||||
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
|
||||||
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
|
||||||
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
|
|
||||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
|
||||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
|
||||||
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
|
|
||||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
|
||||||
github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
|
|
||||||
github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
|
|
||||||
github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
|
|
||||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
|
||||||
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
|
|
||||||
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
|
|
||||||
github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk=
|
|
||||||
github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
|
|
||||||
github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U=
|
|
||||||
github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
|
|
||||||
github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw=
|
|
||||||
github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
|
|
||||||
github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0=
|
|
||||||
github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
|
|
||||||
github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
|
|
||||||
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
|
|
||||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||||
github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
|
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
|
||||||
github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
|
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
|
||||||
github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
|
|
||||||
github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
|
|
||||||
github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
|
|
||||||
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
|
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
|
||||||
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
|
|
||||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
|
||||||
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
|
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
||||||
github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
|
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
||||||
github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
|
|
||||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
|
||||||
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
|
|
||||||
github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
|
|
||||||
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
|
|
||||||
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
|
||||||
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
|
|
||||||
github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
|
|
||||||
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
|
||||||
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
|
|
||||||
github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
|
|
||||||
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
|
|
||||||
github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg=
|
|
||||||
github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ=
|
|
||||||
github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
|
|
||||||
github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
|
|
||||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
|
||||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
|
||||||
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
|
||||||
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
|
|
||||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
|
||||||
github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
|
|
||||||
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
|
||||||
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
|
|
||||||
github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
|
|
||||||
github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM=
|
|
||||||
github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
|
|
||||||
github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4=
|
|
||||||
github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
|
|
||||||
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
|
|
||||||
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
|
|
||||||
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
|
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
|
||||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
|
||||||
github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
|
||||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
|
||||||
github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0=
|
|
||||||
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
|
||||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
|
||||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
|
||||||
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
|
||||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
|
||||||
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
|
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
|
||||||
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
|
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
|
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
|
||||||
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
|
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
|
||||||
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
|
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
|
||||||
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
|
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
|
||||||
github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
|
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
|
||||||
github.com/prometheus/client_golang v1.13.1 h1:3gMjIY2+/hzmqhtUC/aQNYldJA6DtH3CgQvwS+02K1c=
|
github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
|
||||||
github.com/prometheus/client_golang v1.13.1/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ=
|
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
|
||||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
|
||||||
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
|
||||||
github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
|
|
||||||
github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
|
|
||||||
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
|
|
||||||
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
|
|
||||||
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
|
|
||||||
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
|
|
||||||
github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE=
|
|
||||||
github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA=
|
|
||||||
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
|
||||||
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
|
|
||||||
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
|
|
||||||
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
|
||||||
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
|
|
||||||
github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo=
|
|
||||||
github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4=
|
|
||||||
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
|
|
||||||
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
|
|
||||||
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||||
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
|
||||||
github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
|
github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
|
||||||
github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
|
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||||
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
|
|
||||||
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
|
|
||||||
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
|
|
||||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
|
||||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
|
||||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
|
||||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
|
||||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
|
||||||
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
|
|
||||||
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
|
||||||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
|
||||||
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
|
||||||
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
|
|
||||||
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
|
|
||||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
|
||||||
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
|
||||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
|
||||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
|
||||||
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
|
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||||
|
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||||
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64 h1:l/T7dYuJEQZOwVOpjIXr1180aM9PZL/d1MnMVIxefX4=
|
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64 h1:l/T7dYuJEQZOwVOpjIXr1180aM9PZL/d1MnMVIxefX4=
|
||||||
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64/go.mod h1:Q1NAJOuRdQCqN/VIWdnaaEhV8LpeO2rtlBP7/iDJNII=
|
github.com/thoj/go-ircevent v0.0.0-20210723090443-73e444401d64/go.mod h1:Q1NAJOuRdQCqN/VIWdnaaEhV8LpeO2rtlBP7/iDJNII=
|
||||||
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
|
|
||||||
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
|
|
||||||
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
|
|
||||||
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
|
|
||||||
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
|
|
||||||
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
|
||||||
github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
|
|
||||||
github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
|
|
||||||
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
|
|
||||||
github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
|
|
||||||
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
|
|
||||||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
|
||||||
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
|
|
||||||
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
|
|
||||||
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
|
|
||||||
github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
|
|
||||||
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
|
|
||||||
github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
|
|
||||||
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
|
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||||
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
|
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||||
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
|
|
||||||
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
|
||||||
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
|
||||||
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
|
||||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
|
||||||
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
||||||
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
||||||
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
|
||||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||||
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
|
||||||
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
|
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
|
||||||
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
|
||||||
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
|
|
||||||
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
|
|
||||||
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
|
|
||||||
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
|
|
||||||
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
|
||||||
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
|
||||||
golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
|
|
||||||
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
|
|
||||||
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
|
|
||||||
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE=
|
|
||||||
golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
|
|
||||||
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
|
|
||||||
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
|
||||||
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
|
||||||
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
|
|
||||||
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
|
|
||||||
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
||||||
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
||||||
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
||||||
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
|
|
||||||
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
|
|
||||||
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
|
||||||
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
|
||||||
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
|
|
||||||
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
|
|
||||||
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
|
|
||||||
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
|
|
||||||
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
|
|
||||||
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
|
||||||
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
|
|
||||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||||
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
|
||||||
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
|
||||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
|
||||||
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
|
|
||||||
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||||
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
|
|
||||||
golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
|
||||||
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
|
||||||
golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
|
|
||||||
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
|
||||||
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
|
|
||||||
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
|
||||||
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
|
||||||
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
|
||||||
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
|
|
||||||
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
|
|
||||||
golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
|
|
||||||
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
|
|
||||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||||
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
|
||||||
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||||
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8=
|
|
||||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
|
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
|
||||||
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
|
||||||
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
|
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
|
||||||
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|
||||||
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
|
||||||
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
|
||||||
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
|
||||||
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
|
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
|
|
||||||
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
||||||
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
||||||
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
||||||
golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
||||||
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
|
|
||||||
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
|
||||||
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
|
||||||
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
|
|
||||||
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
|
||||||
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
|
||||||
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
|
|
||||||
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||||
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
|
|
||||||
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
|
|
||||||
golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
|
|
||||||
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
|
|
||||||
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
|
||||||
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
|
||||||
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
|
||||||
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
|
||||||
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
|
||||||
golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
|
||||||
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
|
||||||
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
|
|
||||||
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
|
||||||
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
|
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||||
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
|
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
|
||||||
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
|
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
||||||
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
|
||||||
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
|
|
||||||
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
|
||||||
google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
|
||||||
google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
|
|
||||||
google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
|
||||||
google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
|
||||||
google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
|
||||||
google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
|
||||||
google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
|
|
||||||
google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
|
|
||||||
google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
|
|
||||||
google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
|
|
||||||
google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
|
|
||||||
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
|
|
||||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
|
||||||
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
|
||||||
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
|
|
||||||
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
|
||||||
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
|
|
||||||
google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
||||||
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
|
||||||
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
||||||
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
||||||
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
||||||
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
|
|
||||||
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
|
||||||
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
|
|
||||||
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
|
|
||||||
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
|
|
||||||
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
|
|
||||||
google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
|
|
||||||
google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
|
|
||||||
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
|
|
||||||
google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
|
|
||||||
google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
|
||||||
google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
|
||||||
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
|
|
||||||
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
|
|
||||||
google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
|
|
||||||
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
|
|
||||||
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
|
|
||||||
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
|
|
||||||
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
|
|
||||||
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
|
|
||||||
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
|
||||||
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
|
||||||
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
|
|
||||||
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
|
|
||||||
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
|
|
||||||
google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
|
|
||||||
google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
|
|
||||||
google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
|
|
||||||
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
|
|
||||||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
|
||||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
|
||||||
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
|
||||||
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
|
|
||||||
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
|
|
||||||
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
|
|
||||||
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
|
|
||||||
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
|
|
||||||
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
|
|
||||||
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
|
||||||
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
|
|
||||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
|
||||||
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
|
|
||||||
gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
|
|
||||||
gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
|
|
||||||
gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
|
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
||||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
||||||
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
||||||
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
|
||||||
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
|
|
||||||
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
|
||||||
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
|
|
||||||
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
|
|
||||||
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
|
|
||||||
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
|
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
package main
|
package anycollection
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Collection это sync.Map-ка, хранящая в себе произвольные итемы
|
// Collection это sync.Map-ка, хранящая в себе произвольные итемы.
|
||||||
type Collection struct {
|
type Collection struct {
|
||||||
items sync.Map
|
items sync.Map
|
||||||
close chan struct{}
|
close chan struct{}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Item представляет собой интерфейс для хранения произвольных данных
|
// Item представляет собой интерфейс для хранения произвольных данных.
|
||||||
type item struct {
|
type item struct {
|
||||||
data interface{}
|
data any
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewCollection создаёт инстанс коллекции
|
// NewCollection создаёт инстанс коллекции.
|
||||||
func NewCollection() *Collection {
|
func NewCollection() *Collection {
|
||||||
c := &Collection{
|
c := &Collection{
|
||||||
close: make(chan struct{}),
|
close: make(chan struct{}),
|
||||||
@@ -24,8 +24,8 @@ func NewCollection() *Collection {
|
|||||||
return c
|
return c
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get достаёт данные по заданному ключу из коллекции
|
// Get достаёт данные по заданному ключу из коллекции.
|
||||||
func (collection *Collection) Get(key interface{}) (interface{}, bool) {
|
func (collection *Collection) Get(key any) (any, bool) {
|
||||||
obj, exists := collection.items.Load(key)
|
obj, exists := collection.items.Load(key)
|
||||||
|
|
||||||
if !exists {
|
if !exists {
|
||||||
@@ -37,16 +37,16 @@ func (collection *Collection) Get(key interface{}) (interface{}, bool) {
|
|||||||
return item.data, true
|
return item.data, true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set сохраняет данные с заданным ключом в коллекцию
|
// Set сохраняет данные с заданным ключом в коллекцию.
|
||||||
func (collection *Collection) Set(key interface{}, value interface{}) {
|
func (collection *Collection) Set(key any, value any) {
|
||||||
collection.items.Store(key, item{
|
collection.items.Store(key, item{
|
||||||
data: value,
|
data: value,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// Range применяет функцию f ко всем ключам в коллекции
|
// Range применяет функцию f ко всем ключам в коллекции.
|
||||||
func (collection *Collection) Range(f func(key, value interface{}) bool) {
|
func (collection *Collection) Range(f func(key, value any) bool) {
|
||||||
fn := func(key, value interface{}) bool {
|
fn := func(key, value any) bool {
|
||||||
item := value.(item)
|
item := value.(item)
|
||||||
|
|
||||||
return f(key, item.data)
|
return f(key, item.data)
|
||||||
@@ -55,12 +55,12 @@ func (collection *Collection) Range(f func(key, value interface{}) bool) {
|
|||||||
collection.items.Range(fn)
|
collection.items.Range(fn)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete удаляет ключ и значение из коллекции данных
|
// Delete удаляет ключ и значение из коллекции данных.
|
||||||
func (collection *Collection) Delete(key interface{}) {
|
func (collection *Collection) Delete(key any) {
|
||||||
collection.items.Delete(key)
|
collection.items.Delete(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close очищает и высвобождает ресурсы, занятые коллекцией
|
// Close очищает и высвобождает ресурсы, занятые коллекцией.
|
||||||
func (collection *Collection) Close() {
|
func (collection *Collection) Close() {
|
||||||
collection.close <- struct{}{}
|
collection.close <- struct{}{}
|
||||||
collection.items = sync.Map{}
|
collection.items = sync.Map{}
|
||||||
58
internal/boolcollection/boolcollection.go
Normal file
58
internal/boolcollection/boolcollection.go
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
package boolcollection
|
||||||
|
|
||||||
|
import (
|
||||||
|
"sync"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Collection это sync.Map-ка, хранящая в себе итемы типа bool.
|
||||||
|
type Collection struct {
|
||||||
|
items sync.Map
|
||||||
|
close chan struct{}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Item представляет собой интерфейс для хранения данных типа bool.
|
||||||
|
type item struct {
|
||||||
|
data bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewCollection создаёт инстанс коллекции.
|
||||||
|
func NewCollection() *Collection {
|
||||||
|
c := &Collection{
|
||||||
|
close: make(chan struct{}),
|
||||||
|
}
|
||||||
|
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get достаёт данные по заданному ключу из коллекции.
|
||||||
|
func (collection *Collection) Get(key string) (bool, bool) {
|
||||||
|
obj, exists := collection.items.Load(key)
|
||||||
|
|
||||||
|
if !exists {
|
||||||
|
return false, false
|
||||||
|
}
|
||||||
|
|
||||||
|
item := obj.(item)
|
||||||
|
|
||||||
|
return item.data, true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set сохраняет данные с заданным ключом в коллекцию.
|
||||||
|
func (collection *Collection) Set(key string, value bool) {
|
||||||
|
collection.items.Store(key, item{
|
||||||
|
data: value,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delete удаляет ключ и значение из коллекции данных.
|
||||||
|
func (collection *Collection) Delete(key string) {
|
||||||
|
collection.items.Delete(key)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close очищает и высвобождает ресурсы, занятые коллекцией.
|
||||||
|
func (collection *Collection) Close() {
|
||||||
|
collection.close <- struct{}{}
|
||||||
|
collection.items = sync.Map{}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
@@ -8,7 +8,7 @@ import "strings"
|
|||||||
активируют мягкий ratelimit на стороне сервера, без них, сервер просто рвёт соединение по превышению лимитов
|
активируют мягкий ratelimit на стороне сервера, без них, сервер просто рвёт соединение по превышению лимитов
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// Удаляет сведения о MODE-ах пользователя для заданного канала
|
// Удаляет сведения о MODE-ах пользователя для заданного канала.
|
||||||
func userModeDeleteUser(ircChan string, nick string) {
|
func userModeDeleteUser(ircChan string, nick string) {
|
||||||
channel, ok := userMode.Get(ircChan)
|
channel, ok := userMode.Get(ircChan)
|
||||||
|
|
||||||
@@ -24,16 +24,17 @@ func userModeDeleteUser(ircChan string, nick string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Удаляет сведения о MODE-ах пользователя для всех каналов, на которых есть бот
|
// Удаляет сведения о MODE-ах пользователя для всех каналов, на которых есть бот.
|
||||||
func userModePurgeUser(nick string) {
|
func userModePurgeUser(nick string) {
|
||||||
for _, channel := range config.Irc.Channels {
|
for _, channel := range config.Irc.Channels {
|
||||||
userModeDeleteUser(channel, nick)
|
userModeDeleteUser(channel, nick)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Обновляет или создаёт запись о mode-ах пользователей
|
// Обновляет или создаёт запись о mode-ах пользователей.
|
||||||
func userModeUpdateUser(ircChan string, nick string, modes string) {
|
func userModeUpdateUser(ircChan string, nick string, modes string) {
|
||||||
var channelData map[string]map[string]bool
|
var channelData map[string]map[string]bool
|
||||||
|
|
||||||
channel, ok := userMode.Get(ircChan)
|
channel, ok := userMode.Get(ircChan)
|
||||||
|
|
||||||
if ok {
|
if ok {
|
||||||
@@ -48,12 +49,12 @@ func userModeUpdateUser(ircChan string, nick string, modes string) {
|
|||||||
channelData[nick] = make(map[string]bool)
|
channelData[nick] = make(map[string]bool)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch {
|
switch modes[:1] {
|
||||||
case modes[:1] == "+":
|
case "+":
|
||||||
for _, mode := range strings.Split(modes[1:], "") {
|
for _, mode := range strings.Split(modes[1:], "") {
|
||||||
channelData[nick][mode] = true
|
channelData[nick][mode] = true
|
||||||
}
|
}
|
||||||
case modes[:1] == "-":
|
case "-":
|
||||||
for _, mode := range strings.Split(modes[1:], "") {
|
for _, mode := range strings.Split(modes[1:], "") {
|
||||||
channelData[nick][mode] = false
|
channelData[nick][mode] = false
|
||||||
}
|
}
|
||||||
@@ -62,9 +63,10 @@ func userModeUpdateUser(ircChan string, nick string, modes string) {
|
|||||||
userMode.Set(ircChan, channelData)
|
userMode.Set(ircChan, channelData)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Возвращает значение MODE-а v для запрошенного ника
|
// Возвращает значение MODE-а v для запрошенного ника.
|
||||||
func userModeIsVoiced(ircChan string, nick string) bool {
|
func userModeIsVoiced(ircChan string, nick string) bool {
|
||||||
var channelData map[string]map[string]bool
|
var channelData map[string]map[string]bool
|
||||||
|
|
||||||
channel, ok := userMode.Get(ircChan)
|
channel, ok := userMode.Get(ircChan)
|
||||||
|
|
||||||
if ok {
|
if ok {
|
||||||
@@ -88,9 +90,10 @@ func userModeIsVoiced(ircChan string, nick string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Возвращает значение MODE-а o для запрошенного ника
|
// Возвращает значение MODE-а o для запрошенного ника.
|
||||||
func userModeIsOped(ircChan string, nick string) bool {
|
func userModeIsOped(ircChan string, nick string) bool {
|
||||||
var channelData map[string]map[string]bool
|
var channelData map[string]map[string]bool
|
||||||
|
|
||||||
channel, ok := userMode.Get(ircChan)
|
channel, ok := userMode.Get(ircChan)
|
||||||
|
|
||||||
if ok {
|
if ok {
|
||||||
@@ -116,6 +119,7 @@ func userModeIsOped(ircChan string, nick string) bool {
|
|||||||
|
|
||||||
func userModeIsHere(ircChan string, nick string) bool {
|
func userModeIsHere(ircChan string, nick string) bool {
|
||||||
var channelData map[string]map[string]bool
|
var channelData map[string]map[string]bool
|
||||||
|
|
||||||
channel, ok := userMode.Get(ircChan)
|
channel, ok := userMode.Get(ircChan)
|
||||||
|
|
||||||
if ok {
|
if ok {
|
||||||
|
|||||||
4
main.go
4
main.go
@@ -11,7 +11,7 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Производит некоторую инициализацию перед запуском main()
|
// Производит некоторую инициализацию перед запуском main().
|
||||||
func init() {
|
func init() {
|
||||||
log.SetFormatter(&log.TextFormatter{
|
log.SetFormatter(&log.TextFormatter{
|
||||||
DisableQuote: true,
|
DisableQuote: true,
|
||||||
@@ -52,7 +52,7 @@ func init() {
|
|||||||
userMode.Delete("channel")
|
userMode.Delete("channel")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Собственно, какбэ "точка входа" - основная процедура в нашем боте
|
// Собственно, какбэ "точка входа" - основная процедура в нашем боте.
|
||||||
func main() {
|
func main() {
|
||||||
// Main context
|
// Main context
|
||||||
var ctx = context.Background()
|
var ctx = context.Background()
|
||||||
|
|||||||
158
msg-parsers.go
158
msg-parsers.go
@@ -9,8 +9,8 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ircMsgParser парсит сообщения, прилетевшие из IRC-ки
|
// ircMsgParser парсит сообщения, прилетевшие из IRC-ки.
|
||||||
func ircMsgParser(channel string, nick string, user string, source string, msg string) {
|
func ircMsgParser(channel string, nick string, user string, source string, msg string) { //nolint: revive
|
||||||
// nick - это выбранный пользователем nick (если он занят, то его "нарисует" сервер)
|
// nick - это выбранный пользователем nick (если он занят, то его "нарисует" сервер)
|
||||||
// user - это короткое имя пользователя, под которым его видит сервер
|
// user - это короткое имя пользователя, под которым его видит сервер
|
||||||
// source - это длинное имя пользователя, оно содержит в себе помимо user, ещё и ip с которого пришёл пользователь
|
// source - это длинное имя пользователя, оно содержит в себе помимо user, ещё и ip с которого пришёл пользователь
|
||||||
@@ -48,50 +48,50 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
|
|
||||||
switch {
|
switch {
|
||||||
case cmd == "help" || msg == "помощь":
|
case cmd == "help" || msg == "помощь":
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%shelp | %sпомощь - это сообщение", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%shelp | %sпомощь - это сообщение", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sanek | %sанек | %sанекдот - рандомный анекдот с anekdot.ru", config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sanek | %sанек | %sанекдот - рандомный анекдот с anekdot.ru", config.Csign, config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sbuni - комикс-стрип hapi buni", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sbuni - комикс-стрип hapi buni", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sbunny - кролик", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sbunny - кролик", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%srabbit | %sкролик - кролик", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%srabbit | %sкролик - кролик", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%scat | %sкис - кошечка", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%scat | %sкис - кошечка", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sdice | %sroll | %sкости - бросить кости", config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sdice | %sroll | %sкости - бросить кости", config.Csign, config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sdig | %sкопать - заняться археологией", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sdig | %sкопать - заняться археологией", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sdrink | %sпраздник - какой сегодня праздник?", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sdrink | %sпраздник - какой сегодня праздник?", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sfish | %sfisher - порыбачить", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sfish | %sfisher - порыбачить", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sрыба | %sрыбка | %sрыбалка - порыбачить", config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sрыба | %sрыбка | %sрыбалка - порыбачить", config.Csign, config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sf | %sф - рандомная фраза из сборника цитат fortune_mod", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sf | %sф - рандомная фраза из сборника цитат fortune_mod", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sfortune | %sфортунка - рандомная фраза из сборника цитат fortune_mod", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sfortune | %sфортунка - рандомная фраза из сборника цитат fortune_mod", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sfox | %sлис - лисичка", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sfox | %sлис - лисичка", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sfriday | %sпятница - а не пятница ли сегодня?", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sfriday | %sпятница - а не пятница ли сегодня?", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sfrog | %sлягушка - лягушка", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sfrog | %sлягушка - лягушка", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%shorse | %sлошадь | %sлошадка - лошадка", config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%shorse | %sлошадь | %sлошадка - лошадка", config.Csign, config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%skarma фраза - посмотреть карму фразы", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%skarma фраза - посмотреть карму фразы", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sкарма фраза - посмотреть карму фразы", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sкарма фраза - посмотреть карму фразы", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintln("фраза++ | фраза-- - повысить или понизить карму фразы")}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintln("фраза++ | фраза-- - повысить или понизить карму фразы")}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%slat | %sлат - сгенерировать фразу из крылатого латинского выражения", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%slat | %sлат - сгенерировать фразу из крылатого латинского выражения", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%smonkeyuser - комикс-стрип MonkeyUser", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%smonkeyuser - комикс-стрип MonkeyUser", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sowl | %sсова - сова", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sowl | %sсова - сова", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sping | %sпинг - попинговать бота", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sping | %sпинг - попинговать бота", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sproverb | %sпословица - рандомная русская пословица", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sproverb | %sпословица - рандомная русская пословица", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%ssnail | %sулитка - улитка", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%ssnail | %sулитка - улитка", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%ssome_brew - выдать соответствующий напиток, бармен может налить rum, ром, vodka, водку, tequila, текила, whisky, виски, absinthe, абсент", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%ssome_brew - выдать соответствующий напиток, бармен может налить rum, ром, vodka, водку, tequila, текила, whisky, виски, absinthe, абсент", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sver | %sversion - написать что-то про версию ПО", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sver | %sversion - написать что-то про версию ПО", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sверсия - написать что-то про версию ПО", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sверсия - написать что-то про версию ПО", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sw город | %sп город - погода в городе", config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sw <город> | %sп <город> - погода в городе", config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sxkcd - комикс-стрип с xkcb.ru", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sxkcd - комикс-стрип с xkcb.ru", config.Csign)}
|
||||||
|
|
||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sadmin - настройки некоторых плагинов бота для канала", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sadmin - настройки некоторых плагинов бота для канала", config.Csign)}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
case cmd == "admin":
|
case cmd == "admin":
|
||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sadmin oboobs # - где 1 - вкл, 0 - выкл плагина oboobs", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sadmin oboobs # - где 1 - вкл, 0 - выкл плагина oboobs", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sadmin oboobs показываем ли сисечки по просьбе участников чата (команды %stits, %stities, %sboobs, %sboobies, %sсиси, %sсисечки)", config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sadmin oboobs показываем ли сисечки по просьбе участников чата (команды %stits, %stities, %sboobs, %sboobies, %sсиси, %sсисечки)", config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sadmin obutts # - где 1 - вкл, 0 - выкл плагина obutts", config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sadmin obutts # - где 1 - вкл, 0 - выкл плагина obutts", config.Csign)}
|
||||||
imChan <- iMsg{ChatId: nick, Text: fmt.Sprintf("%sadmin obutts показываем ли попки по просьбе участников чата (команды %sass, %sbutt, %sbooty, %sпопа, %sпопка)", config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign)}
|
imChan <- iMsg{ChatID: nick, Text: fmt.Sprintf("%sadmin obutts показываем ли попки по просьбе участников чата (команды %sass, %sbutt, %sbooty, %sпопа, %sпопка)", config.Csign, config.Csign, config.Csign, config.Csign, config.Csign, config.Csign)}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
@@ -100,16 +100,16 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
value := getSetting(channel, "oboobs")
|
value := getSetting(channel, "oboobs")
|
||||||
|
|
||||||
switch {
|
switch value {
|
||||||
case value == "":
|
case "":
|
||||||
_ = saveSetting(channel, "oboobs", "0")
|
_ = saveSetting(channel, "oboobs", "0")
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs выключен"}
|
||||||
case value == "0":
|
case "0":
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs выключен"}
|
||||||
case value == "1":
|
case "1":
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs включен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs включен"}
|
||||||
default:
|
default:
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs выключен"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -120,9 +120,9 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
err := saveSetting(channel, "oboobs", "1")
|
err := saveSetting(channel, "oboobs", "1")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs всё ещё выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs всё ещё выключен"}
|
||||||
} else {
|
} else {
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs включен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs включен"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,7 +131,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
case cmd == "admin oboobs 0":
|
case cmd == "admin oboobs 0":
|
||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
_ = saveSetting(channel, "oboobs", "0")
|
_ = saveSetting(channel, "oboobs", "0")
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин oboobs выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин oboobs выключен"}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
@@ -140,16 +140,16 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
value := getSetting(channel, "obutts")
|
value := getSetting(channel, "obutts")
|
||||||
|
|
||||||
switch {
|
switch value {
|
||||||
case value == "":
|
case "":
|
||||||
_ = saveSetting(channel, "obutts", "0")
|
_ = saveSetting(channel, "obutts", "0")
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts выключен"}
|
||||||
case value == "0":
|
case "0":
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts выключен"}
|
||||||
case value == "1":
|
case "1":
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts включен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts включен"}
|
||||||
default:
|
default:
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts выключен"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,9 +160,9 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
err := saveSetting(channel, "obutts", "1")
|
err := saveSetting(channel, "obutts", "1")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts всё ещё выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts всё ещё выключен"}
|
||||||
} else {
|
} else {
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts включен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts включен"}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,7 +171,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
case cmd == "admin obutts 0":
|
case cmd == "admin obutts 0":
|
||||||
if userModeIsOped(channel, nick) {
|
if userModeIsOped(channel, nick) {
|
||||||
_ = saveSetting(channel, "obutts", "0")
|
_ = saveSetting(channel, "obutts", "0")
|
||||||
imChan <- iMsg{ChatId: nick, Text: "Плагин obutts выключен"}
|
imChan <- iMsg{ChatID: nick, Text: "Плагин obutts выключен"}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
@@ -182,15 +182,17 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
// Общий список простых команд
|
// Общий список простых команд
|
||||||
cmds := []string{"ping", "пинг", "пинх", "pong", "понг", "понх", "coin", "монетка", "roll", "dice", "кости",
|
cmds := []string{"ping", "пинг", "пинх", "pong", "понг", "понх", "coin", "монетка", "roll", "dice", "кости",
|
||||||
"ver", "version", "версия", "хэлп", "halp", "kde", "кде", "lat", "лат", "friday", "пятница", "proverb",
|
"ver", "version", "версия", "хэлп", "halp", "kde", "кде", "lat", "лат", "friday", "пятница", "proverb",
|
||||||
"пословица", "fortune", "фортунка", "f", "ф", "anek", "анек", "анекдот", "buni", "cat", "кис", "drink",
|
"пословица", "пословиться", "fortune", "фортунка", "f", "ф", "anek", "анек", "анекдот", "buni", "cat",
|
||||||
"праздник", "fox", "лис", "frog", "лягушка", "horse", "лошадь", "лошадка", "monkeyuser", "owl", "сова",
|
"кис", "drink", "праздник", "fox", "лис", "frog", "лягушка", "horse", "лошадь", "лошадка", "monkeyuser",
|
||||||
"сыч", "rabbit", "bunny", "кролик", "snail", "улитка", "xkcd", "dig", "копать", "fish", "fishing", "рыба",
|
"owl", "сова", "сыч", "rabbit", "bunny", "кролик", "snail", "улитка", "xkcd", "dig", "копать", "fish",
|
||||||
"рыбка", "рыбалка", "karma", "карма"}
|
"fishing", "рыба", "рыбка", "рыбалка", "karma", "карма", "w", "п", "weather", "погода", "погодка",
|
||||||
|
"погадка"}
|
||||||
|
|
||||||
for _, command := range cmds {
|
for _, command := range cmds {
|
||||||
if cmd == command {
|
if cmd == command {
|
||||||
done = true
|
done = true
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -205,6 +207,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if cmd == command {
|
if cmd == command {
|
||||||
done = true
|
done = true
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -225,7 +228,8 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
message.Misc.Username = strings.TrimSpace(pile[1])
|
message.Misc.Username = strings.TrimSpace(pile[1])
|
||||||
} else {
|
} else {
|
||||||
msg = fmt.Sprintf("Я тут не вижу участника с ником %s", userNick)
|
msg = fmt.Sprintf("Я тут не вижу участника с ником %s", userNick)
|
||||||
imChan <- iMsg{ChatId: channel, Text: msg}
|
imChan <- iMsg{ChatID: channel, Text: msg}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
} // в противном случае юзер просто поставил пробел на конце команды, интерпретируем это как
|
} // в противном случае юзер просто поставил пробел на конце команды, интерпретируем это как
|
||||||
@@ -233,6 +237,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
|
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
done = true
|
done = true
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -249,6 +254,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if cmdLen > len(command) && cmd[0:len(command)] == command {
|
if cmdLen > len(command) && cmd[0:len(command)] == command {
|
||||||
done = true
|
done = true
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,6 +272,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if cmd[:cmdLen] == command {
|
if cmd[:cmdLen] == command {
|
||||||
done = true
|
done = true
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -282,6 +289,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
if cmd[:cmdLen] == command {
|
if cmd[:cmdLen] == command {
|
||||||
// done = true
|
// done = true
|
||||||
outgoingMessage = msg
|
outgoingMessage = msg
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -296,6 +304,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("Unable to to serialize message for redis: %s", err)
|
log.Warnf("Unable to to serialize message for redis: %s", err)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -350,6 +359,7 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("Unable to to serialize message for redis: %s", err)
|
log.Warnf("Unable to to serialize message for redis: %s", err)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -360,11 +370,9 @@ func ircMsgParser(channel string, nick string, user string, source string, msg s
|
|||||||
log.Debugf("Sent msg to redis channel %s: %s", config.Redis.Channel, string(data))
|
log.Debugf("Sent msg to redis channel %s: %s", config.Redis.Channel, string(data))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// redisMsgParser парсит json-чики прилетевшие из REDIS-ки, причём, json-чики должны быть относительно валидными
|
// redisMsgParser парсит json-чики прилетевшие из REDIS-ки, причём, json-чики должны быть относительно валидными.
|
||||||
func redisMsgParser(msg string) {
|
func redisMsgParser(msg string) {
|
||||||
if shutdown {
|
if shutdown {
|
||||||
// Если мы завершаем работу программы, то нам ничего обрабатывать не надо
|
// Если мы завершаем работу программы, то нам ничего обрабатывать не надо
|
||||||
@@ -377,43 +385,51 @@ func redisMsgParser(msg string) {
|
|||||||
|
|
||||||
if err := json.Unmarshal([]byte(msg), &j); err != nil {
|
if err := json.Unmarshal([]byte(msg), &j); err != nil {
|
||||||
log.Warnf("Unable to to parse message from redis channel: %s", err)
|
log.Warnf("Unable to to parse message from redis channel: %s", err)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate our j
|
// Validate our j
|
||||||
if exist := j.From; exist == "" {
|
if exist := j.From; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no from field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no from field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if exist := j.Chatid; exist == "" {
|
if exist := j.Chatid; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no chatid field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no chatid field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if exist := j.Userid; exist == "" {
|
if exist := j.Userid; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no userid field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no userid field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if exist := j.Message; exist == "" {
|
if exist := j.Message; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no message field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no message field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if exist := j.Plugin; exist == "" {
|
if exist := j.Plugin; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no plugin field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no plugin field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if exist := j.Mode; exist == "" {
|
if exist := j.Mode; exist == "" {
|
||||||
log.Warnf("Incorrect msg from redis, no mode field: %s", msg)
|
log.Warnf("Incorrect msg from redis, no mode field: %s", msg)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// j.Misc.Answer может и не быть, тогда ответа на такое сообщение не будет
|
// j.Misc.Answer может и не быть, тогда ответа на такое сообщение не будет
|
||||||
if j.Misc.Answer == 0 {
|
if j.Misc.Answer == 0 {
|
||||||
log.Debug("Field Misc->Answer = 0, skipping message")
|
log.Debug("Field Misc->Answer = 0, skipping message")
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -437,13 +453,11 @@ func redisMsgParser(msg string) {
|
|||||||
|
|
||||||
for _, message := range lines {
|
for _, message := range lines {
|
||||||
if userModeIsOped(j.Chatid, ircClient.GetNick()) || userModeIsVoiced(j.Chatid, ircClient.GetNick()) {
|
if userModeIsOped(j.Chatid, ircClient.GetNick()) || userModeIsVoiced(j.Chatid, ircClient.GetNick()) {
|
||||||
imChanUnrestricted <- iMsg{ChatId: j.Chatid, Text: message}
|
imChanUnrestricted <- iMsg{ChatID: j.Chatid, Text: message}
|
||||||
} else {
|
} else {
|
||||||
imChan <- iMsg{ChatId: j.Chatid, Text: message}
|
imChan <- iMsg{ChatID: j.Chatid, Text: message}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
/* vim: set ft=go noet ai ts=4 sw=4 sts=4: */
|
||||||
|
|||||||
@@ -11,9 +11,10 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// StoreKV сохраняет в указанной бд ключ и значение
|
// StoreKV сохраняет в указанной бд ключ и значение.
|
||||||
func StoreKV(db *pebble.DB, key string, value string) error {
|
func StoreKV(db *pebble.DB, key string, value string) error {
|
||||||
var kArray = []byte(key)
|
var kArray = []byte(key)
|
||||||
|
|
||||||
var vArray = []byte(value)
|
var vArray = []byte(value)
|
||||||
|
|
||||||
err := db.Set(kArray, vArray, pebble.Sync)
|
err := db.Set(kArray, vArray, pebble.Sync)
|
||||||
@@ -21,11 +22,12 @@ func StoreKV(db *pebble.DB, key string, value string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// FetchV достаёт значение по ключу
|
// FetchV достаёт значение по ключу.
|
||||||
func FetchV(db *pebble.DB, key string) (string, error) {
|
func FetchV(db *pebble.DB, key string) (string, error) {
|
||||||
var kArray = []byte(key)
|
var kArray = []byte(key)
|
||||||
|
|
||||||
var vArray []byte
|
var vArray []byte
|
||||||
|
|
||||||
var valueString = ""
|
var valueString = ""
|
||||||
|
|
||||||
vArray, closer, err := db.Get(kArray)
|
vArray, closer, err := db.Get(kArray)
|
||||||
@@ -40,7 +42,7 @@ func FetchV(db *pebble.DB, key string) (string, error) {
|
|||||||
return valueString, err
|
return valueString, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Достанем настройку из БД с настройками
|
// Достанем настройку из БД с настройками.
|
||||||
func getSetting(chatID string, setting string) string {
|
func getSetting(chatID string, setting string) string {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
@@ -58,6 +60,7 @@ func getSetting(chatID string, setting string) string {
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Unable to open settings db, %s: %s\n", database, err)
|
log.Errorf("Unable to open settings db, %s: %s\n", database, err)
|
||||||
|
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,13 +69,14 @@ func getSetting(chatID string, setting string) string {
|
|||||||
|
|
||||||
// Если из базы ничего не вынулось, по каким-то причинам, то просто вернём пустую строку
|
// Если из базы ничего не вынулось, по каким-то причинам, то просто вернём пустую строку
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if errors.Is(err, pebble.ErrNotFound) {
|
switch {
|
||||||
|
case errors.Is(err, pebble.ErrNotFound):
|
||||||
log.Debugf("Unable to get value for %s: no record found in db %s", setting, database)
|
log.Debugf("Unable to get value for %s: no record found in db %s", setting, database)
|
||||||
} else if errors.Is(err, fs.ErrNotExist) {
|
case errors.Is(err, fs.ErrNotExist):
|
||||||
log.Debugf("Unable to get value for %s: db dir %s does not exist", setting, database)
|
log.Debugf("Unable to get value for %s: db dir %s does not exist", setting, database)
|
||||||
} else if errors.Is(err, oserror.ErrNotExist) {
|
case errors.Is(err, oserror.ErrNotExist):
|
||||||
log.Debugf("Unable to get value for %s: db dir %s does not exist", setting, database)
|
log.Debugf("Unable to get value for %s: db dir %s does not exist", setting, database)
|
||||||
} else {
|
default:
|
||||||
log.Errorf("Unable to get value for %s in db dir %s: %s", setting, database, err)
|
log.Errorf("Unable to get value for %s in db dir %s: %s", setting, database, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,10 +86,12 @@ func getSetting(chatID string, setting string) string {
|
|||||||
return value
|
return value
|
||||||
}
|
}
|
||||||
|
|
||||||
// Сохраним настройку в БД с настройками
|
// Сохраним настройку в БД с настройками.
|
||||||
func saveSetting(chatID string, setting string, value string) error {
|
func saveSetting(chatID string, setting string, value string) error {
|
||||||
var chatHash = sha256.Sum256([]byte(chatID))
|
var chatHash = sha256.Sum256([]byte(chatID))
|
||||||
|
|
||||||
var database = fmt.Sprintf("settings_db/%x", chatHash)
|
var database = fmt.Sprintf("settings_db/%x", chatHash)
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
// Если БД не открыта, откроем её
|
// Если БД не открыта, откроем её
|
||||||
@@ -100,6 +106,7 @@ func saveSetting(chatID string, setting string, value string) error {
|
|||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorf("Unable to open settings db, %s: %s\n", database, err)
|
log.Errorf("Unable to open settings db, %s: %s\n", database, err)
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
types.go
13
types.go
@@ -1,6 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
// Конфиг
|
// Конфиг.
|
||||||
type myConfig struct {
|
type myConfig struct {
|
||||||
Redis struct {
|
Redis struct {
|
||||||
Server string `json:"server,omitempty"`
|
Server string `json:"server,omitempty"`
|
||||||
@@ -35,7 +35,7 @@ type myConfig struct {
|
|||||||
DataDir string `json:"data_dir,omitempty"`
|
DataDir string `json:"data_dir,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Входящее сообщение из pubsub-канала redis-ки
|
// Входящее сообщение из pubsub-канала redis-ки.
|
||||||
type rMsg struct {
|
type rMsg struct {
|
||||||
From string `json:"from,omitempty"`
|
From string `json:"from,omitempty"`
|
||||||
Chatid string `json:"chatid,omitempty"`
|
Chatid string `json:"chatid,omitempty"`
|
||||||
@@ -55,7 +55,7 @@ type rMsg struct {
|
|||||||
} `json:"Misc"`
|
} `json:"Misc"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Исходящее сообщение в pubsub-канал redis-ки
|
// Исходящее сообщение в pubsub-канал redis-ки.
|
||||||
type sMsg struct {
|
type sMsg struct {
|
||||||
From string `json:"from"`
|
From string `json:"from"`
|
||||||
Chatid string `json:"chatid"`
|
Chatid string `json:"chatid"`
|
||||||
@@ -75,14 +75,13 @@ type sMsg struct {
|
|||||||
} `json:"misc"`
|
} `json:"misc"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Сообщение в irc
|
// TODO: Имплементировать тип сообщения - privmsg или action.
|
||||||
// TODO: Имплементировать тип сообщения - privmsg или action
|
|
||||||
type iMsg struct {
|
type iMsg struct {
|
||||||
ChatId string
|
ChatID string
|
||||||
Text string
|
Text string
|
||||||
}
|
}
|
||||||
|
|
||||||
// "Ведёрко" для реализации ограничителя скорости отправки исходящих сообщений - Token Bucket
|
// "Ведёрко" для реализации ограничителя скорости отправки исходящих сообщений - Token Bucket.
|
||||||
type bucket struct {
|
type bucket struct {
|
||||||
Timestamps []int64
|
Timestamps []int64
|
||||||
IsFull bool
|
IsFull bool
|
||||||
|
|||||||
20
util.go
20
util.go
@@ -3,7 +3,6 @@ package main
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"syscall"
|
"syscall"
|
||||||
@@ -12,7 +11,7 @@ import (
|
|||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Читает и валидирует конфиг, а также выставляет некоторые default-ы, если значений для параметров в конфиге нет
|
// Читает и валидирует конфиг, а также выставляет некоторые default-ы, если значений для параметров в конфиге нет.
|
||||||
func readConfig() {
|
func readConfig() {
|
||||||
configLoaded := false
|
configLoaded := false
|
||||||
executablePath, err := os.Executable()
|
executablePath, err := os.Executable()
|
||||||
@@ -41,14 +40,16 @@ func readConfig() {
|
|||||||
// Конфиг-файл длинноват для конфига, попробуем следующего кандидата
|
// Конфиг-файл длинноват для конфига, попробуем следующего кандидата
|
||||||
if fileInfo.Size() > 65535 {
|
if fileInfo.Size() > 65535 {
|
||||||
log.Warnf("Config file %s is too long for config, skipping", location)
|
log.Warnf("Config file %s is too long for config, skipping", location)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
buf, err := ioutil.ReadFile(location)
|
buf, err := os.ReadFile(location)
|
||||||
|
|
||||||
// Не удалось прочитать, попробуем следующего кандидата
|
// Не удалось прочитать, попробуем следующего кандидата
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("Skip reading config file %s: %s", location, err)
|
log.Warnf("Skip reading config file %s: %s", location, err)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,12 +57,14 @@ func readConfig() {
|
|||||||
// Интереснее на выходе получить структурку: то есть мы вначале конфиг преобразуем в map-ку, затем эту map-ку
|
// Интереснее на выходе получить структурку: то есть мы вначале конфиг преобразуем в map-ку, затем эту map-ку
|
||||||
// сериализуем в json, а потом json преврщааем в стркутурку. Не очень эффективно, но он и не часто требуется.
|
// сериализуем в json, а потом json преврщааем в стркутурку. Не очень эффективно, но он и не часто требуется.
|
||||||
var sampleConfig myConfig
|
var sampleConfig myConfig
|
||||||
|
|
||||||
var tmp map[string]interface{}
|
var tmp map[string]interface{}
|
||||||
err = hjson.Unmarshal(buf, &tmp)
|
err = hjson.Unmarshal(buf, &tmp)
|
||||||
|
|
||||||
// Не удалось распарсить - попробуем следующего кандидата
|
// Не удалось распарсить - попробуем следующего кандидата
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("Skip parsing config file %s: %s", location, err)
|
log.Warnf("Skip parsing config file %s: %s", location, err)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,17 +73,20 @@ func readConfig() {
|
|||||||
// Не удалось преобразовать map-ку в json
|
// Не удалось преобразовать map-ку в json
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Warnf("Skip parsing config file %s: %s", location, err)
|
log.Warnf("Skip parsing config file %s: %s", location, err)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := json.Unmarshal(tmpjson, &sampleConfig); err != nil {
|
if err := json.Unmarshal(tmpjson, &sampleConfig); err != nil {
|
||||||
log.Warnf("Skip parsing config file %s: %s", location, err)
|
log.Warnf("Skip parsing config file %s: %s", location, err)
|
||||||
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Валидируем значения из конфига
|
// Валидируем значения из конфига
|
||||||
if sampleConfig.Redis.Server == "" {
|
if sampleConfig.Redis.Server == "" {
|
||||||
sampleConfig.Redis.Server = "localhost"
|
sampleConfig.Redis.Server = "localhost"
|
||||||
|
|
||||||
log.Infof("Redis server is not defined in config, using localhost")
|
log.Infof("Redis server is not defined in config, using localhost")
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,15 +107,17 @@ func readConfig() {
|
|||||||
// Значения для IRC-клиента
|
// Значения для IRC-клиента
|
||||||
if sampleConfig.Irc.Server == "" {
|
if sampleConfig.Irc.Server == "" {
|
||||||
sampleConfig.Irc.Server = "localhost"
|
sampleConfig.Irc.Server = "localhost"
|
||||||
|
|
||||||
log.Errorf("Irc server is not defined in config, using localhost")
|
log.Errorf("Irc server is not defined in config, using localhost")
|
||||||
}
|
}
|
||||||
|
|
||||||
if sampleConfig.Irc.Port == 0 {
|
if sampleConfig.Irc.Port == 0 {
|
||||||
sampleConfig.Irc.Port = 6667
|
sampleConfig.Irc.Port = 6667
|
||||||
|
|
||||||
log.Infof("Irc port is not defined in config, using 6667")
|
log.Infof("Irc port is not defined in config, using 6667")
|
||||||
}
|
}
|
||||||
|
|
||||||
if sampleConfig.Irc.Ssl != true {
|
if !sampleConfig.Irc.Ssl {
|
||||||
sampleConfig.Irc.SslVerify = false
|
sampleConfig.Irc.SslVerify = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,7 +190,9 @@ func readConfig() {
|
|||||||
|
|
||||||
config = sampleConfig
|
config = sampleConfig
|
||||||
configLoaded = true
|
configLoaded = true
|
||||||
|
|
||||||
log.Infof("Using %s as config file", location)
|
log.Infof("Using %s as config file", location)
|
||||||
|
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,7 +202,7 @@ func readConfig() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Хэндлер сигналов закрывает все бд, все сетевые соединения и сваливает из приложения
|
// Хэндлер сигналов закрывает все бд, все сетевые соединения и сваливает из приложения.
|
||||||
func sigHandler() {
|
func sigHandler() {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
|||||||
4
vendor/github.com/DataDog/zstd/README.md
generated
vendored
4
vendor/github.com/DataDog/zstd/README.md
generated
vendored
@@ -6,8 +6,8 @@
|
|||||||
|
|
||||||
[C Zstd Homepage](https://github.com/facebook/zstd)
|
[C Zstd Homepage](https://github.com/facebook/zstd)
|
||||||
|
|
||||||
The current headers and C files are from *v1.5.0* (Commit
|
The current headers and C files are from *v1.5.6* (Commit
|
||||||
[10f0e699](https://github.com/facebook/zstd/releases/tag/v1.5.0)).
|
[794ea1b](https://github.com/facebook/zstd/releases/tag/v1.5.6)).
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
|
|||||||
8
vendor/github.com/DataDog/zstd/ZSTD_LICENSE
generated
vendored
8
vendor/github.com/DataDog/zstd/ZSTD_LICENSE
generated
vendored
@@ -2,7 +2,7 @@ BSD License
|
|||||||
|
|
||||||
For Zstandard software
|
For Zstandard software
|
||||||
|
|
||||||
Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
|
Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
are permitted provided that the following conditions are met:
|
are permitted provided that the following conditions are met:
|
||||||
@@ -14,9 +14,9 @@ are permitted provided that the following conditions are met:
|
|||||||
this list of conditions and the following disclaimer in the documentation
|
this list of conditions and the following disclaimer in the documentation
|
||||||
and/or other materials provided with the distribution.
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
* Neither the name Facebook nor the names of its contributors may be used to
|
* Neither the name Facebook, nor Meta, nor the names of its contributors may
|
||||||
endorse or promote products derived from this software without specific
|
be used to endorse or promote products derived from this software without
|
||||||
prior written permission.
|
specific prior written permission.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
|||||||
58
vendor/github.com/DataDog/zstd/allocations.h
generated
vendored
Normal file
58
vendor/github.com/DataDog/zstd/allocations.h
generated
vendored
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
|
/*
|
||||||
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
||||||
|
* in the COPYING file in the root directory of this source tree).
|
||||||
|
* You may select, at your option, one of the above-listed licenses.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* This file provides custom allocation primitives
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define ZSTD_DEPS_NEED_MALLOC
|
||||||
|
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */
|
||||||
|
|
||||||
|
#include "compiler.h" /* MEM_STATIC */
|
||||||
|
#define ZSTD_STATIC_LINKING_ONLY
|
||||||
|
#include "zstd.h" /* ZSTD_customMem */
|
||||||
|
|
||||||
|
#ifndef ZSTD_ALLOCATIONS_H
|
||||||
|
#define ZSTD_ALLOCATIONS_H
|
||||||
|
|
||||||
|
/* custom memory allocation functions */
|
||||||
|
|
||||||
|
MEM_STATIC void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem)
|
||||||
|
{
|
||||||
|
if (customMem.customAlloc)
|
||||||
|
return customMem.customAlloc(customMem.opaque, size);
|
||||||
|
return ZSTD_malloc(size);
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
|
||||||
|
{
|
||||||
|
if (customMem.customAlloc) {
|
||||||
|
/* calloc implemented as malloc+memset;
|
||||||
|
* not as efficient as calloc, but next best guess for custom malloc */
|
||||||
|
void* const ptr = customMem.customAlloc(customMem.opaque, size);
|
||||||
|
ZSTD_memset(ptr, 0, size);
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
return ZSTD_calloc(1, size);
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC void ZSTD_customFree(void* ptr, ZSTD_customMem customMem)
|
||||||
|
{
|
||||||
|
if (ptr!=NULL) {
|
||||||
|
if (customMem.customFree)
|
||||||
|
customMem.customFree(customMem.opaque, ptr);
|
||||||
|
else
|
||||||
|
ZSTD_free(ptr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* ZSTD_ALLOCATIONS_H */
|
||||||
|
|
||||||
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
203
vendor/github.com/DataDog/zstd/bits.h
generated
vendored
Normal file
203
vendor/github.com/DataDog/zstd/bits.h
generated
vendored
Normal file
@@ -0,0 +1,203 @@
|
|||||||
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
|
/*
|
||||||
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
||||||
|
* in the COPYING file in the root directory of this source tree).
|
||||||
|
* You may select, at your option, one of the above-listed licenses.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ZSTD_BITS_H
|
||||||
|
#define ZSTD_BITS_H
|
||||||
|
|
||||||
|
#include "mem.h"
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countTrailingZeros32_fallback(U32 val)
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
{
|
||||||
|
static const U32 DeBruijnBytePos[32] = {0, 1, 28, 2, 29, 14, 24, 3,
|
||||||
|
30, 22, 20, 15, 25, 17, 4, 8,
|
||||||
|
31, 27, 13, 23, 21, 19, 16, 7,
|
||||||
|
26, 12, 18, 6, 11, 5, 10, 9};
|
||||||
|
return DeBruijnBytePos[((U32) ((val & -(S32) val) * 0x077CB531U)) >> 27];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countTrailingZeros32(U32 val)
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
# if defined(_MSC_VER)
|
||||||
|
# if STATIC_BMI2 == 1
|
||||||
|
return (unsigned)_tzcnt_u32(val);
|
||||||
|
# else
|
||||||
|
if (val != 0) {
|
||||||
|
unsigned long r;
|
||||||
|
_BitScanForward(&r, val);
|
||||||
|
return (unsigned)r;
|
||||||
|
} else {
|
||||||
|
/* Should not reach this code path */
|
||||||
|
__assume(0);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
||||||
|
return (unsigned)__builtin_ctz(val);
|
||||||
|
# else
|
||||||
|
return ZSTD_countTrailingZeros32_fallback(val);
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countLeadingZeros32_fallback(U32 val) {
|
||||||
|
assert(val != 0);
|
||||||
|
{
|
||||||
|
static const U32 DeBruijnClz[32] = {0, 9, 1, 10, 13, 21, 2, 29,
|
||||||
|
11, 14, 16, 18, 22, 25, 3, 30,
|
||||||
|
8, 12, 20, 28, 15, 17, 24, 7,
|
||||||
|
19, 27, 23, 6, 26, 5, 4, 31};
|
||||||
|
val |= val >> 1;
|
||||||
|
val |= val >> 2;
|
||||||
|
val |= val >> 4;
|
||||||
|
val |= val >> 8;
|
||||||
|
val |= val >> 16;
|
||||||
|
return 31 - DeBruijnClz[(val * 0x07C4ACDDU) >> 27];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countLeadingZeros32(U32 val)
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
# if defined(_MSC_VER)
|
||||||
|
# if STATIC_BMI2 == 1
|
||||||
|
return (unsigned)_lzcnt_u32(val);
|
||||||
|
# else
|
||||||
|
if (val != 0) {
|
||||||
|
unsigned long r;
|
||||||
|
_BitScanReverse(&r, val);
|
||||||
|
return (unsigned)(31 - r);
|
||||||
|
} else {
|
||||||
|
/* Should not reach this code path */
|
||||||
|
__assume(0);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
||||||
|
return (unsigned)__builtin_clz(val);
|
||||||
|
# else
|
||||||
|
return ZSTD_countLeadingZeros32_fallback(val);
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countTrailingZeros64(U64 val)
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
# if defined(_MSC_VER) && defined(_WIN64)
|
||||||
|
# if STATIC_BMI2 == 1
|
||||||
|
return (unsigned)_tzcnt_u64(val);
|
||||||
|
# else
|
||||||
|
if (val != 0) {
|
||||||
|
unsigned long r;
|
||||||
|
_BitScanForward64(&r, val);
|
||||||
|
return (unsigned)r;
|
||||||
|
} else {
|
||||||
|
/* Should not reach this code path */
|
||||||
|
__assume(0);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4) && defined(__LP64__)
|
||||||
|
return (unsigned)__builtin_ctzll(val);
|
||||||
|
# else
|
||||||
|
{
|
||||||
|
U32 mostSignificantWord = (U32)(val >> 32);
|
||||||
|
U32 leastSignificantWord = (U32)val;
|
||||||
|
if (leastSignificantWord == 0) {
|
||||||
|
return 32 + ZSTD_countTrailingZeros32(mostSignificantWord);
|
||||||
|
} else {
|
||||||
|
return ZSTD_countTrailingZeros32(leastSignificantWord);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_countLeadingZeros64(U64 val)
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
# if defined(_MSC_VER) && defined(_WIN64)
|
||||||
|
# if STATIC_BMI2 == 1
|
||||||
|
return (unsigned)_lzcnt_u64(val);
|
||||||
|
# else
|
||||||
|
if (val != 0) {
|
||||||
|
unsigned long r;
|
||||||
|
_BitScanReverse64(&r, val);
|
||||||
|
return (unsigned)(63 - r);
|
||||||
|
} else {
|
||||||
|
/* Should not reach this code path */
|
||||||
|
__assume(0);
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
||||||
|
return (unsigned)(__builtin_clzll(val));
|
||||||
|
# else
|
||||||
|
{
|
||||||
|
U32 mostSignificantWord = (U32)(val >> 32);
|
||||||
|
U32 leastSignificantWord = (U32)val;
|
||||||
|
if (mostSignificantWord == 0) {
|
||||||
|
return 32 + ZSTD_countLeadingZeros32(leastSignificantWord);
|
||||||
|
} else {
|
||||||
|
return ZSTD_countLeadingZeros32(mostSignificantWord);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_NbCommonBytes(size_t val)
|
||||||
|
{
|
||||||
|
if (MEM_isLittleEndian()) {
|
||||||
|
if (MEM_64bits()) {
|
||||||
|
return ZSTD_countTrailingZeros64((U64)val) >> 3;
|
||||||
|
} else {
|
||||||
|
return ZSTD_countTrailingZeros32((U32)val) >> 3;
|
||||||
|
}
|
||||||
|
} else { /* Big Endian CPU */
|
||||||
|
if (MEM_64bits()) {
|
||||||
|
return ZSTD_countLeadingZeros64((U64)val) >> 3;
|
||||||
|
} else {
|
||||||
|
return ZSTD_countLeadingZeros32((U32)val) >> 3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC unsigned ZSTD_highbit32(U32 val) /* compress, dictBuilder, decodeCorpus */
|
||||||
|
{
|
||||||
|
assert(val != 0);
|
||||||
|
return 31 - ZSTD_countLeadingZeros32(val);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ZSTD_rotateRight_*():
|
||||||
|
* Rotates a bitfield to the right by "count" bits.
|
||||||
|
* https://en.wikipedia.org/w/index.php?title=Circular_shift&oldid=991635599#Implementing_circular_shifts
|
||||||
|
*/
|
||||||
|
MEM_STATIC
|
||||||
|
U64 ZSTD_rotateRight_U64(U64 const value, U32 count) {
|
||||||
|
assert(count < 64);
|
||||||
|
count &= 0x3F; /* for fickle pattern recognition */
|
||||||
|
return (value >> count) | (U64)(value << ((0U - count) & 0x3F));
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC
|
||||||
|
U32 ZSTD_rotateRight_U32(U32 const value, U32 count) {
|
||||||
|
assert(count < 32);
|
||||||
|
count &= 0x1F; /* for fickle pattern recognition */
|
||||||
|
return (value >> count) | (U32)(value << ((0U - count) & 0x1F));
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC
|
||||||
|
U16 ZSTD_rotateRight_U16(U16 const value, U32 count) {
|
||||||
|
assert(count < 16);
|
||||||
|
count &= 0x0F; /* for fickle pattern recognition */
|
||||||
|
return (value >> count) | (U16)(value << ((0U - count) & 0x0F));
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* ZSTD_BITS_H */
|
||||||
|
|
||||||
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
153
vendor/github.com/DataDog/zstd/bitstream.h
generated
vendored
153
vendor/github.com/DataDog/zstd/bitstream.h
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* bitstream
|
* bitstream
|
||||||
* Part of FSE library
|
* Part of FSE library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -31,14 +31,15 @@ extern "C" {
|
|||||||
#include "compiler.h" /* UNLIKELY() */
|
#include "compiler.h" /* UNLIKELY() */
|
||||||
#include "debug.h" /* assert(), DEBUGLOG(), RAWLOG() */
|
#include "debug.h" /* assert(), DEBUGLOG(), RAWLOG() */
|
||||||
#include "error_private.h" /* error codes and messages */
|
#include "error_private.h" /* error codes and messages */
|
||||||
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
|
|
||||||
|
|
||||||
/*=========================================
|
/*=========================================
|
||||||
* Target specific
|
* Target specific
|
||||||
=========================================*/
|
=========================================*/
|
||||||
#ifndef ZSTD_NO_INTRINSICS
|
#ifndef ZSTD_NO_INTRINSICS
|
||||||
# if defined(__BMI__) && defined(__GNUC__)
|
# if (defined(__BMI__) || defined(__BMI2__)) && defined(__GNUC__)
|
||||||
# include <immintrin.h> /* support for bextr (experimental) */
|
# include <immintrin.h> /* support for bextr (experimental)/bzhi */
|
||||||
# elif defined(__ICCARM__)
|
# elif defined(__ICCARM__)
|
||||||
# include <intrinsics.h>
|
# include <intrinsics.h>
|
||||||
# endif
|
# endif
|
||||||
@@ -90,19 +91,20 @@ MEM_STATIC size_t BIT_closeCStream(BIT_CStream_t* bitC);
|
|||||||
/*-********************************************
|
/*-********************************************
|
||||||
* bitStream decoding API (read backward)
|
* bitStream decoding API (read backward)
|
||||||
**********************************************/
|
**********************************************/
|
||||||
|
typedef size_t BitContainerType;
|
||||||
typedef struct {
|
typedef struct {
|
||||||
size_t bitContainer;
|
BitContainerType bitContainer;
|
||||||
unsigned bitsConsumed;
|
unsigned bitsConsumed;
|
||||||
const char* ptr;
|
const char* ptr;
|
||||||
const char* start;
|
const char* start;
|
||||||
const char* limitPtr;
|
const char* limitPtr;
|
||||||
} BIT_DStream_t;
|
} BIT_DStream_t;
|
||||||
|
|
||||||
typedef enum { BIT_DStream_unfinished = 0,
|
typedef enum { BIT_DStream_unfinished = 0, /* fully refilled */
|
||||||
BIT_DStream_endOfBuffer = 1,
|
BIT_DStream_endOfBuffer = 1, /* still some bits left in bitstream */
|
||||||
BIT_DStream_completed = 2,
|
BIT_DStream_completed = 2, /* bitstream entirely consumed, bit-exact */
|
||||||
BIT_DStream_overflow = 3 } BIT_DStream_status; /* result of BIT_reloadDStream() */
|
BIT_DStream_overflow = 3 /* user requested more bits than present in bitstream */
|
||||||
/* 1,2,4,8 would be better for bitmap combinations, but slows down performance a bit ... :( */
|
} BIT_DStream_status; /* result of BIT_reloadDStream() */
|
||||||
|
|
||||||
MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize);
|
MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, size_t srcSize);
|
||||||
MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits);
|
MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits);
|
||||||
@@ -112,7 +114,7 @@ MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* bitD);
|
|||||||
|
|
||||||
/* Start by invoking BIT_initDStream().
|
/* Start by invoking BIT_initDStream().
|
||||||
* A chunk of the bitStream is then stored into a local register.
|
* A chunk of the bitStream is then stored into a local register.
|
||||||
* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (size_t).
|
* Local register size is 64-bits on 64-bits systems, 32-bits on 32-bits systems (BitContainerType).
|
||||||
* You can then retrieve bitFields stored into the local register, **in reverse order**.
|
* You can then retrieve bitFields stored into the local register, **in reverse order**.
|
||||||
* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method.
|
* Local register is explicitly reloaded from memory by the BIT_reloadDStream() method.
|
||||||
* A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished.
|
* A reload guarantee a minimum of ((8*sizeof(bitD->bitContainer))-7) bits when its result is BIT_DStream_unfinished.
|
||||||
@@ -133,48 +135,6 @@ MEM_STATIC void BIT_flushBitsFast(BIT_CStream_t* bitC);
|
|||||||
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits);
|
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits);
|
||||||
/* faster, but works only if nbBits >= 1 */
|
/* faster, but works only if nbBits >= 1 */
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*-**************************************************************
|
|
||||||
* Internal functions
|
|
||||||
****************************************************************/
|
|
||||||
MEM_STATIC unsigned BIT_highbit32 (U32 val)
|
|
||||||
{
|
|
||||||
assert(val != 0);
|
|
||||||
{
|
|
||||||
# if defined(_MSC_VER) /* Visual */
|
|
||||||
# if STATIC_BMI2 == 1
|
|
||||||
return _lzcnt_u32(val) ^ 31;
|
|
||||||
# else
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse(&r, val);
|
|
||||||
return (unsigned)r;
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3) /* Use GCC Intrinsic */
|
|
||||||
return __builtin_clz (val) ^ 31;
|
|
||||||
# elif defined(__ICCARM__) /* IAR Intrinsic */
|
|
||||||
return 31 - __CLZ(val);
|
|
||||||
# else /* Software version */
|
|
||||||
static const unsigned DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29,
|
|
||||||
11, 14, 16, 18, 22, 25, 3, 30,
|
|
||||||
8, 12, 20, 28, 15, 17, 24, 7,
|
|
||||||
19, 27, 23, 6, 26, 5, 4, 31 };
|
|
||||||
U32 v = val;
|
|
||||||
v |= v >> 1;
|
|
||||||
v |= v >> 2;
|
|
||||||
v |= v >> 4;
|
|
||||||
v |= v >> 8;
|
|
||||||
v |= v >> 16;
|
|
||||||
return DeBruijnClz[ (U32) (v * 0x07C4ACDDU) >> 27];
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*===== Local Constants =====*/
|
/*===== Local Constants =====*/
|
||||||
static const unsigned BIT_mask[] = {
|
static const unsigned BIT_mask[] = {
|
||||||
0, 1, 3, 7, 0xF, 0x1F,
|
0, 1, 3, 7, 0xF, 0x1F,
|
||||||
@@ -204,6 +164,16 @@ MEM_STATIC size_t BIT_initCStream(BIT_CStream_t* bitC,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
FORCE_INLINE_TEMPLATE size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits)
|
||||||
|
{
|
||||||
|
#if defined(STATIC_BMI2) && STATIC_BMI2 == 1 && !defined(ZSTD_NO_INTRINSICS)
|
||||||
|
return _bzhi_u64(bitContainer, nbBits);
|
||||||
|
#else
|
||||||
|
assert(nbBits < BIT_MASK_SIZE);
|
||||||
|
return bitContainer & BIT_mask[nbBits];
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
/*! BIT_addBits() :
|
/*! BIT_addBits() :
|
||||||
* can add up to 31 bits into `bitC`.
|
* can add up to 31 bits into `bitC`.
|
||||||
* Note : does not check for register overflow ! */
|
* Note : does not check for register overflow ! */
|
||||||
@@ -213,7 +183,7 @@ MEM_STATIC void BIT_addBits(BIT_CStream_t* bitC,
|
|||||||
DEBUG_STATIC_ASSERT(BIT_MASK_SIZE == 32);
|
DEBUG_STATIC_ASSERT(BIT_MASK_SIZE == 32);
|
||||||
assert(nbBits < BIT_MASK_SIZE);
|
assert(nbBits < BIT_MASK_SIZE);
|
||||||
assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
|
assert(nbBits + bitC->bitPos < sizeof(bitC->bitContainer) * 8);
|
||||||
bitC->bitContainer |= (value & BIT_mask[nbBits]) << bitC->bitPos;
|
bitC->bitContainer |= BIT_getLowerBits(value, nbBits) << bitC->bitPos;
|
||||||
bitC->bitPos += nbBits;
|
bitC->bitPos += nbBits;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,35 +262,35 @@ MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, si
|
|||||||
bitD->ptr = (const char*)srcBuffer + srcSize - sizeof(bitD->bitContainer);
|
bitD->ptr = (const char*)srcBuffer + srcSize - sizeof(bitD->bitContainer);
|
||||||
bitD->bitContainer = MEM_readLEST(bitD->ptr);
|
bitD->bitContainer = MEM_readLEST(bitD->ptr);
|
||||||
{ BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
|
{ BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
|
||||||
bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0; /* ensures bitsConsumed is always set */
|
bitD->bitsConsumed = lastByte ? 8 - ZSTD_highbit32(lastByte) : 0; /* ensures bitsConsumed is always set */
|
||||||
if (lastByte == 0) return ERROR(GENERIC); /* endMark not present */ }
|
if (lastByte == 0) return ERROR(GENERIC); /* endMark not present */ }
|
||||||
} else {
|
} else {
|
||||||
bitD->ptr = bitD->start;
|
bitD->ptr = bitD->start;
|
||||||
bitD->bitContainer = *(const BYTE*)(bitD->start);
|
bitD->bitContainer = *(const BYTE*)(bitD->start);
|
||||||
switch(srcSize)
|
switch(srcSize)
|
||||||
{
|
{
|
||||||
case 7: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[6]) << (sizeof(bitD->bitContainer)*8 - 16);
|
case 7: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[6]) << (sizeof(bitD->bitContainer)*8 - 16);
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
case 6: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[5]) << (sizeof(bitD->bitContainer)*8 - 24);
|
case 6: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[5]) << (sizeof(bitD->bitContainer)*8 - 24);
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
case 5: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[4]) << (sizeof(bitD->bitContainer)*8 - 32);
|
case 5: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[4]) << (sizeof(bitD->bitContainer)*8 - 32);
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
case 4: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[3]) << 24;
|
case 4: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[3]) << 24;
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
case 3: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[2]) << 16;
|
case 3: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[2]) << 16;
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
case 2: bitD->bitContainer += (size_t)(((const BYTE*)(srcBuffer))[1]) << 8;
|
case 2: bitD->bitContainer += (BitContainerType)(((const BYTE*)(srcBuffer))[1]) << 8;
|
||||||
ZSTD_FALLTHROUGH;
|
ZSTD_FALLTHROUGH;
|
||||||
|
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
{ BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
|
{ BYTE const lastByte = ((const BYTE*)srcBuffer)[srcSize-1];
|
||||||
bitD->bitsConsumed = lastByte ? 8 - BIT_highbit32(lastByte) : 0;
|
bitD->bitsConsumed = lastByte ? 8 - ZSTD_highbit32(lastByte) : 0;
|
||||||
if (lastByte == 0) return ERROR(corruption_detected); /* endMark not present */
|
if (lastByte == 0) return ERROR(corruption_detected); /* endMark not present */
|
||||||
}
|
}
|
||||||
bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize)*8;
|
bitD->bitsConsumed += (U32)(sizeof(bitD->bitContainer) - srcSize)*8;
|
||||||
@@ -329,12 +299,12 @@ MEM_STATIC size_t BIT_initDStream(BIT_DStream_t* bitD, const void* srcBuffer, si
|
|||||||
return srcSize;
|
return srcSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getUpperBits(size_t bitContainer, U32 const start)
|
FORCE_INLINE_TEMPLATE size_t BIT_getUpperBits(BitContainerType bitContainer, U32 const start)
|
||||||
{
|
{
|
||||||
return bitContainer >> start;
|
return bitContainer >> start;
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getMiddleBits(size_t bitContainer, U32 const start, U32 const nbBits)
|
FORCE_INLINE_TEMPLATE size_t BIT_getMiddleBits(BitContainerType bitContainer, U32 const start, U32 const nbBits)
|
||||||
{
|
{
|
||||||
U32 const regMask = sizeof(bitContainer)*8 - 1;
|
U32 const regMask = sizeof(bitContainer)*8 - 1;
|
||||||
/* if start > regMask, bitstream is corrupted, and result is undefined */
|
/* if start > regMask, bitstream is corrupted, and result is undefined */
|
||||||
@@ -351,23 +321,13 @@ MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getMiddleBits(size_t bitContainer, U32 c
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC FORCE_INLINE_ATTR size_t BIT_getLowerBits(size_t bitContainer, U32 const nbBits)
|
|
||||||
{
|
|
||||||
#if defined(STATIC_BMI2) && STATIC_BMI2 == 1
|
|
||||||
return _bzhi_u64(bitContainer, nbBits);
|
|
||||||
#else
|
|
||||||
assert(nbBits < BIT_MASK_SIZE);
|
|
||||||
return bitContainer & BIT_mask[nbBits];
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
/*! BIT_lookBits() :
|
/*! BIT_lookBits() :
|
||||||
* Provides next n bits from local register.
|
* Provides next n bits from local register.
|
||||||
* local register is not modified.
|
* local register is not modified.
|
||||||
* On 32-bits, maxNbBits==24.
|
* On 32-bits, maxNbBits==24.
|
||||||
* On 64-bits, maxNbBits==56.
|
* On 64-bits, maxNbBits==56.
|
||||||
* @return : value extracted */
|
* @return : value extracted */
|
||||||
MEM_STATIC FORCE_INLINE_ATTR size_t BIT_lookBits(const BIT_DStream_t* bitD, U32 nbBits)
|
FORCE_INLINE_TEMPLATE size_t BIT_lookBits(const BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
/* arbitrate between double-shift and shift+mask */
|
/* arbitrate between double-shift and shift+mask */
|
||||||
#if 1
|
#if 1
|
||||||
@@ -390,7 +350,7 @@ MEM_STATIC size_t BIT_lookBitsFast(const BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
return (bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> (((regMask+1)-nbBits) & regMask);
|
return (bitD->bitContainer << (bitD->bitsConsumed & regMask)) >> (((regMask+1)-nbBits) & regMask);
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC FORCE_INLINE_ATTR void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits)
|
FORCE_INLINE_TEMPLATE void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
bitD->bitsConsumed += nbBits;
|
bitD->bitsConsumed += nbBits;
|
||||||
}
|
}
|
||||||
@@ -399,7 +359,7 @@ MEM_STATIC FORCE_INLINE_ATTR void BIT_skipBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
* Read (consume) next n bits from local register and update.
|
* Read (consume) next n bits from local register and update.
|
||||||
* Pay attention to not read more than nbBits contained into local register.
|
* Pay attention to not read more than nbBits contained into local register.
|
||||||
* @return : extracted value. */
|
* @return : extracted value. */
|
||||||
MEM_STATIC FORCE_INLINE_ATTR size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits)
|
FORCE_INLINE_TEMPLATE size_t BIT_readBits(BIT_DStream_t* bitD, unsigned nbBits)
|
||||||
{
|
{
|
||||||
size_t const value = BIT_lookBits(bitD, nbBits);
|
size_t const value = BIT_lookBits(bitD, nbBits);
|
||||||
BIT_skipBits(bitD, nbBits);
|
BIT_skipBits(bitD, nbBits);
|
||||||
@@ -407,7 +367,7 @@ MEM_STATIC FORCE_INLINE_ATTR size_t BIT_readBits(BIT_DStream_t* bitD, unsigned n
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*! BIT_readBitsFast() :
|
/*! BIT_readBitsFast() :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits)
|
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits)
|
||||||
{
|
{
|
||||||
size_t const value = BIT_lookBitsFast(bitD, nbBits);
|
size_t const value = BIT_lookBitsFast(bitD, nbBits);
|
||||||
@@ -416,6 +376,21 @@ MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, unsigned nbBits)
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! BIT_reloadDStream_internal() :
|
||||||
|
* Simple variant of BIT_reloadDStream(), with two conditions:
|
||||||
|
* 1. bitstream is valid : bitsConsumed <= sizeof(bitD->bitContainer)*8
|
||||||
|
* 2. look window is valid after shifted down : bitD->ptr >= bitD->start
|
||||||
|
*/
|
||||||
|
MEM_STATIC BIT_DStream_status BIT_reloadDStream_internal(BIT_DStream_t* bitD)
|
||||||
|
{
|
||||||
|
assert(bitD->bitsConsumed <= sizeof(bitD->bitContainer)*8);
|
||||||
|
bitD->ptr -= bitD->bitsConsumed >> 3;
|
||||||
|
assert(bitD->ptr >= bitD->start);
|
||||||
|
bitD->bitsConsumed &= 7;
|
||||||
|
bitD->bitContainer = MEM_readLEST(bitD->ptr);
|
||||||
|
return BIT_DStream_unfinished;
|
||||||
|
}
|
||||||
|
|
||||||
/*! BIT_reloadDStreamFast() :
|
/*! BIT_reloadDStreamFast() :
|
||||||
* Similar to BIT_reloadDStream(), but with two differences:
|
* Similar to BIT_reloadDStream(), but with two differences:
|
||||||
* 1. bitsConsumed <= sizeof(bitD->bitContainer)*8 must hold!
|
* 1. bitsConsumed <= sizeof(bitD->bitContainer)*8 must hold!
|
||||||
@@ -426,31 +401,35 @@ MEM_STATIC BIT_DStream_status BIT_reloadDStreamFast(BIT_DStream_t* bitD)
|
|||||||
{
|
{
|
||||||
if (UNLIKELY(bitD->ptr < bitD->limitPtr))
|
if (UNLIKELY(bitD->ptr < bitD->limitPtr))
|
||||||
return BIT_DStream_overflow;
|
return BIT_DStream_overflow;
|
||||||
assert(bitD->bitsConsumed <= sizeof(bitD->bitContainer)*8);
|
return BIT_reloadDStream_internal(bitD);
|
||||||
bitD->ptr -= bitD->bitsConsumed >> 3;
|
|
||||||
bitD->bitsConsumed &= 7;
|
|
||||||
bitD->bitContainer = MEM_readLEST(bitD->ptr);
|
|
||||||
return BIT_DStream_unfinished;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! BIT_reloadDStream() :
|
/*! BIT_reloadDStream() :
|
||||||
* Refill `bitD` from buffer previously set in BIT_initDStream() .
|
* Refill `bitD` from buffer previously set in BIT_initDStream() .
|
||||||
* This function is safe, it guarantees it will not read beyond src buffer.
|
* This function is safe, it guarantees it will not never beyond src buffer.
|
||||||
* @return : status of `BIT_DStream_t` internal register.
|
* @return : status of `BIT_DStream_t` internal register.
|
||||||
* when status == BIT_DStream_unfinished, internal register is filled with at least 25 or 57 bits */
|
* when status == BIT_DStream_unfinished, internal register is filled with at least 25 or 57 bits */
|
||||||
MEM_STATIC BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD)
|
FORCE_INLINE_TEMPLATE BIT_DStream_status BIT_reloadDStream(BIT_DStream_t* bitD)
|
||||||
{
|
{
|
||||||
if (bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8)) /* overflow detected, like end of stream */
|
/* note : once in overflow mode, a bitstream remains in this mode until it's reset */
|
||||||
|
if (UNLIKELY(bitD->bitsConsumed > (sizeof(bitD->bitContainer)*8))) {
|
||||||
|
static const BitContainerType zeroFilled = 0;
|
||||||
|
bitD->ptr = (const char*)&zeroFilled; /* aliasing is allowed for char */
|
||||||
|
/* overflow detected, erroneous scenario or end of stream: no update */
|
||||||
return BIT_DStream_overflow;
|
return BIT_DStream_overflow;
|
||||||
|
}
|
||||||
|
|
||||||
|
assert(bitD->ptr >= bitD->start);
|
||||||
|
|
||||||
if (bitD->ptr >= bitD->limitPtr) {
|
if (bitD->ptr >= bitD->limitPtr) {
|
||||||
return BIT_reloadDStreamFast(bitD);
|
return BIT_reloadDStream_internal(bitD);
|
||||||
}
|
}
|
||||||
if (bitD->ptr == bitD->start) {
|
if (bitD->ptr == bitD->start) {
|
||||||
|
/* reached end of bitStream => no update */
|
||||||
if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer;
|
if (bitD->bitsConsumed < sizeof(bitD->bitContainer)*8) return BIT_DStream_endOfBuffer;
|
||||||
return BIT_DStream_completed;
|
return BIT_DStream_completed;
|
||||||
}
|
}
|
||||||
/* start < ptr < limitPtr */
|
/* start < ptr < limitPtr => cautious update */
|
||||||
{ U32 nbBytes = bitD->bitsConsumed >> 3;
|
{ U32 nbBytes = bitD->bitsConsumed >> 3;
|
||||||
BIT_DStream_status result = BIT_DStream_unfinished;
|
BIT_DStream_status result = BIT_DStream_unfinished;
|
||||||
if (bitD->ptr - nbBytes < bitD->start) {
|
if (bitD->ptr - nbBytes < bitD->start) {
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/clevels.h
generated
vendored
2
vendor/github.com/DataDog/zstd/clevels.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
161
vendor/github.com/DataDog/zstd/compiler.h
generated
vendored
161
vendor/github.com/DataDog/zstd/compiler.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -12,6 +12,8 @@
|
|||||||
#ifndef ZSTD_COMPILER_H
|
#ifndef ZSTD_COMPILER_H
|
||||||
#define ZSTD_COMPILER_H
|
#define ZSTD_COMPILER_H
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
#include "portability_macros.h"
|
#include "portability_macros.h"
|
||||||
|
|
||||||
/*-*******************************************************
|
/*-*******************************************************
|
||||||
@@ -52,12 +54,19 @@
|
|||||||
# define WIN_CDECL
|
# define WIN_CDECL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* UNUSED_ATTR tells the compiler it is okay if the function is unused. */
|
||||||
|
#if defined(__GNUC__)
|
||||||
|
# define UNUSED_ATTR __attribute__((unused))
|
||||||
|
#else
|
||||||
|
# define UNUSED_ATTR
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant
|
* FORCE_INLINE_TEMPLATE is used to define C "templates", which take constant
|
||||||
* parameters. They must be inlined for the compiler to eliminate the constant
|
* parameters. They must be inlined for the compiler to eliminate the constant
|
||||||
* branches.
|
* branches.
|
||||||
*/
|
*/
|
||||||
#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR
|
#define FORCE_INLINE_TEMPLATE static INLINE_KEYWORD FORCE_INLINE_ATTR UNUSED_ATTR
|
||||||
/**
|
/**
|
||||||
* HINT_INLINE is used to help the compiler generate better code. It is *not*
|
* HINT_INLINE is used to help the compiler generate better code. It is *not*
|
||||||
* used for "templates", so it can be tweaked based on the compilers
|
* used for "templates", so it can be tweaked based on the compilers
|
||||||
@@ -72,14 +81,28 @@
|
|||||||
#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8 && __GNUC__ < 5
|
#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8 && __GNUC__ < 5
|
||||||
# define HINT_INLINE static INLINE_KEYWORD
|
# define HINT_INLINE static INLINE_KEYWORD
|
||||||
#else
|
#else
|
||||||
# define HINT_INLINE static INLINE_KEYWORD FORCE_INLINE_ATTR
|
# define HINT_INLINE FORCE_INLINE_TEMPLATE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* UNUSED_ATTR tells the compiler it is okay if the function is unused. */
|
/* "soft" inline :
|
||||||
|
* The compiler is free to select if it's a good idea to inline or not.
|
||||||
|
* The main objective is to silence compiler warnings
|
||||||
|
* when a defined function in included but not used.
|
||||||
|
*
|
||||||
|
* Note : this macro is prefixed `MEM_` because it used to be provided by `mem.h` unit.
|
||||||
|
* Updating the prefix is probably preferable, but requires a fairly large codemod,
|
||||||
|
* since this name is used everywhere.
|
||||||
|
*/
|
||||||
|
#ifndef MEM_STATIC /* already defined in Linux Kernel mem.h */
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
# define UNUSED_ATTR __attribute__((unused))
|
# define MEM_STATIC static __inline UNUSED_ATTR
|
||||||
|
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
||||||
|
# define MEM_STATIC static inline
|
||||||
|
#elif defined(_MSC_VER)
|
||||||
|
# define MEM_STATIC static __inline
|
||||||
#else
|
#else
|
||||||
# define UNUSED_ATTR
|
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* force no inlining */
|
/* force no inlining */
|
||||||
@@ -110,10 +133,10 @@
|
|||||||
/* prefetch
|
/* prefetch
|
||||||
* can be disabled, by declaring NO_PREFETCH build macro */
|
* can be disabled, by declaring NO_PREFETCH build macro */
|
||||||
#if defined(NO_PREFETCH)
|
#if defined(NO_PREFETCH)
|
||||||
# define PREFETCH_L1(ptr) (void)(ptr) /* disabled */
|
# define PREFETCH_L1(ptr) do { (void)(ptr); } while (0) /* disabled */
|
||||||
# define PREFETCH_L2(ptr) (void)(ptr) /* disabled */
|
# define PREFETCH_L2(ptr) do { (void)(ptr); } while (0) /* disabled */
|
||||||
#else
|
#else
|
||||||
# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) /* _mm_prefetch() is not defined outside of x86/x64 */
|
# if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_I86)) && !defined(_M_ARM64EC) /* _mm_prefetch() is not defined outside of x86/x64 */
|
||||||
# include <mmintrin.h> /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */
|
# include <mmintrin.h> /* https://msdn.microsoft.com/fr-fr/library/84szxsww(v=vs.90).aspx */
|
||||||
# define PREFETCH_L1(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0)
|
# define PREFETCH_L1(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T0)
|
||||||
# define PREFETCH_L2(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T1)
|
# define PREFETCH_L2(ptr) _mm_prefetch((const char*)(ptr), _MM_HINT_T1)
|
||||||
@@ -121,24 +144,25 @@
|
|||||||
# define PREFETCH_L1(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */)
|
# define PREFETCH_L1(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 3 /* locality */)
|
||||||
# define PREFETCH_L2(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 2 /* locality */)
|
# define PREFETCH_L2(ptr) __builtin_prefetch((ptr), 0 /* rw==read */, 2 /* locality */)
|
||||||
# elif defined(__aarch64__)
|
# elif defined(__aarch64__)
|
||||||
# define PREFETCH_L1(ptr) __asm__ __volatile__("prfm pldl1keep, %0" ::"Q"(*(ptr)))
|
# define PREFETCH_L1(ptr) do { __asm__ __volatile__("prfm pldl1keep, %0" ::"Q"(*(ptr))); } while (0)
|
||||||
# define PREFETCH_L2(ptr) __asm__ __volatile__("prfm pldl2keep, %0" ::"Q"(*(ptr)))
|
# define PREFETCH_L2(ptr) do { __asm__ __volatile__("prfm pldl2keep, %0" ::"Q"(*(ptr))); } while (0)
|
||||||
# else
|
# else
|
||||||
# define PREFETCH_L1(ptr) (void)(ptr) /* disabled */
|
# define PREFETCH_L1(ptr) do { (void)(ptr); } while (0) /* disabled */
|
||||||
# define PREFETCH_L2(ptr) (void)(ptr) /* disabled */
|
# define PREFETCH_L2(ptr) do { (void)(ptr); } while (0) /* disabled */
|
||||||
# endif
|
# endif
|
||||||
#endif /* NO_PREFETCH */
|
#endif /* NO_PREFETCH */
|
||||||
|
|
||||||
#define CACHELINE_SIZE 64
|
#define CACHELINE_SIZE 64
|
||||||
|
|
||||||
#define PREFETCH_AREA(p, s) { \
|
#define PREFETCH_AREA(p, s) \
|
||||||
const char* const _ptr = (const char*)(p); \
|
do { \
|
||||||
size_t const _size = (size_t)(s); \
|
const char* const _ptr = (const char*)(p); \
|
||||||
size_t _pos; \
|
size_t const _size = (size_t)(s); \
|
||||||
for (_pos=0; _pos<_size; _pos+=CACHELINE_SIZE) { \
|
size_t _pos; \
|
||||||
PREFETCH_L2(_ptr + _pos); \
|
for (_pos=0; _pos<_size; _pos+=CACHELINE_SIZE) { \
|
||||||
} \
|
PREFETCH_L2(_ptr + _pos); \
|
||||||
}
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
/* vectorization
|
/* vectorization
|
||||||
* older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax,
|
* older GCC (pre gcc-4.3 picked as the cutoff) uses a different syntax,
|
||||||
@@ -166,6 +190,12 @@
|
|||||||
#define UNLIKELY(x) (x)
|
#define UNLIKELY(x) (x)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if __has_builtin(__builtin_unreachable) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)))
|
||||||
|
# define ZSTD_UNREACHABLE do { assert(0), __builtin_unreachable(); } while (0)
|
||||||
|
#else
|
||||||
|
# define ZSTD_UNREACHABLE do { assert(0); } while (0)
|
||||||
|
#endif
|
||||||
|
|
||||||
/* disable warnings */
|
/* disable warnings */
|
||||||
#ifdef _MSC_VER /* Visual Studio */
|
#ifdef _MSC_VER /* Visual Studio */
|
||||||
# include <intrin.h> /* For Visual 2005 */
|
# include <intrin.h> /* For Visual 2005 */
|
||||||
@@ -182,6 +212,8 @@
|
|||||||
# ifdef __AVX2__ //MSVC does not have a BMI2 specific flag, but every CPU that supports AVX2 also supports BMI2
|
# ifdef __AVX2__ //MSVC does not have a BMI2 specific flag, but every CPU that supports AVX2 also supports BMI2
|
||||||
# define STATIC_BMI2 1
|
# define STATIC_BMI2 1
|
||||||
# endif
|
# endif
|
||||||
|
# elif defined(__BMI2__) && defined(__x86_64__) && defined(__GNUC__)
|
||||||
|
# define STATIC_BMI2 1
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -274,7 +306,86 @@
|
|||||||
* Sanitizer
|
* Sanitizer
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
|
|
||||||
#if ZSTD_MEMORY_SANITIZER
|
/**
|
||||||
|
* Zstd relies on pointer overflow in its decompressor.
|
||||||
|
* We add this attribute to functions that rely on pointer overflow.
|
||||||
|
*/
|
||||||
|
#ifndef ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
# if __has_attribute(no_sanitize)
|
||||||
|
# if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 8
|
||||||
|
/* gcc < 8 only has signed-integer-overlow which triggers on pointer overflow */
|
||||||
|
# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR __attribute__((no_sanitize("signed-integer-overflow")))
|
||||||
|
# else
|
||||||
|
/* older versions of clang [3.7, 5.0) will warn that pointer-overflow is ignored. */
|
||||||
|
# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR __attribute__((no_sanitize("pointer-overflow")))
|
||||||
|
# endif
|
||||||
|
# else
|
||||||
|
# define ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function to perform a wrapped pointer difference without trigging
|
||||||
|
* UBSAN.
|
||||||
|
*
|
||||||
|
* @returns lhs - rhs with wrapping
|
||||||
|
*/
|
||||||
|
MEM_STATIC
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
ptrdiff_t ZSTD_wrappedPtrDiff(unsigned char const* lhs, unsigned char const* rhs)
|
||||||
|
{
|
||||||
|
return lhs - rhs;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function to perform a wrapped pointer add without triggering UBSAN.
|
||||||
|
*
|
||||||
|
* @return ptr + add with wrapping
|
||||||
|
*/
|
||||||
|
MEM_STATIC
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
unsigned char const* ZSTD_wrappedPtrAdd(unsigned char const* ptr, ptrdiff_t add)
|
||||||
|
{
|
||||||
|
return ptr + add;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function to perform a wrapped pointer subtraction without triggering
|
||||||
|
* UBSAN.
|
||||||
|
*
|
||||||
|
* @return ptr - sub with wrapping
|
||||||
|
*/
|
||||||
|
MEM_STATIC
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
unsigned char const* ZSTD_wrappedPtrSub(unsigned char const* ptr, ptrdiff_t sub)
|
||||||
|
{
|
||||||
|
return ptr - sub;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper function to add to a pointer that works around C's undefined behavior
|
||||||
|
* of adding 0 to NULL.
|
||||||
|
*
|
||||||
|
* @returns `ptr + add` except it defines `NULL + 0 == NULL`.
|
||||||
|
*/
|
||||||
|
MEM_STATIC
|
||||||
|
unsigned char* ZSTD_maybeNullPtrAdd(unsigned char* ptr, ptrdiff_t add)
|
||||||
|
{
|
||||||
|
return add > 0 ? ptr + add : ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Issue #3240 reports an ASAN failure on an llvm-mingw build. Out of an
|
||||||
|
* abundance of caution, disable our custom poisoning on mingw. */
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
#ifndef ZSTD_ASAN_DONT_POISON_WORKSPACE
|
||||||
|
#define ZSTD_ASAN_DONT_POISON_WORKSPACE 1
|
||||||
|
#endif
|
||||||
|
#ifndef ZSTD_MSAN_DONT_POISON_WORKSPACE
|
||||||
|
#define ZSTD_MSAN_DONT_POISON_WORKSPACE 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if ZSTD_MEMORY_SANITIZER && !defined(ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
||||||
/* Not all platforms that support msan provide sanitizers/msan_interface.h.
|
/* Not all platforms that support msan provide sanitizers/msan_interface.h.
|
||||||
* We therefore declare the functions we need ourselves, rather than trying to
|
* We therefore declare the functions we need ourselves, rather than trying to
|
||||||
* include the header file... */
|
* include the header file... */
|
||||||
@@ -293,9 +404,13 @@ void __msan_poison(const volatile void *a, size_t size);
|
|||||||
/* Returns the offset of the first (at least partially) poisoned byte in the
|
/* Returns the offset of the first (at least partially) poisoned byte in the
|
||||||
memory range, or -1 if the whole range is good. */
|
memory range, or -1 if the whole range is good. */
|
||||||
intptr_t __msan_test_shadow(const volatile void *x, size_t size);
|
intptr_t __msan_test_shadow(const volatile void *x, size_t size);
|
||||||
|
|
||||||
|
/* Print shadow and origin for the memory range to stderr in a human-readable
|
||||||
|
format. */
|
||||||
|
void __msan_print_shadow(const volatile void *x, size_t size);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ZSTD_ADDRESS_SANITIZER
|
#if ZSTD_ADDRESS_SANITIZER && !defined(ZSTD_ASAN_DONT_POISON_WORKSPACE)
|
||||||
/* Not all platforms that support asan provide sanitizers/asan_interface.h.
|
/* Not all platforms that support asan provide sanitizers/asan_interface.h.
|
||||||
* We therefore declare the functions we need ourselves, rather than trying to
|
* We therefore declare the functions we need ourselves, rather than trying to
|
||||||
* include the header file... */
|
* include the header file... */
|
||||||
|
|||||||
62
vendor/github.com/DataDog/zstd/cover.c
generated
vendored
62
vendor/github.com/DataDog/zstd/cover.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -32,9 +32,10 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mem.h" /* read */
|
#include "mem.h" /* read */
|
||||||
#include "pool.h"
|
#include "pool.h" /* POOL_ctx */
|
||||||
#include "threading.h"
|
#include "threading.h" /* ZSTD_pthread_mutex_t */
|
||||||
#include "zstd_internal.h" /* includes zstd.h */
|
#include "zstd_internal.h" /* includes zstd.h */
|
||||||
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
#include "zdict.h"
|
#include "zdict.h"
|
||||||
#include "cover.h"
|
#include "cover.h"
|
||||||
|
|
||||||
@@ -78,7 +79,7 @@ static clock_t g_time = 0;
|
|||||||
#undef LOCALDISPLAYUPDATE
|
#undef LOCALDISPLAYUPDATE
|
||||||
#define LOCALDISPLAYUPDATE(displayLevel, l, ...) \
|
#define LOCALDISPLAYUPDATE(displayLevel, l, ...) \
|
||||||
if (displayLevel >= l) { \
|
if (displayLevel >= l) { \
|
||||||
if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) { \
|
if ((clock() - g_time > g_refreshRate) || (displayLevel >= 4)) { \
|
||||||
g_time = clock(); \
|
g_time = clock(); \
|
||||||
DISPLAY(__VA_ARGS__); \
|
DISPLAY(__VA_ARGS__); \
|
||||||
} \
|
} \
|
||||||
@@ -301,9 +302,10 @@ static int WIN_CDECL COVER_strict_cmp8(const void *lp, const void *rp) {
|
|||||||
* Returns the first pointer in [first, last) whose element does not compare
|
* Returns the first pointer in [first, last) whose element does not compare
|
||||||
* less than value. If no such element exists it returns last.
|
* less than value. If no such element exists it returns last.
|
||||||
*/
|
*/
|
||||||
static const size_t *COVER_lower_bound(const size_t *first, const size_t *last,
|
static const size_t *COVER_lower_bound(const size_t* first, const size_t* last,
|
||||||
size_t value) {
|
size_t value) {
|
||||||
size_t count = last - first;
|
size_t count = (size_t)(last - first);
|
||||||
|
assert(last >= first);
|
||||||
while (count != 0) {
|
while (count != 0) {
|
||||||
size_t step = count / 2;
|
size_t step = count / 2;
|
||||||
const size_t *ptr = first;
|
const size_t *ptr = first;
|
||||||
@@ -542,14 +544,15 @@ static void COVER_ctx_destroy(COVER_ctx_t *ctx) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Prepare a context for dictionary building.
|
* Prepare a context for dictionary building.
|
||||||
* The context is only dependent on the parameter `d` and can used multiple
|
* The context is only dependent on the parameter `d` and can be used multiple
|
||||||
* times.
|
* times.
|
||||||
* Returns 0 on success or error code on error.
|
* Returns 0 on success or error code on error.
|
||||||
* The context must be destroyed with `COVER_ctx_destroy()`.
|
* The context must be destroyed with `COVER_ctx_destroy()`.
|
||||||
*/
|
*/
|
||||||
static size_t COVER_ctx_init(COVER_ctx_t *ctx, const void *samplesBuffer,
|
static size_t COVER_ctx_init(COVER_ctx_t *ctx, const void *samplesBuffer,
|
||||||
const size_t *samplesSizes, unsigned nbSamples,
|
const size_t *samplesSizes, unsigned nbSamples,
|
||||||
unsigned d, double splitPoint) {
|
unsigned d, double splitPoint)
|
||||||
|
{
|
||||||
const BYTE *const samples = (const BYTE *)samplesBuffer;
|
const BYTE *const samples = (const BYTE *)samplesBuffer;
|
||||||
const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
|
const size_t totalSamplesSize = COVER_sum(samplesSizes, nbSamples);
|
||||||
/* Split samples into testing and training sets */
|
/* Split samples into testing and training sets */
|
||||||
@@ -647,7 +650,7 @@ static size_t COVER_ctx_init(COVER_ctx_t *ctx, const void *samplesBuffer,
|
|||||||
|
|
||||||
void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel)
|
void COVER_warnOnSmallCorpus(size_t maxDictSize, size_t nbDmers, int displayLevel)
|
||||||
{
|
{
|
||||||
const double ratio = (double)nbDmers / maxDictSize;
|
const double ratio = (double)nbDmers / (double)maxDictSize;
|
||||||
if (ratio >= 10) {
|
if (ratio >= 10) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -733,7 +736,7 @@ static size_t COVER_buildDictionary(const COVER_ctx_t *ctx, U32 *freqs,
|
|||||||
return tail;
|
return tail;
|
||||||
}
|
}
|
||||||
|
|
||||||
ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
|
ZDICTLIB_STATIC_API size_t ZDICT_trainFromBuffer_cover(
|
||||||
void *dictBuffer, size_t dictBufferCapacity,
|
void *dictBuffer, size_t dictBufferCapacity,
|
||||||
const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
|
const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_cover_params_t parameters)
|
ZDICT_cover_params_t parameters)
|
||||||
@@ -907,8 +910,10 @@ void COVER_best_start(COVER_best_t *best) {
|
|||||||
* Decrements liveJobs and signals any waiting threads if liveJobs == 0.
|
* Decrements liveJobs and signals any waiting threads if liveJobs == 0.
|
||||||
* If this dictionary is the best so far save it and its parameters.
|
* If this dictionary is the best so far save it and its parameters.
|
||||||
*/
|
*/
|
||||||
void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
|
void COVER_best_finish(COVER_best_t* best,
|
||||||
COVER_dictSelection_t selection) {
|
ZDICT_cover_params_t parameters,
|
||||||
|
COVER_dictSelection_t selection)
|
||||||
|
{
|
||||||
void* dict = selection.dictContent;
|
void* dict = selection.dictContent;
|
||||||
size_t compressedSize = selection.totalCompressedSize;
|
size_t compressedSize = selection.totalCompressedSize;
|
||||||
size_t dictSize = selection.dictSize;
|
size_t dictSize = selection.dictSize;
|
||||||
@@ -951,9 +956,17 @@ void COVER_best_finish(COVER_best_t *best, ZDICT_cover_params_t parameters,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static COVER_dictSelection_t setDictSelection(BYTE* buf, size_t s, size_t csz)
|
||||||
|
{
|
||||||
|
COVER_dictSelection_t ds;
|
||||||
|
ds.dictContent = buf;
|
||||||
|
ds.dictSize = s;
|
||||||
|
ds.totalCompressedSize = csz;
|
||||||
|
return ds;
|
||||||
|
}
|
||||||
|
|
||||||
COVER_dictSelection_t COVER_dictSelectionError(size_t error) {
|
COVER_dictSelection_t COVER_dictSelectionError(size_t error) {
|
||||||
COVER_dictSelection_t selection = { NULL, 0, error };
|
return setDictSelection(NULL, 0, error);
|
||||||
return selection;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection) {
|
unsigned COVER_dictSelectionIsError(COVER_dictSelection_t selection) {
|
||||||
@@ -972,8 +985,8 @@ COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent, size_t dictBuffe
|
|||||||
size_t largestCompressed = 0;
|
size_t largestCompressed = 0;
|
||||||
BYTE* customDictContentEnd = customDictContent + dictContentSize;
|
BYTE* customDictContentEnd = customDictContent + dictContentSize;
|
||||||
|
|
||||||
BYTE * largestDictbuffer = (BYTE *)malloc(dictBufferCapacity);
|
BYTE* largestDictbuffer = (BYTE*)malloc(dictBufferCapacity);
|
||||||
BYTE * candidateDictBuffer = (BYTE *)malloc(dictBufferCapacity);
|
BYTE* candidateDictBuffer = (BYTE*)malloc(dictBufferCapacity);
|
||||||
double regressionTolerance = ((double)params.shrinkDictMaxRegression / 100.0) + 1.00;
|
double regressionTolerance = ((double)params.shrinkDictMaxRegression / 100.0) + 1.00;
|
||||||
|
|
||||||
if (!largestDictbuffer || !candidateDictBuffer) {
|
if (!largestDictbuffer || !candidateDictBuffer) {
|
||||||
@@ -1006,9 +1019,8 @@ COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent, size_t dictBuffe
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (params.shrinkDict == 0) {
|
if (params.shrinkDict == 0) {
|
||||||
COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
|
|
||||||
free(candidateDictBuffer);
|
free(candidateDictBuffer);
|
||||||
return selection;
|
return setDictSelection(largestDictbuffer, dictContentSize, totalCompressedSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
largestDict = dictContentSize;
|
largestDict = dictContentSize;
|
||||||
@@ -1040,20 +1052,16 @@ COVER_dictSelection_t COVER_selectDict(BYTE* customDictContent, size_t dictBuffe
|
|||||||
return COVER_dictSelectionError(totalCompressedSize);
|
return COVER_dictSelectionError(totalCompressedSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (totalCompressedSize <= largestCompressed * regressionTolerance) {
|
if ((double)totalCompressedSize <= (double)largestCompressed * regressionTolerance) {
|
||||||
COVER_dictSelection_t selection = { candidateDictBuffer, dictContentSize, totalCompressedSize };
|
|
||||||
free(largestDictbuffer);
|
free(largestDictbuffer);
|
||||||
return selection;
|
return setDictSelection( candidateDictBuffer, dictContentSize, totalCompressedSize );
|
||||||
}
|
}
|
||||||
dictContentSize *= 2;
|
dictContentSize *= 2;
|
||||||
}
|
}
|
||||||
dictContentSize = largestDict;
|
dictContentSize = largestDict;
|
||||||
totalCompressedSize = largestCompressed;
|
totalCompressedSize = largestCompressed;
|
||||||
{
|
free(candidateDictBuffer);
|
||||||
COVER_dictSelection_t selection = { largestDictbuffer, dictContentSize, totalCompressedSize };
|
return setDictSelection( largestDictbuffer, dictContentSize, totalCompressedSize );
|
||||||
free(candidateDictBuffer);
|
|
||||||
return selection;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1116,7 +1124,7 @@ _cleanup:
|
|||||||
free(freqs);
|
free(freqs);
|
||||||
}
|
}
|
||||||
|
|
||||||
ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
|
ZDICTLIB_STATIC_API size_t ZDICT_optimizeTrainFromBuffer_cover(
|
||||||
void* dictBuffer, size_t dictBufferCapacity, const void* samplesBuffer,
|
void* dictBuffer, size_t dictBufferCapacity, const void* samplesBuffer,
|
||||||
const size_t* samplesSizes, unsigned nbSamples,
|
const size_t* samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_cover_params_t* parameters)
|
ZDICT_cover_params_t* parameters)
|
||||||
|
|||||||
12
vendor/github.com/DataDog/zstd/cover.h
generated
vendored
12
vendor/github.com/DataDog/zstd/cover.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -13,14 +13,8 @@
|
|||||||
# define ZDICT_STATIC_LINKING_ONLY
|
# define ZDICT_STATIC_LINKING_ONLY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h> /* fprintf */
|
#include "threading.h" /* ZSTD_pthread_mutex_t */
|
||||||
#include <stdlib.h> /* malloc, free, qsort */
|
#include "mem.h" /* U32, BYTE */
|
||||||
#include <string.h> /* memset */
|
|
||||||
#include <time.h> /* clock */
|
|
||||||
#include "mem.h" /* read */
|
|
||||||
#include "pool.h"
|
|
||||||
#include "threading.h"
|
|
||||||
#include "zstd_internal.h" /* includes zstd.h */
|
|
||||||
#include "zdict.h"
|
#include "zdict.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
38
vendor/github.com/DataDog/zstd/cpu.h
generated
vendored
38
vendor/github.com/DataDog/zstd/cpu.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -36,6 +36,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
|
|||||||
U32 f7b = 0;
|
U32 f7b = 0;
|
||||||
U32 f7c = 0;
|
U32 f7c = 0;
|
||||||
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
|
#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
|
||||||
|
#if !defined(__clang__)
|
||||||
int reg[4];
|
int reg[4];
|
||||||
__cpuid((int*)reg, 0);
|
__cpuid((int*)reg, 0);
|
||||||
{
|
{
|
||||||
@@ -51,6 +52,41 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
|
|||||||
f7c = (U32)reg[2];
|
f7c = (U32)reg[2];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
/* Clang compiler has a bug (fixed in https://reviews.llvm.org/D101338) in
|
||||||
|
* which the `__cpuid` intrinsic does not save and restore `rbx` as it needs
|
||||||
|
* to due to being a reserved register. So in that case, do the `cpuid`
|
||||||
|
* ourselves. Clang supports inline assembly anyway.
|
||||||
|
*/
|
||||||
|
U32 n;
|
||||||
|
__asm__(
|
||||||
|
"pushq %%rbx\n\t"
|
||||||
|
"cpuid\n\t"
|
||||||
|
"popq %%rbx\n\t"
|
||||||
|
: "=a"(n)
|
||||||
|
: "a"(0)
|
||||||
|
: "rcx", "rdx");
|
||||||
|
if (n >= 1) {
|
||||||
|
U32 f1a;
|
||||||
|
__asm__(
|
||||||
|
"pushq %%rbx\n\t"
|
||||||
|
"cpuid\n\t"
|
||||||
|
"popq %%rbx\n\t"
|
||||||
|
: "=a"(f1a), "=c"(f1c), "=d"(f1d)
|
||||||
|
: "a"(1)
|
||||||
|
:);
|
||||||
|
}
|
||||||
|
if (n >= 7) {
|
||||||
|
__asm__(
|
||||||
|
"pushq %%rbx\n\t"
|
||||||
|
"cpuid\n\t"
|
||||||
|
"movq %%rbx, %%rax\n\t"
|
||||||
|
"popq %%rbx"
|
||||||
|
: "=a"(f7b), "=c"(f7c)
|
||||||
|
: "a"(7), "c"(0)
|
||||||
|
: "rdx");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#elif defined(__i386__) && defined(__PIC__) && !defined(__clang__) && defined(__GNUC__)
|
#elif defined(__i386__) && defined(__PIC__) && !defined(__clang__) && defined(__GNUC__)
|
||||||
/* The following block like the normal cpuid branch below, but gcc
|
/* The following block like the normal cpuid branch below, but gcc
|
||||||
* reserves ebx for use of its pic register so we must specially
|
* reserves ebx for use of its pic register so we must specially
|
||||||
|
|||||||
8
vendor/github.com/DataDog/zstd/debug.c
generated
vendored
8
vendor/github.com/DataDog/zstd/debug.c
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* debug
|
* debug
|
||||||
* Part of FSE library
|
* Part of FSE library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -22,6 +22,12 @@
|
|||||||
|
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
|
#if !defined(ZSTD_LINUX_KERNEL) || (DEBUGLEVEL>=2)
|
||||||
|
/* We only use this when DEBUGLEVEL>=2, but we get -Werror=pedantic errors if a
|
||||||
|
* translation unit is empty. So remove this from Linux kernel builds, but
|
||||||
|
* otherwise just leave it in.
|
||||||
|
*/
|
||||||
int g_debuglevel = DEBUGLEVEL;
|
int g_debuglevel = DEBUGLEVEL;
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
33
vendor/github.com/DataDog/zstd/debug.h
generated
vendored
33
vendor/github.com/DataDog/zstd/debug.h
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* debug
|
* debug
|
||||||
* Part of FSE library
|
* Part of FSE library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -86,18 +86,27 @@ extern int g_debuglevel; /* the variable is only declared,
|
|||||||
It's useful when enabling very verbose levels
|
It's useful when enabling very verbose levels
|
||||||
on selective conditions (such as position in src) */
|
on selective conditions (such as position in src) */
|
||||||
|
|
||||||
# define RAWLOG(l, ...) { \
|
# define RAWLOG(l, ...) \
|
||||||
if (l<=g_debuglevel) { \
|
do { \
|
||||||
ZSTD_DEBUG_PRINT(__VA_ARGS__); \
|
if (l<=g_debuglevel) { \
|
||||||
} }
|
ZSTD_DEBUG_PRINT(__VA_ARGS__); \
|
||||||
# define DEBUGLOG(l, ...) { \
|
} \
|
||||||
if (l<=g_debuglevel) { \
|
} while (0)
|
||||||
ZSTD_DEBUG_PRINT(__FILE__ ": " __VA_ARGS__); \
|
|
||||||
ZSTD_DEBUG_PRINT(" \n"); \
|
#define STRINGIFY(x) #x
|
||||||
} }
|
#define TOSTRING(x) STRINGIFY(x)
|
||||||
|
#define LINE_AS_STRING TOSTRING(__LINE__)
|
||||||
|
|
||||||
|
# define DEBUGLOG(l, ...) \
|
||||||
|
do { \
|
||||||
|
if (l<=g_debuglevel) { \
|
||||||
|
ZSTD_DEBUG_PRINT(__FILE__ ":" LINE_AS_STRING ": " __VA_ARGS__); \
|
||||||
|
ZSTD_DEBUG_PRINT(" \n"); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
#else
|
#else
|
||||||
# define RAWLOG(l, ...) {} /* disabled */
|
# define RAWLOG(l, ...) do { } while (0) /* disabled */
|
||||||
# define DEBUGLOG(l, ...) {} /* disabled */
|
# define DEBUGLOG(l, ...) do { } while (0) /* disabled */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
52
vendor/github.com/DataDog/zstd/entropy_common.c
generated
vendored
52
vendor/github.com/DataDog/zstd/entropy_common.c
generated
vendored
@@ -1,7 +1,7 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* Common functions of New Generation Entropy library
|
* Common functions of New Generation Entropy library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -20,8 +20,8 @@
|
|||||||
#include "error_private.h" /* ERR_*, ERROR */
|
#include "error_private.h" /* ERR_*, ERROR */
|
||||||
#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */
|
#define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
#define HUF_STATIC_LINKING_ONLY /* HUF_TABLELOG_ABSOLUTEMAX */
|
|
||||||
#include "huf.h"
|
#include "huf.h"
|
||||||
|
#include "bits.h" /* ZSDT_highbit32, ZSTD_countTrailingZeros32 */
|
||||||
|
|
||||||
|
|
||||||
/*=== Version ===*/
|
/*=== Version ===*/
|
||||||
@@ -39,34 +39,6 @@ const char* HUF_getErrorName(size_t code) { return ERR_getErrorName(code); }
|
|||||||
/*-**************************************************************
|
/*-**************************************************************
|
||||||
* FSE NCount encoding-decoding
|
* FSE NCount encoding-decoding
|
||||||
****************************************************************/
|
****************************************************************/
|
||||||
static U32 FSE_ctz(U32 val)
|
|
||||||
{
|
|
||||||
assert(val != 0);
|
|
||||||
{
|
|
||||||
# if defined(_MSC_VER) /* Visual */
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward(&r, val);
|
|
||||||
return (unsigned)r;
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */
|
|
||||||
return __builtin_ctz(val);
|
|
||||||
# elif defined(__ICCARM__) /* IAR Intrinsic */
|
|
||||||
return __CTZ(val);
|
|
||||||
# else /* Software version */
|
|
||||||
U32 count = 0;
|
|
||||||
while ((val & 1) == 0) {
|
|
||||||
val >>= 1;
|
|
||||||
++count;
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
|
size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPtr,
|
||||||
const void* headerBuffer, size_t hbSize)
|
const void* headerBuffer, size_t hbSize)
|
||||||
@@ -114,7 +86,7 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
|
|||||||
* repeat.
|
* repeat.
|
||||||
* Avoid UB by setting the high bit to 1.
|
* Avoid UB by setting the high bit to 1.
|
||||||
*/
|
*/
|
||||||
int repeats = FSE_ctz(~bitStream | 0x80000000) >> 1;
|
int repeats = ZSTD_countTrailingZeros32(~bitStream | 0x80000000) >> 1;
|
||||||
while (repeats >= 12) {
|
while (repeats >= 12) {
|
||||||
charnum += 3 * 12;
|
charnum += 3 * 12;
|
||||||
if (LIKELY(ip <= iend-7)) {
|
if (LIKELY(ip <= iend-7)) {
|
||||||
@@ -125,7 +97,7 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
|
|||||||
ip = iend - 4;
|
ip = iend - 4;
|
||||||
}
|
}
|
||||||
bitStream = MEM_readLE32(ip) >> bitCount;
|
bitStream = MEM_readLE32(ip) >> bitCount;
|
||||||
repeats = FSE_ctz(~bitStream | 0x80000000) >> 1;
|
repeats = ZSTD_countTrailingZeros32(~bitStream | 0x80000000) >> 1;
|
||||||
}
|
}
|
||||||
charnum += 3 * repeats;
|
charnum += 3 * repeats;
|
||||||
bitStream >>= 2 * repeats;
|
bitStream >>= 2 * repeats;
|
||||||
@@ -190,7 +162,7 @@ size_t FSE_readNCount_body(short* normalizedCounter, unsigned* maxSVPtr, unsigne
|
|||||||
* know that threshold > 1.
|
* know that threshold > 1.
|
||||||
*/
|
*/
|
||||||
if (remaining <= 1) break;
|
if (remaining <= 1) break;
|
||||||
nbBits = BIT_highbit32(remaining) + 1;
|
nbBits = ZSTD_highbit32(remaining) + 1;
|
||||||
threshold = 1 << (nbBits - 1);
|
threshold = 1 << (nbBits - 1);
|
||||||
}
|
}
|
||||||
if (charnum >= maxSV1) break;
|
if (charnum >= maxSV1) break;
|
||||||
@@ -265,7 +237,7 @@ size_t HUF_readStats(BYTE* huffWeight, size_t hwSize, U32* rankStats,
|
|||||||
const void* src, size_t srcSize)
|
const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
|
U32 wksp[HUF_READ_STATS_WORKSPACE_SIZE_U32];
|
||||||
return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* bmi2 */ 0);
|
return HUF_readStats_wksp(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, wksp, sizeof(wksp), /* flags */ 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE size_t
|
FORCE_INLINE_TEMPLATE size_t
|
||||||
@@ -313,14 +285,14 @@ HUF_readStats_body(BYTE* huffWeight, size_t hwSize, U32* rankStats,
|
|||||||
if (weightTotal == 0) return ERROR(corruption_detected);
|
if (weightTotal == 0) return ERROR(corruption_detected);
|
||||||
|
|
||||||
/* get last non-null symbol weight (implied, total must be 2^n) */
|
/* get last non-null symbol weight (implied, total must be 2^n) */
|
||||||
{ U32 const tableLog = BIT_highbit32(weightTotal) + 1;
|
{ U32 const tableLog = ZSTD_highbit32(weightTotal) + 1;
|
||||||
if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
|
if (tableLog > HUF_TABLELOG_MAX) return ERROR(corruption_detected);
|
||||||
*tableLogPtr = tableLog;
|
*tableLogPtr = tableLog;
|
||||||
/* determine last weight */
|
/* determine last weight */
|
||||||
{ U32 const total = 1 << tableLog;
|
{ U32 const total = 1 << tableLog;
|
||||||
U32 const rest = total - weightTotal;
|
U32 const rest = total - weightTotal;
|
||||||
U32 const verif = 1 << BIT_highbit32(rest);
|
U32 const verif = 1 << ZSTD_highbit32(rest);
|
||||||
U32 const lastWeight = BIT_highbit32(rest) + 1;
|
U32 const lastWeight = ZSTD_highbit32(rest) + 1;
|
||||||
if (verif != rest) return ERROR(corruption_detected); /* last value must be a clean power of 2 */
|
if (verif != rest) return ERROR(corruption_detected); /* last value must be a clean power of 2 */
|
||||||
huffWeight[oSize] = (BYTE)lastWeight;
|
huffWeight[oSize] = (BYTE)lastWeight;
|
||||||
rankStats[lastWeight]++;
|
rankStats[lastWeight]++;
|
||||||
@@ -357,14 +329,14 @@ size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize, U32* rankStats,
|
|||||||
U32* nbSymbolsPtr, U32* tableLogPtr,
|
U32* nbSymbolsPtr, U32* tableLogPtr,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
void* workSpace, size_t wkspSize,
|
void* workSpace, size_t wkspSize,
|
||||||
int bmi2)
|
int flags)
|
||||||
{
|
{
|
||||||
#if DYNAMIC_BMI2
|
#if DYNAMIC_BMI2
|
||||||
if (bmi2) {
|
if (flags & HUF_flags_bmi2) {
|
||||||
return HUF_readStats_body_bmi2(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
|
return HUF_readStats_body_bmi2(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
(void)bmi2;
|
(void)flags;
|
||||||
return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
|
return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSymbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
11
vendor/github.com/DataDog/zstd/error_private.c
generated
vendored
11
vendor/github.com/DataDog/zstd/error_private.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -28,9 +28,11 @@ const char* ERR_getErrorString(ERR_enum code)
|
|||||||
case PREFIX(version_unsupported): return "Version not supported";
|
case PREFIX(version_unsupported): return "Version not supported";
|
||||||
case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter";
|
case PREFIX(frameParameter_unsupported): return "Unsupported frame parameter";
|
||||||
case PREFIX(frameParameter_windowTooLarge): return "Frame requires too much memory for decoding";
|
case PREFIX(frameParameter_windowTooLarge): return "Frame requires too much memory for decoding";
|
||||||
case PREFIX(corruption_detected): return "Corrupted block detected";
|
case PREFIX(corruption_detected): return "Data corruption detected";
|
||||||
case PREFIX(checksum_wrong): return "Restored data doesn't match checksum";
|
case PREFIX(checksum_wrong): return "Restored data doesn't match checksum";
|
||||||
|
case PREFIX(literals_headerWrong): return "Header of Literals' block doesn't respect format specification";
|
||||||
case PREFIX(parameter_unsupported): return "Unsupported parameter";
|
case PREFIX(parameter_unsupported): return "Unsupported parameter";
|
||||||
|
case PREFIX(parameter_combination_unsupported): return "Unsupported combination of parameters";
|
||||||
case PREFIX(parameter_outOfBound): return "Parameter is out of bound";
|
case PREFIX(parameter_outOfBound): return "Parameter is out of bound";
|
||||||
case PREFIX(init_missing): return "Context should be init first";
|
case PREFIX(init_missing): return "Context should be init first";
|
||||||
case PREFIX(memory_allocation): return "Allocation error : not enough memory";
|
case PREFIX(memory_allocation): return "Allocation error : not enough memory";
|
||||||
@@ -39,17 +41,22 @@ const char* ERR_getErrorString(ERR_enum code)
|
|||||||
case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory : unsupported";
|
case PREFIX(tableLog_tooLarge): return "tableLog requires too much memory : unsupported";
|
||||||
case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max Symbol Value : too large";
|
case PREFIX(maxSymbolValue_tooLarge): return "Unsupported max Symbol Value : too large";
|
||||||
case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small";
|
case PREFIX(maxSymbolValue_tooSmall): return "Specified maxSymbolValue is too small";
|
||||||
|
case PREFIX(stabilityCondition_notRespected): return "pledged buffer stability condition is not respected";
|
||||||
case PREFIX(dictionary_corrupted): return "Dictionary is corrupted";
|
case PREFIX(dictionary_corrupted): return "Dictionary is corrupted";
|
||||||
case PREFIX(dictionary_wrong): return "Dictionary mismatch";
|
case PREFIX(dictionary_wrong): return "Dictionary mismatch";
|
||||||
case PREFIX(dictionaryCreation_failed): return "Cannot create Dictionary from provided samples";
|
case PREFIX(dictionaryCreation_failed): return "Cannot create Dictionary from provided samples";
|
||||||
case PREFIX(dstSize_tooSmall): return "Destination buffer is too small";
|
case PREFIX(dstSize_tooSmall): return "Destination buffer is too small";
|
||||||
case PREFIX(srcSize_wrong): return "Src size is incorrect";
|
case PREFIX(srcSize_wrong): return "Src size is incorrect";
|
||||||
case PREFIX(dstBuffer_null): return "Operation on NULL destination buffer";
|
case PREFIX(dstBuffer_null): return "Operation on NULL destination buffer";
|
||||||
|
case PREFIX(noForwardProgress_destFull): return "Operation made no progress over multiple calls, due to output buffer being full";
|
||||||
|
case PREFIX(noForwardProgress_inputEmpty): return "Operation made no progress over multiple calls, due to input being empty";
|
||||||
/* following error codes are not stable and may be removed or changed in a future version */
|
/* following error codes are not stable and may be removed or changed in a future version */
|
||||||
case PREFIX(frameIndex_tooLarge): return "Frame index is too large";
|
case PREFIX(frameIndex_tooLarge): return "Frame index is too large";
|
||||||
case PREFIX(seekableIO): return "An I/O error occurred when reading/seeking";
|
case PREFIX(seekableIO): return "An I/O error occurred when reading/seeking";
|
||||||
case PREFIX(dstBuffer_wrong): return "Destination buffer is wrong";
|
case PREFIX(dstBuffer_wrong): return "Destination buffer is wrong";
|
||||||
case PREFIX(srcBuffer_wrong): return "Source buffer is wrong";
|
case PREFIX(srcBuffer_wrong): return "Source buffer is wrong";
|
||||||
|
case PREFIX(sequenceProducer_failed): return "Block-level external sequence producer returned an error code";
|
||||||
|
case PREFIX(externalSequences_invalid): return "External sequences are not valid";
|
||||||
case PREFIX(maxCode):
|
case PREFIX(maxCode):
|
||||||
default: return notErrorCode;
|
default: return notErrorCode;
|
||||||
}
|
}
|
||||||
|
|||||||
83
vendor/github.com/DataDog/zstd/error_private.h
generated
vendored
83
vendor/github.com/DataDog/zstd/error_private.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -61,8 +61,13 @@ ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
|
|||||||
ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
|
ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
|
||||||
|
|
||||||
/* check and forward error code */
|
/* check and forward error code */
|
||||||
#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
|
#define CHECK_V_F(e, f) \
|
||||||
#define CHECK_F(f) { CHECK_V_F(_var_err__, f); }
|
size_t const e = f; \
|
||||||
|
do { \
|
||||||
|
if (ERR_isError(e)) \
|
||||||
|
return e; \
|
||||||
|
} while (0)
|
||||||
|
#define CHECK_F(f) do { CHECK_V_F(_var_err__, f); } while (0)
|
||||||
|
|
||||||
|
|
||||||
/*-****************************************
|
/*-****************************************
|
||||||
@@ -96,10 +101,12 @@ void _force_has_format_string(const char *format, ...) {
|
|||||||
* We want to force this function invocation to be syntactically correct, but
|
* We want to force this function invocation to be syntactically correct, but
|
||||||
* we don't want to force runtime evaluation of its arguments.
|
* we don't want to force runtime evaluation of its arguments.
|
||||||
*/
|
*/
|
||||||
#define _FORCE_HAS_FORMAT_STRING(...) \
|
#define _FORCE_HAS_FORMAT_STRING(...) \
|
||||||
if (0) { \
|
do { \
|
||||||
_force_has_format_string(__VA_ARGS__); \
|
if (0) { \
|
||||||
}
|
_force_has_format_string(__VA_ARGS__); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
#define ERR_QUOTE(str) #str
|
#define ERR_QUOTE(str) #str
|
||||||
|
|
||||||
@@ -110,48 +117,50 @@ void _force_has_format_string(const char *format, ...) {
|
|||||||
* In order to do that (particularly, printing the conditional that failed),
|
* In order to do that (particularly, printing the conditional that failed),
|
||||||
* this can't just wrap RETURN_ERROR().
|
* this can't just wrap RETURN_ERROR().
|
||||||
*/
|
*/
|
||||||
#define RETURN_ERROR_IF(cond, err, ...) \
|
#define RETURN_ERROR_IF(cond, err, ...) \
|
||||||
if (cond) { \
|
do { \
|
||||||
RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \
|
if (cond) { \
|
||||||
__FILE__, __LINE__, ERR_QUOTE(cond), ERR_QUOTE(ERROR(err))); \
|
RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \
|
||||||
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
__FILE__, __LINE__, ERR_QUOTE(cond), ERR_QUOTE(ERROR(err))); \
|
||||||
RAWLOG(3, ": " __VA_ARGS__); \
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
||||||
RAWLOG(3, "\n"); \
|
RAWLOG(3, ": " __VA_ARGS__); \
|
||||||
return ERROR(err); \
|
RAWLOG(3, "\n"); \
|
||||||
}
|
return ERROR(err); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unconditionally return the specified error.
|
* Unconditionally return the specified error.
|
||||||
*
|
*
|
||||||
* In debug modes, prints additional information.
|
* In debug modes, prints additional information.
|
||||||
*/
|
*/
|
||||||
#define RETURN_ERROR(err, ...) \
|
#define RETURN_ERROR(err, ...) \
|
||||||
do { \
|
do { \
|
||||||
RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \
|
RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \
|
||||||
__FILE__, __LINE__, ERR_QUOTE(ERROR(err))); \
|
__FILE__, __LINE__, ERR_QUOTE(ERROR(err))); \
|
||||||
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
||||||
RAWLOG(3, ": " __VA_ARGS__); \
|
RAWLOG(3, ": " __VA_ARGS__); \
|
||||||
RAWLOG(3, "\n"); \
|
RAWLOG(3, "\n"); \
|
||||||
return ERROR(err); \
|
return ERROR(err); \
|
||||||
} while(0);
|
} while(0)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the provided expression evaluates to an error code, returns that error code.
|
* If the provided expression evaluates to an error code, returns that error code.
|
||||||
*
|
*
|
||||||
* In debug modes, prints additional information.
|
* In debug modes, prints additional information.
|
||||||
*/
|
*/
|
||||||
#define FORWARD_IF_ERROR(err, ...) \
|
#define FORWARD_IF_ERROR(err, ...) \
|
||||||
do { \
|
do { \
|
||||||
size_t const err_code = (err); \
|
size_t const err_code = (err); \
|
||||||
if (ERR_isError(err_code)) { \
|
if (ERR_isError(err_code)) { \
|
||||||
RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \
|
RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \
|
||||||
__FILE__, __LINE__, ERR_QUOTE(err), ERR_getErrorName(err_code)); \
|
__FILE__, __LINE__, ERR_QUOTE(err), ERR_getErrorName(err_code)); \
|
||||||
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
||||||
RAWLOG(3, ": " __VA_ARGS__); \
|
RAWLOG(3, ": " __VA_ARGS__); \
|
||||||
RAWLOG(3, "\n"); \
|
RAWLOG(3, "\n"); \
|
||||||
return err_code; \
|
return err_code; \
|
||||||
} \
|
} \
|
||||||
} while(0);
|
} while(0)
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
|
|||||||
8
vendor/github.com/DataDog/zstd/fastcover.c
generated
vendored
8
vendor/github.com/DataDog/zstd/fastcover.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -305,7 +305,7 @@ FASTCOVER_computeFrequency(U32* freqs, const FASTCOVER_ctx_t* ctx)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Prepare a context for dictionary building.
|
* Prepare a context for dictionary building.
|
||||||
* The context is only dependent on the parameter `d` and can used multiple
|
* The context is only dependent on the parameter `d` and can be used multiple
|
||||||
* times.
|
* times.
|
||||||
* Returns 0 on success or error code on error.
|
* Returns 0 on success or error code on error.
|
||||||
* The context must be destroyed with `FASTCOVER_ctx_destroy()`.
|
* The context must be destroyed with `FASTCOVER_ctx_destroy()`.
|
||||||
@@ -546,7 +546,7 @@ FASTCOVER_convertToFastCoverParams(ZDICT_cover_params_t coverParams,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ZDICTLIB_API size_t
|
ZDICTLIB_STATIC_API size_t
|
||||||
ZDICT_trainFromBuffer_fastCover(void* dictBuffer, size_t dictBufferCapacity,
|
ZDICT_trainFromBuffer_fastCover(void* dictBuffer, size_t dictBufferCapacity,
|
||||||
const void* samplesBuffer,
|
const void* samplesBuffer,
|
||||||
const size_t* samplesSizes, unsigned nbSamples,
|
const size_t* samplesSizes, unsigned nbSamples,
|
||||||
@@ -615,7 +615,7 @@ ZDICT_trainFromBuffer_fastCover(void* dictBuffer, size_t dictBufferCapacity,
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ZDICTLIB_API size_t
|
ZDICTLIB_STATIC_API size_t
|
||||||
ZDICT_optimizeTrainFromBuffer_fastCover(
|
ZDICT_optimizeTrainFromBuffer_fastCover(
|
||||||
void* dictBuffer, size_t dictBufferCapacity,
|
void* dictBuffer, size_t dictBufferCapacity,
|
||||||
const void* samplesBuffer,
|
const void* samplesBuffer,
|
||||||
|
|||||||
93
vendor/github.com/DataDog/zstd/fse.h
generated
vendored
93
vendor/github.com/DataDog/zstd/fse.h
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* FSE : Finite State Entropy codec
|
* FSE : Finite State Entropy codec
|
||||||
* Public Prototypes declaration
|
* Public Prototypes declaration
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -54,34 +54,6 @@ extern "C" {
|
|||||||
FSE_PUBLIC_API unsigned FSE_versionNumber(void); /**< library version number; to be used when checking dll version */
|
FSE_PUBLIC_API unsigned FSE_versionNumber(void); /**< library version number; to be used when checking dll version */
|
||||||
|
|
||||||
|
|
||||||
/*-****************************************
|
|
||||||
* FSE simple functions
|
|
||||||
******************************************/
|
|
||||||
/*! FSE_compress() :
|
|
||||||
Compress content of buffer 'src', of size 'srcSize', into destination buffer 'dst'.
|
|
||||||
'dst' buffer must be already allocated. Compression runs faster is dstCapacity >= FSE_compressBound(srcSize).
|
|
||||||
@return : size of compressed data (<= dstCapacity).
|
|
||||||
Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
|
|
||||||
if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression instead.
|
|
||||||
if FSE_isError(return), compression failed (more details using FSE_getErrorName())
|
|
||||||
*/
|
|
||||||
FSE_PUBLIC_API size_t FSE_compress(void* dst, size_t dstCapacity,
|
|
||||||
const void* src, size_t srcSize);
|
|
||||||
|
|
||||||
/*! FSE_decompress():
|
|
||||||
Decompress FSE data from buffer 'cSrc', of size 'cSrcSize',
|
|
||||||
into already allocated destination buffer 'dst', of size 'dstCapacity'.
|
|
||||||
@return : size of regenerated data (<= maxDstSize),
|
|
||||||
or an error code, which can be tested using FSE_isError() .
|
|
||||||
|
|
||||||
** Important ** : FSE_decompress() does not decompress non-compressible nor RLE data !!!
|
|
||||||
Why ? : making this distinction requires a header.
|
|
||||||
Header management is intentionally delegated to the user layer, which can better manage special cases.
|
|
||||||
*/
|
|
||||||
FSE_PUBLIC_API size_t FSE_decompress(void* dst, size_t dstCapacity,
|
|
||||||
const void* cSrc, size_t cSrcSize);
|
|
||||||
|
|
||||||
|
|
||||||
/*-*****************************************
|
/*-*****************************************
|
||||||
* Tool functions
|
* Tool functions
|
||||||
******************************************/
|
******************************************/
|
||||||
@@ -92,20 +64,6 @@ FSE_PUBLIC_API unsigned FSE_isError(size_t code); /* tells if a return
|
|||||||
FSE_PUBLIC_API const char* FSE_getErrorName(size_t code); /* provides error code string (useful for debugging) */
|
FSE_PUBLIC_API const char* FSE_getErrorName(size_t code); /* provides error code string (useful for debugging) */
|
||||||
|
|
||||||
|
|
||||||
/*-*****************************************
|
|
||||||
* FSE advanced functions
|
|
||||||
******************************************/
|
|
||||||
/*! FSE_compress2() :
|
|
||||||
Same as FSE_compress(), but allows the selection of 'maxSymbolValue' and 'tableLog'
|
|
||||||
Both parameters can be defined as '0' to mean : use default value
|
|
||||||
@return : size of compressed data
|
|
||||||
Special values : if return == 0, srcData is not compressible => Nothing is stored within cSrc !!!
|
|
||||||
if return == 1, srcData is a single byte symbol * srcSize times. Use RLE compression.
|
|
||||||
if FSE_isError(return), it's an error code.
|
|
||||||
*/
|
|
||||||
FSE_PUBLIC_API size_t FSE_compress2 (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
|
|
||||||
|
|
||||||
|
|
||||||
/*-*****************************************
|
/*-*****************************************
|
||||||
* FSE detailed API
|
* FSE detailed API
|
||||||
******************************************/
|
******************************************/
|
||||||
@@ -165,8 +123,6 @@ FSE_PUBLIC_API size_t FSE_writeNCount (void* buffer, size_t bufferSize,
|
|||||||
/*! Constructor and Destructor of FSE_CTable.
|
/*! Constructor and Destructor of FSE_CTable.
|
||||||
Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
|
Note that FSE_CTable size depends on 'tableLog' and 'maxSymbolValue' */
|
||||||
typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */
|
typedef unsigned FSE_CTable; /* don't allocate that. It's only meant to be more restrictive than void* */
|
||||||
FSE_PUBLIC_API FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog);
|
|
||||||
FSE_PUBLIC_API void FSE_freeCTable (FSE_CTable* ct);
|
|
||||||
|
|
||||||
/*! FSE_buildCTable():
|
/*! FSE_buildCTable():
|
||||||
Builds `ct`, which must be already allocated, using FSE_createCTable().
|
Builds `ct`, which must be already allocated, using FSE_createCTable().
|
||||||
@@ -242,23 +198,7 @@ FSE_PUBLIC_API size_t FSE_readNCount_bmi2(short* normalizedCounter,
|
|||||||
unsigned* maxSymbolValuePtr, unsigned* tableLogPtr,
|
unsigned* maxSymbolValuePtr, unsigned* tableLogPtr,
|
||||||
const void* rBuffer, size_t rBuffSize, int bmi2);
|
const void* rBuffer, size_t rBuffSize, int bmi2);
|
||||||
|
|
||||||
/*! Constructor and Destructor of FSE_DTable.
|
|
||||||
Note that its size depends on 'tableLog' */
|
|
||||||
typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be more restrictive than void* */
|
typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be more restrictive than void* */
|
||||||
FSE_PUBLIC_API FSE_DTable* FSE_createDTable(unsigned tableLog);
|
|
||||||
FSE_PUBLIC_API void FSE_freeDTable(FSE_DTable* dt);
|
|
||||||
|
|
||||||
/*! FSE_buildDTable():
|
|
||||||
Builds 'dt', which must be already allocated, using FSE_createDTable().
|
|
||||||
return : 0, or an errorCode, which can be tested using FSE_isError() */
|
|
||||||
FSE_PUBLIC_API size_t FSE_buildDTable (FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog);
|
|
||||||
|
|
||||||
/*! FSE_decompress_usingDTable():
|
|
||||||
Decompress compressed source `cSrc` of size `cSrcSize` using `dt`
|
|
||||||
into `dst` which must be already allocated.
|
|
||||||
@return : size of regenerated data (necessarily <= `dstCapacity`),
|
|
||||||
or an errorCode, which can be tested using FSE_isError() */
|
|
||||||
FSE_PUBLIC_API size_t FSE_decompress_usingDTable(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, const FSE_DTable* dt);
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
Tutorial :
|
Tutorial :
|
||||||
@@ -290,6 +230,7 @@ If there is an error, the function will return an error code, which can be teste
|
|||||||
|
|
||||||
#endif /* FSE_H */
|
#endif /* FSE_H */
|
||||||
|
|
||||||
|
|
||||||
#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
|
#if defined(FSE_STATIC_LINKING_ONLY) && !defined(FSE_H_FSE_STATIC_LINKING_ONLY)
|
||||||
#define FSE_H_FSE_STATIC_LINKING_ONLY
|
#define FSE_H_FSE_STATIC_LINKING_ONLY
|
||||||
|
|
||||||
@@ -321,16 +262,6 @@ If there is an error, the function will return an error code, which can be teste
|
|||||||
unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus);
|
unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus);
|
||||||
/**< same as FSE_optimalTableLog(), which used `minus==2` */
|
/**< same as FSE_optimalTableLog(), which used `minus==2` */
|
||||||
|
|
||||||
/* FSE_compress_wksp() :
|
|
||||||
* Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
|
|
||||||
* FSE_COMPRESS_WKSP_SIZE_U32() provides the minimum size required for `workSpace` as a table of FSE_CTable.
|
|
||||||
*/
|
|
||||||
#define FSE_COMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) ( FSE_CTABLE_SIZE_U32(maxTableLog, maxSymbolValue) + ((maxTableLog > 12) ? (1 << (maxTableLog - 2)) : 1024) )
|
|
||||||
size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
|
|
||||||
|
|
||||||
size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits);
|
|
||||||
/**< build a fake FSE_CTable, designed for a flat distribution, where each symbol uses nbBits */
|
|
||||||
|
|
||||||
size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue);
|
size_t FSE_buildCTable_rle (FSE_CTable* ct, unsigned char symbolValue);
|
||||||
/**< build a fake FSE_CTable, designed to compress always the same symbolValue */
|
/**< build a fake FSE_CTable, designed to compress always the same symbolValue */
|
||||||
|
|
||||||
@@ -348,19 +279,11 @@ size_t FSE_buildCTable_wksp(FSE_CTable* ct, const short* normalizedCounter, unsi
|
|||||||
FSE_PUBLIC_API size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
|
FSE_PUBLIC_API size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize);
|
||||||
/**< Same as FSE_buildDTable(), using an externally allocated `workspace` produced with `FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxSymbolValue)` */
|
/**< Same as FSE_buildDTable(), using an externally allocated `workspace` produced with `FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxSymbolValue)` */
|
||||||
|
|
||||||
size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits);
|
#define FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) (FSE_DTABLE_SIZE_U32(maxTableLog) + 1 + FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) + (FSE_MAX_SYMBOL_VALUE + 1) / 2 + 1)
|
||||||
/**< build a fake FSE_DTable, designed to read a flat distribution where each symbol uses nbBits */
|
|
||||||
|
|
||||||
size_t FSE_buildDTable_rle (FSE_DTable* dt, unsigned char symbolValue);
|
|
||||||
/**< build a fake FSE_DTable, designed to always generate the same symbolValue */
|
|
||||||
|
|
||||||
#define FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) (FSE_DTABLE_SIZE_U32(maxTableLog) + FSE_BUILD_DTABLE_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) + (FSE_MAX_SYMBOL_VALUE + 1) / 2 + 1)
|
|
||||||
#define FSE_DECOMPRESS_WKSP_SIZE(maxTableLog, maxSymbolValue) (FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(unsigned))
|
#define FSE_DECOMPRESS_WKSP_SIZE(maxTableLog, maxSymbolValue) (FSE_DECOMPRESS_WKSP_SIZE_U32(maxTableLog, maxSymbolValue) * sizeof(unsigned))
|
||||||
size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize);
|
|
||||||
/**< same as FSE_decompress(), using an externally allocated `workSpace` produced with `FSE_DECOMPRESS_WKSP_SIZE_U32(maxLog, maxSymbolValue)` */
|
|
||||||
|
|
||||||
size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2);
|
size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, int bmi2);
|
||||||
/**< Same as FSE_decompress_wksp() but with dynamic BMI2 support. Pass 1 if your CPU supports BMI2 or 0 if it doesn't. */
|
/**< same as FSE_decompress(), using an externally allocated `workSpace` produced with `FSE_DECOMPRESS_WKSP_SIZE_U32(maxLog, maxSymbolValue)`.
|
||||||
|
* Set bmi2 to 1 if your CPU supports BMI2 or 0 if it doesn't */
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
FSE_repeat_none, /**< Cannot use the previous table */
|
FSE_repeat_none, /**< Cannot use the previous table */
|
||||||
@@ -543,20 +466,20 @@ MEM_STATIC void FSE_encodeSymbol(BIT_CStream_t* bitC, FSE_CState_t* statePtr, un
|
|||||||
FSE_symbolCompressionTransform const symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
|
FSE_symbolCompressionTransform const symbolTT = ((const FSE_symbolCompressionTransform*)(statePtr->symbolTT))[symbol];
|
||||||
const U16* const stateTable = (const U16*)(statePtr->stateTable);
|
const U16* const stateTable = (const U16*)(statePtr->stateTable);
|
||||||
U32 const nbBitsOut = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16);
|
U32 const nbBitsOut = (U32)((statePtr->value + symbolTT.deltaNbBits) >> 16);
|
||||||
BIT_addBits(bitC, statePtr->value, nbBitsOut);
|
BIT_addBits(bitC, (size_t)statePtr->value, nbBitsOut);
|
||||||
statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
|
statePtr->value = stateTable[ (statePtr->value >> nbBitsOut) + symbolTT.deltaFindState];
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr)
|
MEM_STATIC void FSE_flushCState(BIT_CStream_t* bitC, const FSE_CState_t* statePtr)
|
||||||
{
|
{
|
||||||
BIT_addBits(bitC, statePtr->value, statePtr->stateLog);
|
BIT_addBits(bitC, (size_t)statePtr->value, statePtr->stateLog);
|
||||||
BIT_flushBits(bitC);
|
BIT_flushBits(bitC);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* FSE_getMaxNbBits() :
|
/* FSE_getMaxNbBits() :
|
||||||
* Approximate maximum cost of a symbol, in bits.
|
* Approximate maximum cost of a symbol, in bits.
|
||||||
* Fractional get rounded up (i.e : a symbol with a normalized frequency of 3 gives the same result as a frequency of 2)
|
* Fractional get rounded up (i.e. a symbol with a normalized frequency of 3 gives the same result as a frequency of 2)
|
||||||
* note 1 : assume symbolValue is valid (<= maxSymbolValue)
|
* note 1 : assume symbolValue is valid (<= maxSymbolValue)
|
||||||
* note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
|
* note 2 : if freq[symbolValue]==0, @return a fake cost of tableLog+1 bits */
|
||||||
MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue)
|
MEM_STATIC U32 FSE_getMaxNbBits(const void* symbolTTPtr, U32 symbolValue)
|
||||||
|
|||||||
146
vendor/github.com/DataDog/zstd/fse_compress.c
generated
vendored
146
vendor/github.com/DataDog/zstd/fse_compress.c
generated
vendored
@@ -1,7 +1,7 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* FSE : Finite State Entropy encoder
|
* FSE : Finite State Entropy encoder
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -26,7 +26,8 @@
|
|||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
#define ZSTD_DEPS_NEED_MALLOC
|
#define ZSTD_DEPS_NEED_MALLOC
|
||||||
#define ZSTD_DEPS_NEED_MATH64
|
#define ZSTD_DEPS_NEED_MATH64
|
||||||
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_free, ZSTD_memcpy, ZSTD_memset */
|
#include "zstd_deps.h" /* ZSTD_memset */
|
||||||
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
|
|
||||||
|
|
||||||
/* **************************************************************
|
/* **************************************************************
|
||||||
@@ -91,7 +92,7 @@ size_t FSE_buildCTable_wksp(FSE_CTable* ct,
|
|||||||
assert(tableLog < 16); /* required for threshold strategy to work */
|
assert(tableLog < 16); /* required for threshold strategy to work */
|
||||||
|
|
||||||
/* For explanations on how to distribute symbol values over the table :
|
/* For explanations on how to distribute symbol values over the table :
|
||||||
* http://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */
|
* https://fastcompression.blogspot.fr/2014/02/fse-distributing-symbol-values.html */
|
||||||
|
|
||||||
#ifdef __clang_analyzer__
|
#ifdef __clang_analyzer__
|
||||||
ZSTD_memset(tableSymbol, 0, sizeof(*tableSymbol) * tableSize); /* useless initialization, just to keep scan-build happy */
|
ZSTD_memset(tableSymbol, 0, sizeof(*tableSymbol) * tableSize); /* useless initialization, just to keep scan-build happy */
|
||||||
@@ -192,7 +193,7 @@ size_t FSE_buildCTable_wksp(FSE_CTable* ct,
|
|||||||
break;
|
break;
|
||||||
default :
|
default :
|
||||||
assert(normalizedCounter[s] > 1);
|
assert(normalizedCounter[s] > 1);
|
||||||
{ U32 const maxBitsOut = tableLog - BIT_highbit32 ((U32)normalizedCounter[s]-1);
|
{ U32 const maxBitsOut = tableLog - ZSTD_highbit32 ((U32)normalizedCounter[s]-1);
|
||||||
U32 const minStatePlus = (U32)normalizedCounter[s] << maxBitsOut;
|
U32 const minStatePlus = (U32)normalizedCounter[s] << maxBitsOut;
|
||||||
symbolTT[s].deltaNbBits = (maxBitsOut << 16) - minStatePlus;
|
symbolTT[s].deltaNbBits = (maxBitsOut << 16) - minStatePlus;
|
||||||
symbolTT[s].deltaFindState = (int)(total - (unsigned)normalizedCounter[s]);
|
symbolTT[s].deltaFindState = (int)(total - (unsigned)normalizedCounter[s]);
|
||||||
@@ -225,8 +226,8 @@ size_t FSE_NCountWriteBound(unsigned maxSymbolValue, unsigned tableLog)
|
|||||||
size_t const maxHeaderSize = (((maxSymbolValue+1) * tableLog
|
size_t const maxHeaderSize = (((maxSymbolValue+1) * tableLog
|
||||||
+ 4 /* bitCount initialized at 4 */
|
+ 4 /* bitCount initialized at 4 */
|
||||||
+ 2 /* first two symbols may use one additional bit each */) / 8)
|
+ 2 /* first two symbols may use one additional bit each */) / 8)
|
||||||
+ 1 /* round up to whole nb bytes */
|
+ 1 /* round up to whole nb bytes */
|
||||||
+ 2 /* additional two bytes for bitstream flush */;
|
+ 2 /* additional two bytes for bitstream flush */;
|
||||||
return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND; /* maxSymbolValue==0 ? use default */
|
return maxSymbolValue ? maxHeaderSize : FSE_NCOUNTBOUND; /* maxSymbolValue==0 ? use default */
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,7 +256,7 @@ FSE_writeNCount_generic (void* header, size_t headerBufferSize,
|
|||||||
/* Init */
|
/* Init */
|
||||||
remaining = tableSize+1; /* +1 for extra accuracy */
|
remaining = tableSize+1; /* +1 for extra accuracy */
|
||||||
threshold = tableSize;
|
threshold = tableSize;
|
||||||
nbBits = tableLog+1;
|
nbBits = (int)tableLog+1;
|
||||||
|
|
||||||
while ((symbol < alphabetSize) && (remaining>1)) { /* stops at 1 */
|
while ((symbol < alphabetSize) && (remaining>1)) { /* stops at 1 */
|
||||||
if (previousIs0) {
|
if (previousIs0) {
|
||||||
@@ -274,7 +275,7 @@ FSE_writeNCount_generic (void* header, size_t headerBufferSize,
|
|||||||
}
|
}
|
||||||
while (symbol >= start+3) {
|
while (symbol >= start+3) {
|
||||||
start+=3;
|
start+=3;
|
||||||
bitStream += 3 << bitCount;
|
bitStream += 3U << bitCount;
|
||||||
bitCount += 2;
|
bitCount += 2;
|
||||||
}
|
}
|
||||||
bitStream += (symbol-start) << bitCount;
|
bitStream += (symbol-start) << bitCount;
|
||||||
@@ -294,7 +295,7 @@ FSE_writeNCount_generic (void* header, size_t headerBufferSize,
|
|||||||
count++; /* +1 for extra accuracy */
|
count++; /* +1 for extra accuracy */
|
||||||
if (count>=threshold)
|
if (count>=threshold)
|
||||||
count += max; /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */
|
count += max; /* [0..max[ [max..threshold[ (...) [threshold+max 2*threshold[ */
|
||||||
bitStream += count << bitCount;
|
bitStream += (U32)count << bitCount;
|
||||||
bitCount += nbBits;
|
bitCount += nbBits;
|
||||||
bitCount -= (count<max);
|
bitCount -= (count<max);
|
||||||
previousIs0 = (count==1);
|
previousIs0 = (count==1);
|
||||||
@@ -322,7 +323,8 @@ FSE_writeNCount_generic (void* header, size_t headerBufferSize,
|
|||||||
out[1] = (BYTE)(bitStream>>8);
|
out[1] = (BYTE)(bitStream>>8);
|
||||||
out+= (bitCount+7) /8;
|
out+= (bitCount+7) /8;
|
||||||
|
|
||||||
return (out-ostart);
|
assert(out >= ostart);
|
||||||
|
return (size_t)(out-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -343,21 +345,11 @@ size_t FSE_writeNCount (void* buffer, size_t bufferSize,
|
|||||||
* FSE Compression Code
|
* FSE Compression Code
|
||||||
****************************************************************/
|
****************************************************************/
|
||||||
|
|
||||||
FSE_CTable* FSE_createCTable (unsigned maxSymbolValue, unsigned tableLog)
|
|
||||||
{
|
|
||||||
size_t size;
|
|
||||||
if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
|
|
||||||
size = FSE_CTABLE_SIZE_U32 (tableLog, maxSymbolValue) * sizeof(U32);
|
|
||||||
return (FSE_CTable*)ZSTD_malloc(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void FSE_freeCTable (FSE_CTable* ct) { ZSTD_free(ct); }
|
|
||||||
|
|
||||||
/* provides the minimum logSize to safely represent a distribution */
|
/* provides the minimum logSize to safely represent a distribution */
|
||||||
static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue)
|
static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue)
|
||||||
{
|
{
|
||||||
U32 minBitsSrc = BIT_highbit32((U32)(srcSize)) + 1;
|
U32 minBitsSrc = ZSTD_highbit32((U32)(srcSize)) + 1;
|
||||||
U32 minBitsSymbols = BIT_highbit32(maxSymbolValue) + 2;
|
U32 minBitsSymbols = ZSTD_highbit32(maxSymbolValue) + 2;
|
||||||
U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols;
|
U32 minBits = minBitsSrc < minBitsSymbols ? minBitsSrc : minBitsSymbols;
|
||||||
assert(srcSize > 1); /* Not supported, RLE should be used instead */
|
assert(srcSize > 1); /* Not supported, RLE should be used instead */
|
||||||
return minBits;
|
return minBits;
|
||||||
@@ -365,7 +357,7 @@ static unsigned FSE_minTableLog(size_t srcSize, unsigned maxSymbolValue)
|
|||||||
|
|
||||||
unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus)
|
unsigned FSE_optimalTableLog_internal(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, unsigned minus)
|
||||||
{
|
{
|
||||||
U32 maxBitsSrc = BIT_highbit32((U32)(srcSize - 1)) - minus;
|
U32 maxBitsSrc = ZSTD_highbit32((U32)(srcSize - 1)) - minus;
|
||||||
U32 tableLog = maxTableLog;
|
U32 tableLog = maxTableLog;
|
||||||
U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue);
|
U32 minBits = FSE_minTableLog(srcSize, maxSymbolValue);
|
||||||
assert(srcSize > 1); /* Not supported, RLE should be used instead */
|
assert(srcSize > 1); /* Not supported, RLE should be used instead */
|
||||||
@@ -533,40 +525,6 @@ size_t FSE_normalizeCount (short* normalizedCounter, unsigned tableLog,
|
|||||||
return tableLog;
|
return tableLog;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* fake FSE_CTable, for raw (uncompressed) input */
|
|
||||||
size_t FSE_buildCTable_raw (FSE_CTable* ct, unsigned nbBits)
|
|
||||||
{
|
|
||||||
const unsigned tableSize = 1 << nbBits;
|
|
||||||
const unsigned tableMask = tableSize - 1;
|
|
||||||
const unsigned maxSymbolValue = tableMask;
|
|
||||||
void* const ptr = ct;
|
|
||||||
U16* const tableU16 = ( (U16*) ptr) + 2;
|
|
||||||
void* const FSCT = ((U32*)ptr) + 1 /* header */ + (tableSize>>1); /* assumption : tableLog >= 1 */
|
|
||||||
FSE_symbolCompressionTransform* const symbolTT = (FSE_symbolCompressionTransform*) (FSCT);
|
|
||||||
unsigned s;
|
|
||||||
|
|
||||||
/* Sanity checks */
|
|
||||||
if (nbBits < 1) return ERROR(GENERIC); /* min size */
|
|
||||||
|
|
||||||
/* header */
|
|
||||||
tableU16[-2] = (U16) nbBits;
|
|
||||||
tableU16[-1] = (U16) maxSymbolValue;
|
|
||||||
|
|
||||||
/* Build table */
|
|
||||||
for (s=0; s<tableSize; s++)
|
|
||||||
tableU16[s] = (U16)(tableSize + s);
|
|
||||||
|
|
||||||
/* Build Symbol Transformation Table */
|
|
||||||
{ const U32 deltaNbBits = (nbBits << 16) - (1 << nbBits);
|
|
||||||
for (s=0; s<=maxSymbolValue; s++) {
|
|
||||||
symbolTT[s].deltaNbBits = deltaNbBits;
|
|
||||||
symbolTT[s].deltaFindState = s-1;
|
|
||||||
} }
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* fake FSE_CTable, for rle input (always same symbol) */
|
/* fake FSE_CTable, for rle input (always same symbol) */
|
||||||
size_t FSE_buildCTable_rle (FSE_CTable* ct, BYTE symbolValue)
|
size_t FSE_buildCTable_rle (FSE_CTable* ct, BYTE symbolValue)
|
||||||
{
|
{
|
||||||
@@ -665,80 +623,6 @@ size_t FSE_compress_usingCTable (void* dst, size_t dstSize,
|
|||||||
|
|
||||||
size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); }
|
size_t FSE_compressBound(size_t size) { return FSE_COMPRESSBOUND(size); }
|
||||||
|
|
||||||
#ifndef ZSTD_NO_UNUSED_FUNCTIONS
|
|
||||||
/* FSE_compress_wksp() :
|
|
||||||
* Same as FSE_compress2(), but using an externally allocated scratch buffer (`workSpace`).
|
|
||||||
* `wkspSize` size must be `(1<<tableLog)`.
|
|
||||||
*/
|
|
||||||
size_t FSE_compress_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
|
|
||||||
{
|
|
||||||
BYTE* const ostart = (BYTE*) dst;
|
|
||||||
BYTE* op = ostart;
|
|
||||||
BYTE* const oend = ostart + dstSize;
|
|
||||||
|
|
||||||
unsigned count[FSE_MAX_SYMBOL_VALUE+1];
|
|
||||||
S16 norm[FSE_MAX_SYMBOL_VALUE+1];
|
|
||||||
FSE_CTable* CTable = (FSE_CTable*)workSpace;
|
|
||||||
size_t const CTableSize = FSE_CTABLE_SIZE_U32(tableLog, maxSymbolValue);
|
|
||||||
void* scratchBuffer = (void*)(CTable + CTableSize);
|
|
||||||
size_t const scratchBufferSize = wkspSize - (CTableSize * sizeof(FSE_CTable));
|
|
||||||
|
|
||||||
/* init conditions */
|
|
||||||
if (wkspSize < FSE_COMPRESS_WKSP_SIZE_U32(tableLog, maxSymbolValue)) return ERROR(tableLog_tooLarge);
|
|
||||||
if (srcSize <= 1) return 0; /* Not compressible */
|
|
||||||
if (!maxSymbolValue) maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
|
|
||||||
if (!tableLog) tableLog = FSE_DEFAULT_TABLELOG;
|
|
||||||
|
|
||||||
/* Scan input and build symbol stats */
|
|
||||||
{ CHECK_V_F(maxCount, HIST_count_wksp(count, &maxSymbolValue, src, srcSize, scratchBuffer, scratchBufferSize) );
|
|
||||||
if (maxCount == srcSize) return 1; /* only a single symbol in src : rle */
|
|
||||||
if (maxCount == 1) return 0; /* each symbol present maximum once => not compressible */
|
|
||||||
if (maxCount < (srcSize >> 7)) return 0; /* Heuristic : not compressible enough */
|
|
||||||
}
|
|
||||||
|
|
||||||
tableLog = FSE_optimalTableLog(tableLog, srcSize, maxSymbolValue);
|
|
||||||
CHECK_F( FSE_normalizeCount(norm, tableLog, count, srcSize, maxSymbolValue, /* useLowProbCount */ srcSize >= 2048) );
|
|
||||||
|
|
||||||
/* Write table description header */
|
|
||||||
{ CHECK_V_F(nc_err, FSE_writeNCount(op, oend-op, norm, maxSymbolValue, tableLog) );
|
|
||||||
op += nc_err;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Compress */
|
|
||||||
CHECK_F( FSE_buildCTable_wksp(CTable, norm, maxSymbolValue, tableLog, scratchBuffer, scratchBufferSize) );
|
|
||||||
{ CHECK_V_F(cSize, FSE_compress_usingCTable(op, oend - op, src, srcSize, CTable) );
|
|
||||||
if (cSize == 0) return 0; /* not enough space for compressed data */
|
|
||||||
op += cSize;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* check compressibility */
|
|
||||||
if ( (size_t)(op-ostart) >= srcSize-1 ) return 0;
|
|
||||||
|
|
||||||
return op-ostart;
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
FSE_CTable CTable_max[FSE_CTABLE_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)];
|
|
||||||
union {
|
|
||||||
U32 hist_wksp[HIST_WKSP_SIZE_U32];
|
|
||||||
BYTE scratchBuffer[1 << FSE_MAX_TABLELOG];
|
|
||||||
} workspace;
|
|
||||||
} fseWkspMax_t;
|
|
||||||
|
|
||||||
size_t FSE_compress2 (void* dst, size_t dstCapacity, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog)
|
|
||||||
{
|
|
||||||
fseWkspMax_t scratchBuffer;
|
|
||||||
DEBUG_STATIC_ASSERT(sizeof(scratchBuffer) >= FSE_COMPRESS_WKSP_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)); /* compilation failures here means scratchBuffer is not large enough */
|
|
||||||
if (tableLog > FSE_MAX_TABLELOG) return ERROR(tableLog_tooLarge);
|
|
||||||
return FSE_compress_wksp(dst, dstCapacity, src, srcSize, maxSymbolValue, tableLog, &scratchBuffer, sizeof(scratchBuffer));
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t FSE_compress (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
|
||||||
{
|
|
||||||
return FSE_compress2(dst, dstCapacity, src, srcSize, FSE_MAX_SYMBOL_VALUE, FSE_DEFAULT_TABLELOG);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* FSE_COMMONDEFS_ONLY */
|
#endif /* FSE_COMMONDEFS_ONLY */
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
142
vendor/github.com/DataDog/zstd/fse_decompress.c
generated
vendored
142
vendor/github.com/DataDog/zstd/fse_decompress.c
generated
vendored
@@ -1,7 +1,7 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* FSE : Finite State Entropy decoder
|
* FSE : Finite State Entropy decoder
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -23,8 +23,8 @@
|
|||||||
#define FSE_STATIC_LINKING_ONLY
|
#define FSE_STATIC_LINKING_ONLY
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
#define ZSTD_DEPS_NEED_MALLOC
|
#include "zstd_deps.h" /* ZSTD_memcpy */
|
||||||
#include "zstd_deps.h"
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
|
|
||||||
|
|
||||||
/* **************************************************************
|
/* **************************************************************
|
||||||
@@ -56,19 +56,6 @@
|
|||||||
#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
|
#define FSE_FUNCTION_NAME(X,Y) FSE_CAT(X,Y)
|
||||||
#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
|
#define FSE_TYPE_NAME(X,Y) FSE_CAT(X,Y)
|
||||||
|
|
||||||
|
|
||||||
/* Function templates */
|
|
||||||
FSE_DTable* FSE_createDTable (unsigned tableLog)
|
|
||||||
{
|
|
||||||
if (tableLog > FSE_TABLELOG_ABSOLUTE_MAX) tableLog = FSE_TABLELOG_ABSOLUTE_MAX;
|
|
||||||
return (FSE_DTable*)ZSTD_malloc( FSE_DTABLE_SIZE_U32(tableLog) * sizeof (U32) );
|
|
||||||
}
|
|
||||||
|
|
||||||
void FSE_freeDTable (FSE_DTable* dt)
|
|
||||||
{
|
|
||||||
ZSTD_free(dt);
|
|
||||||
}
|
|
||||||
|
|
||||||
static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
|
static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize)
|
||||||
{
|
{
|
||||||
void* const tdPtr = dt+1; /* because *dt is unsigned, 32-bits aligned on 32-bits */
|
void* const tdPtr = dt+1; /* because *dt is unsigned, 32-bits aligned on 32-bits */
|
||||||
@@ -97,7 +84,7 @@ static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCo
|
|||||||
symbolNext[s] = 1;
|
symbolNext[s] = 1;
|
||||||
} else {
|
} else {
|
||||||
if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
|
if (normalizedCounter[s] >= largeLimit) DTableH.fastMode=0;
|
||||||
symbolNext[s] = normalizedCounter[s];
|
symbolNext[s] = (U16)normalizedCounter[s];
|
||||||
} } }
|
} } }
|
||||||
ZSTD_memcpy(dt, &DTableH, sizeof(DTableH));
|
ZSTD_memcpy(dt, &DTableH, sizeof(DTableH));
|
||||||
}
|
}
|
||||||
@@ -112,8 +99,7 @@ static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCo
|
|||||||
* all symbols have counts <= 8. We ensure we have 8 bytes at the end of
|
* all symbols have counts <= 8. We ensure we have 8 bytes at the end of
|
||||||
* our buffer to handle the over-write.
|
* our buffer to handle the over-write.
|
||||||
*/
|
*/
|
||||||
{
|
{ U64 const add = 0x0101010101010101ull;
|
||||||
U64 const add = 0x0101010101010101ull;
|
|
||||||
size_t pos = 0;
|
size_t pos = 0;
|
||||||
U64 sv = 0;
|
U64 sv = 0;
|
||||||
U32 s;
|
U32 s;
|
||||||
@@ -124,14 +110,13 @@ static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCo
|
|||||||
for (i = 8; i < n; i += 8) {
|
for (i = 8; i < n; i += 8) {
|
||||||
MEM_write64(spread + pos + i, sv);
|
MEM_write64(spread + pos + i, sv);
|
||||||
}
|
}
|
||||||
pos += n;
|
pos += (size_t)n;
|
||||||
}
|
} }
|
||||||
}
|
|
||||||
/* Now we spread those positions across the table.
|
/* Now we spread those positions across the table.
|
||||||
* The benefit of doing it in two stages is that we avoid the the
|
* The benefit of doing it in two stages is that we avoid the
|
||||||
* variable size inner loop, which caused lots of branch misses.
|
* variable size inner loop, which caused lots of branch misses.
|
||||||
* Now we can run through all the positions without any branch misses.
|
* Now we can run through all the positions without any branch misses.
|
||||||
* We unroll the loop twice, since that is what emperically worked best.
|
* We unroll the loop twice, since that is what empirically worked best.
|
||||||
*/
|
*/
|
||||||
{
|
{
|
||||||
size_t position = 0;
|
size_t position = 0;
|
||||||
@@ -167,7 +152,7 @@ static size_t FSE_buildDTable_internal(FSE_DTable* dt, const short* normalizedCo
|
|||||||
for (u=0; u<tableSize; u++) {
|
for (u=0; u<tableSize; u++) {
|
||||||
FSE_FUNCTION_TYPE const symbol = (FSE_FUNCTION_TYPE)(tableDecode[u].symbol);
|
FSE_FUNCTION_TYPE const symbol = (FSE_FUNCTION_TYPE)(tableDecode[u].symbol);
|
||||||
U32 const nextState = symbolNext[symbol]++;
|
U32 const nextState = symbolNext[symbol]++;
|
||||||
tableDecode[u].nbBits = (BYTE) (tableLog - BIT_highbit32(nextState) );
|
tableDecode[u].nbBits = (BYTE) (tableLog - ZSTD_highbit32(nextState) );
|
||||||
tableDecode[u].newState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
|
tableDecode[u].newState = (U16) ( (nextState << tableDecode[u].nbBits) - tableSize);
|
||||||
} }
|
} }
|
||||||
|
|
||||||
@@ -185,49 +170,6 @@ size_t FSE_buildDTable_wksp(FSE_DTable* dt, const short* normalizedCounter, unsi
|
|||||||
/*-*******************************************************
|
/*-*******************************************************
|
||||||
* Decompression (Byte symbols)
|
* Decompression (Byte symbols)
|
||||||
*********************************************************/
|
*********************************************************/
|
||||||
size_t FSE_buildDTable_rle (FSE_DTable* dt, BYTE symbolValue)
|
|
||||||
{
|
|
||||||
void* ptr = dt;
|
|
||||||
FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
|
|
||||||
void* dPtr = dt + 1;
|
|
||||||
FSE_decode_t* const cell = (FSE_decode_t*)dPtr;
|
|
||||||
|
|
||||||
DTableH->tableLog = 0;
|
|
||||||
DTableH->fastMode = 0;
|
|
||||||
|
|
||||||
cell->newState = 0;
|
|
||||||
cell->symbol = symbolValue;
|
|
||||||
cell->nbBits = 0;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
size_t FSE_buildDTable_raw (FSE_DTable* dt, unsigned nbBits)
|
|
||||||
{
|
|
||||||
void* ptr = dt;
|
|
||||||
FSE_DTableHeader* const DTableH = (FSE_DTableHeader*)ptr;
|
|
||||||
void* dPtr = dt + 1;
|
|
||||||
FSE_decode_t* const dinfo = (FSE_decode_t*)dPtr;
|
|
||||||
const unsigned tableSize = 1 << nbBits;
|
|
||||||
const unsigned tableMask = tableSize - 1;
|
|
||||||
const unsigned maxSV1 = tableMask+1;
|
|
||||||
unsigned s;
|
|
||||||
|
|
||||||
/* Sanity checks */
|
|
||||||
if (nbBits < 1) return ERROR(GENERIC); /* min size */
|
|
||||||
|
|
||||||
/* Build Decoding Table */
|
|
||||||
DTableH->tableLog = (U16)nbBits;
|
|
||||||
DTableH->fastMode = 1;
|
|
||||||
for (s=0; s<maxSV1; s++) {
|
|
||||||
dinfo[s].newState = 0;
|
|
||||||
dinfo[s].symbol = (BYTE)s;
|
|
||||||
dinfo[s].nbBits = (BYTE)nbBits;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic(
|
FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic(
|
||||||
void* dst, size_t maxDstSize,
|
void* dst, size_t maxDstSize,
|
||||||
@@ -288,32 +230,12 @@ FORCE_INLINE_TEMPLATE size_t FSE_decompress_usingDTable_generic(
|
|||||||
break;
|
break;
|
||||||
} }
|
} }
|
||||||
|
|
||||||
return op-ostart;
|
assert(op >= ostart);
|
||||||
}
|
return (size_t)(op-ostart);
|
||||||
|
|
||||||
|
|
||||||
size_t FSE_decompress_usingDTable(void* dst, size_t originalSize,
|
|
||||||
const void* cSrc, size_t cSrcSize,
|
|
||||||
const FSE_DTable* dt)
|
|
||||||
{
|
|
||||||
const void* ptr = dt;
|
|
||||||
const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
|
|
||||||
const U32 fastMode = DTableH->fastMode;
|
|
||||||
|
|
||||||
/* select fast mode (static) */
|
|
||||||
if (fastMode) return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 1);
|
|
||||||
return FSE_decompress_usingDTable_generic(dst, originalSize, cSrc, cSrcSize, dt, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
size_t FSE_decompress_wksp(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize)
|
|
||||||
{
|
|
||||||
return FSE_decompress_wksp_bmi2(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize, /* bmi2 */ 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
short ncount[FSE_MAX_SYMBOL_VALUE + 1];
|
short ncount[FSE_MAX_SYMBOL_VALUE + 1];
|
||||||
FSE_DTable dtable[1]; /* Dynamically sized */
|
|
||||||
} FSE_DecompressWksp;
|
} FSE_DecompressWksp;
|
||||||
|
|
||||||
|
|
||||||
@@ -328,13 +250,18 @@ FORCE_INLINE_TEMPLATE size_t FSE_decompress_wksp_body(
|
|||||||
unsigned tableLog;
|
unsigned tableLog;
|
||||||
unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
|
unsigned maxSymbolValue = FSE_MAX_SYMBOL_VALUE;
|
||||||
FSE_DecompressWksp* const wksp = (FSE_DecompressWksp*)workSpace;
|
FSE_DecompressWksp* const wksp = (FSE_DecompressWksp*)workSpace;
|
||||||
|
size_t const dtablePos = sizeof(FSE_DecompressWksp) / sizeof(FSE_DTable);
|
||||||
|
FSE_DTable* const dtable = (FSE_DTable*)workSpace + dtablePos;
|
||||||
|
|
||||||
DEBUG_STATIC_ASSERT((FSE_MAX_SYMBOL_VALUE + 1) % 2 == 0);
|
FSE_STATIC_ASSERT((FSE_MAX_SYMBOL_VALUE + 1) % 2 == 0);
|
||||||
if (wkspSize < sizeof(*wksp)) return ERROR(GENERIC);
|
if (wkspSize < sizeof(*wksp)) return ERROR(GENERIC);
|
||||||
|
|
||||||
|
/* correct offset to dtable depends on this property */
|
||||||
|
FSE_STATIC_ASSERT(sizeof(FSE_DecompressWksp) % sizeof(FSE_DTable) == 0);
|
||||||
|
|
||||||
/* normal FSE decoding mode */
|
/* normal FSE decoding mode */
|
||||||
{
|
{ size_t const NCountLength =
|
||||||
size_t const NCountLength = FSE_readNCount_bmi2(wksp->ncount, &maxSymbolValue, &tableLog, istart, cSrcSize, bmi2);
|
FSE_readNCount_bmi2(wksp->ncount, &maxSymbolValue, &tableLog, istart, cSrcSize, bmi2);
|
||||||
if (FSE_isError(NCountLength)) return NCountLength;
|
if (FSE_isError(NCountLength)) return NCountLength;
|
||||||
if (tableLog > maxLog) return ERROR(tableLog_tooLarge);
|
if (tableLog > maxLog) return ERROR(tableLog_tooLarge);
|
||||||
assert(NCountLength <= cSrcSize);
|
assert(NCountLength <= cSrcSize);
|
||||||
@@ -343,19 +270,20 @@ FORCE_INLINE_TEMPLATE size_t FSE_decompress_wksp_body(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (FSE_DECOMPRESS_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(tableLog_tooLarge);
|
if (FSE_DECOMPRESS_WKSP_SIZE(tableLog, maxSymbolValue) > wkspSize) return ERROR(tableLog_tooLarge);
|
||||||
workSpace = wksp->dtable + FSE_DTABLE_SIZE_U32(tableLog);
|
assert(sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog) <= wkspSize);
|
||||||
|
workSpace = (BYTE*)workSpace + sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog);
|
||||||
wkspSize -= sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog);
|
wkspSize -= sizeof(*wksp) + FSE_DTABLE_SIZE(tableLog);
|
||||||
|
|
||||||
CHECK_F( FSE_buildDTable_internal(wksp->dtable, wksp->ncount, maxSymbolValue, tableLog, workSpace, wkspSize) );
|
CHECK_F( FSE_buildDTable_internal(dtable, wksp->ncount, maxSymbolValue, tableLog, workSpace, wkspSize) );
|
||||||
|
|
||||||
{
|
{
|
||||||
const void* ptr = wksp->dtable;
|
const void* ptr = dtable;
|
||||||
const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
|
const FSE_DTableHeader* DTableH = (const FSE_DTableHeader*)ptr;
|
||||||
const U32 fastMode = DTableH->fastMode;
|
const U32 fastMode = DTableH->fastMode;
|
||||||
|
|
||||||
/* select fast mode (static) */
|
/* select fast mode (static) */
|
||||||
if (fastMode) return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, wksp->dtable, 1);
|
if (fastMode) return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, dtable, 1);
|
||||||
return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, wksp->dtable, 0);
|
return FSE_decompress_usingDTable_generic(dst, dstCapacity, ip, cSrcSize, dtable, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,24 +311,6 @@ size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void* cSrc,
|
|||||||
return FSE_decompress_wksp_body_default(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize);
|
return FSE_decompress_wksp_body_default(dst, dstCapacity, cSrc, cSrcSize, maxLog, workSpace, wkspSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
typedef FSE_DTable DTable_max_t[FSE_DTABLE_SIZE_U32(FSE_MAX_TABLELOG)];
|
|
||||||
|
|
||||||
#ifndef ZSTD_NO_UNUSED_FUNCTIONS
|
|
||||||
size_t FSE_buildDTable(FSE_DTable* dt, const short* normalizedCounter, unsigned maxSymbolValue, unsigned tableLog) {
|
|
||||||
U32 wksp[FSE_BUILD_DTABLE_WKSP_SIZE_U32(FSE_TABLELOG_ABSOLUTE_MAX, FSE_MAX_SYMBOL_VALUE)];
|
|
||||||
return FSE_buildDTable_wksp(dt, normalizedCounter, maxSymbolValue, tableLog, wksp, sizeof(wksp));
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t FSE_decompress(void* dst, size_t dstCapacity, const void* cSrc, size_t cSrcSize)
|
|
||||||
{
|
|
||||||
/* Static analyzer seems unable to understand this table will be properly initialized later */
|
|
||||||
U32 wksp[FSE_DECOMPRESS_WKSP_SIZE_U32(FSE_MAX_TABLELOG, FSE_MAX_SYMBOL_VALUE)];
|
|
||||||
return FSE_decompress_wksp(dst, dstCapacity, cSrc, cSrcSize, FSE_MAX_TABLELOG, wksp, sizeof(wksp));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* FSE_COMMONDEFS_ONLY */
|
#endif /* FSE_COMMONDEFS_ONLY */
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/hist.c
generated
vendored
2
vendor/github.com/DataDog/zstd/hist.c
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* hist : Histogram functions
|
* hist : Histogram functions
|
||||||
* part of Finite State Entropy project
|
* part of Finite State Entropy project
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/hist.h
generated
vendored
2
vendor/github.com/DataDog/zstd/hist.h
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* hist : Histogram functions
|
* hist : Histogram functions
|
||||||
* part of Finite State Entropy project
|
* part of Finite State Entropy project
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
|
|||||||
248
vendor/github.com/DataDog/zstd/huf.h
generated
vendored
248
vendor/github.com/DataDog/zstd/huf.h
generated
vendored
@@ -2,7 +2,7 @@
|
|||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* huff0 huffman codec,
|
* huff0 huffman codec,
|
||||||
* part of Finite State Entropy library
|
* part of Finite State Entropy library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -22,100 +22,23 @@ extern "C" {
|
|||||||
|
|
||||||
/* *** Dependencies *** */
|
/* *** Dependencies *** */
|
||||||
#include "zstd_deps.h" /* size_t */
|
#include "zstd_deps.h" /* size_t */
|
||||||
|
#include "mem.h" /* U32 */
|
||||||
|
|
||||||
/* *** library symbols visibility *** */
|
|
||||||
/* Note : when linking with -fvisibility=hidden on gcc, or by default on Visual,
|
|
||||||
* HUF symbols remain "private" (internal symbols for library only).
|
|
||||||
* Set macro FSE_DLL_EXPORT to 1 if you want HUF symbols visible on DLL interface */
|
|
||||||
#if defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) && defined(__GNUC__) && (__GNUC__ >= 4)
|
|
||||||
# define HUF_PUBLIC_API __attribute__ ((visibility ("default")))
|
|
||||||
#elif defined(FSE_DLL_EXPORT) && (FSE_DLL_EXPORT==1) /* Visual expected */
|
|
||||||
# define HUF_PUBLIC_API __declspec(dllexport)
|
|
||||||
#elif defined(FSE_DLL_IMPORT) && (FSE_DLL_IMPORT==1)
|
|
||||||
# define HUF_PUBLIC_API __declspec(dllimport) /* not required, just to generate faster code (saves a function pointer load from IAT and an indirect jump) */
|
|
||||||
#else
|
|
||||||
# define HUF_PUBLIC_API
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* ========================== */
|
|
||||||
/* *** simple functions *** */
|
|
||||||
/* ========================== */
|
|
||||||
|
|
||||||
/** HUF_compress() :
|
|
||||||
* Compress content from buffer 'src', of size 'srcSize', into buffer 'dst'.
|
|
||||||
* 'dst' buffer must be already allocated.
|
|
||||||
* Compression runs faster if `dstCapacity` >= HUF_compressBound(srcSize).
|
|
||||||
* `srcSize` must be <= `HUF_BLOCKSIZE_MAX` == 128 KB.
|
|
||||||
* @return : size of compressed data (<= `dstCapacity`).
|
|
||||||
* Special values : if return == 0, srcData is not compressible => Nothing is stored within dst !!!
|
|
||||||
* if HUF_isError(return), compression failed (more details using HUF_getErrorName())
|
|
||||||
*/
|
|
||||||
HUF_PUBLIC_API size_t HUF_compress(void* dst, size_t dstCapacity,
|
|
||||||
const void* src, size_t srcSize);
|
|
||||||
|
|
||||||
/** HUF_decompress() :
|
|
||||||
* Decompress HUF data from buffer 'cSrc', of size 'cSrcSize',
|
|
||||||
* into already allocated buffer 'dst', of minimum size 'dstSize'.
|
|
||||||
* `originalSize` : **must** be the ***exact*** size of original (uncompressed) data.
|
|
||||||
* Note : in contrast with FSE, HUF_decompress can regenerate
|
|
||||||
* RLE (cSrcSize==1) and uncompressed (cSrcSize==dstSize) data,
|
|
||||||
* because it knows size to regenerate (originalSize).
|
|
||||||
* @return : size of regenerated data (== originalSize),
|
|
||||||
* or an error code, which can be tested using HUF_isError()
|
|
||||||
*/
|
|
||||||
HUF_PUBLIC_API size_t HUF_decompress(void* dst, size_t originalSize,
|
|
||||||
const void* cSrc, size_t cSrcSize);
|
|
||||||
|
|
||||||
|
|
||||||
/* *** Tool functions *** */
|
|
||||||
#define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */
|
|
||||||
HUF_PUBLIC_API size_t HUF_compressBound(size_t size); /**< maximum compressed size (worst case) */
|
|
||||||
|
|
||||||
/* Error Management */
|
|
||||||
HUF_PUBLIC_API unsigned HUF_isError(size_t code); /**< tells if a return value is an error code */
|
|
||||||
HUF_PUBLIC_API const char* HUF_getErrorName(size_t code); /**< provides error code string (useful for debugging) */
|
|
||||||
|
|
||||||
|
|
||||||
/* *** Advanced function *** */
|
|
||||||
|
|
||||||
/** HUF_compress2() :
|
|
||||||
* Same as HUF_compress(), but offers control over `maxSymbolValue` and `tableLog`.
|
|
||||||
* `maxSymbolValue` must be <= HUF_SYMBOLVALUE_MAX .
|
|
||||||
* `tableLog` must be `<= HUF_TABLELOG_MAX` . */
|
|
||||||
HUF_PUBLIC_API size_t HUF_compress2 (void* dst, size_t dstCapacity,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned tableLog);
|
|
||||||
|
|
||||||
/** HUF_compress4X_wksp() :
|
|
||||||
* Same as HUF_compress2(), but uses externally allocated `workSpace`.
|
|
||||||
* `workspace` must be at least as large as HUF_WORKSPACE_SIZE */
|
|
||||||
#define HUF_WORKSPACE_SIZE ((8 << 10) + 512 /* sorting scratch space */)
|
|
||||||
#define HUF_WORKSPACE_SIZE_U64 (HUF_WORKSPACE_SIZE / sizeof(U64))
|
|
||||||
HUF_PUBLIC_API size_t HUF_compress4X_wksp (void* dst, size_t dstCapacity,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned tableLog,
|
|
||||||
void* workSpace, size_t wkspSize);
|
|
||||||
|
|
||||||
#endif /* HUF_H_298734234 */
|
|
||||||
|
|
||||||
/* ******************************************************************
|
|
||||||
* WARNING !!
|
|
||||||
* The following section contains advanced and experimental definitions
|
|
||||||
* which shall never be used in the context of a dynamic library,
|
|
||||||
* because they are not guaranteed to remain stable in the future.
|
|
||||||
* Only consider them in association with static linking.
|
|
||||||
* *****************************************************************/
|
|
||||||
#if defined(HUF_STATIC_LINKING_ONLY) && !defined(HUF_H_HUF_STATIC_LINKING_ONLY)
|
|
||||||
#define HUF_H_HUF_STATIC_LINKING_ONLY
|
|
||||||
|
|
||||||
/* *** Dependencies *** */
|
|
||||||
#include "mem.h" /* U32 */
|
|
||||||
#define FSE_STATIC_LINKING_ONLY
|
#define FSE_STATIC_LINKING_ONLY
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* *** Tool functions *** */
|
||||||
|
#define HUF_BLOCKSIZE_MAX (128 * 1024) /**< maximum input size for a single block compressed with HUF_compress */
|
||||||
|
size_t HUF_compressBound(size_t size); /**< maximum compressed size (worst case) */
|
||||||
|
|
||||||
|
/* Error Management */
|
||||||
|
unsigned HUF_isError(size_t code); /**< tells if a return value is an error code */
|
||||||
|
const char* HUF_getErrorName(size_t code); /**< provides error code string (useful for debugging) */
|
||||||
|
|
||||||
|
|
||||||
|
#define HUF_WORKSPACE_SIZE ((8 << 10) + 512 /* sorting scratch space */)
|
||||||
|
#define HUF_WORKSPACE_SIZE_U64 (HUF_WORKSPACE_SIZE / sizeof(U64))
|
||||||
|
|
||||||
/* *** Constants *** */
|
/* *** Constants *** */
|
||||||
#define HUF_TABLELOG_MAX 12 /* max runtime value of tableLog (due to static allocation); can be modified up to HUF_TABLELOG_ABSOLUTEMAX */
|
#define HUF_TABLELOG_MAX 12 /* max runtime value of tableLog (due to static allocation); can be modified up to HUF_TABLELOG_ABSOLUTEMAX */
|
||||||
#define HUF_TABLELOG_DEFAULT 11 /* default tableLog value when none specified */
|
#define HUF_TABLELOG_DEFAULT 11 /* default tableLog value when none specified */
|
||||||
@@ -155,25 +78,49 @@ typedef U32 HUF_DTable;
|
|||||||
/* ****************************************
|
/* ****************************************
|
||||||
* Advanced decompression functions
|
* Advanced decompression functions
|
||||||
******************************************/
|
******************************************/
|
||||||
size_t HUF_decompress4X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< single-symbol decoder */
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
|
||||||
size_t HUF_decompress4X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< double-symbols decoder */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t HUF_decompress4X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< decodes RLE and uncompressed */
|
/**
|
||||||
size_t HUF_decompress4X_hufOnly(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< considers RLE and uncompressed as errors */
|
* Huffman flags bitset.
|
||||||
size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< considers RLE and uncompressed as errors */
|
* For all flags, 0 is the default value.
|
||||||
size_t HUF_decompress4X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< single-symbol decoder */
|
*/
|
||||||
size_t HUF_decompress4X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< single-symbol decoder */
|
typedef enum {
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
/**
|
||||||
size_t HUF_decompress4X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< double-symbols decoder */
|
* If compiled with DYNAMIC_BMI2: Set flag only if the CPU supports BMI2 at runtime.
|
||||||
size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< double-symbols decoder */
|
* Otherwise: Ignored.
|
||||||
#endif
|
*/
|
||||||
|
HUF_flags_bmi2 = (1 << 0),
|
||||||
|
/**
|
||||||
|
* If set: Test possible table depths to find the one that produces the smallest header + encoded size.
|
||||||
|
* If unset: Use heuristic to find the table depth.
|
||||||
|
*/
|
||||||
|
HUF_flags_optimalDepth = (1 << 1),
|
||||||
|
/**
|
||||||
|
* If set: If the previous table can encode the input, always reuse the previous table.
|
||||||
|
* If unset: If the previous table can encode the input, reuse the previous table if it results in a smaller output.
|
||||||
|
*/
|
||||||
|
HUF_flags_preferRepeat = (1 << 2),
|
||||||
|
/**
|
||||||
|
* If set: Sample the input and check if the sample is uncompressible, if it is then don't attempt to compress.
|
||||||
|
* If unset: Always histogram the entire input.
|
||||||
|
*/
|
||||||
|
HUF_flags_suspectUncompressible = (1 << 3),
|
||||||
|
/**
|
||||||
|
* If set: Don't use assembly implementations
|
||||||
|
* If unset: Allow using assembly implementations
|
||||||
|
*/
|
||||||
|
HUF_flags_disableAsm = (1 << 4),
|
||||||
|
/**
|
||||||
|
* If set: Don't use the fast decoding loop, always use the fallback decoding loop.
|
||||||
|
* If unset: Use the fast decoding loop when possible.
|
||||||
|
*/
|
||||||
|
HUF_flags_disableFast = (1 << 5)
|
||||||
|
} HUF_flags_e;
|
||||||
|
|
||||||
|
|
||||||
/* ****************************************
|
/* ****************************************
|
||||||
* HUF detailed API
|
* HUF detailed API
|
||||||
* ****************************************/
|
* ****************************************/
|
||||||
|
#define HUF_OPTIMAL_DEPTH_THRESHOLD ZSTD_btultra
|
||||||
|
|
||||||
/*! HUF_compress() does the following:
|
/*! HUF_compress() does the following:
|
||||||
* 1. count symbol occurrence from source[] into table count[] using FSE_count() (exposed within "fse.h")
|
* 1. count symbol occurrence from source[] into table count[] using FSE_count() (exposed within "fse.h")
|
||||||
@@ -186,12 +133,12 @@ size_t HUF_decompress4X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize,
|
|||||||
* For example, it's possible to compress several blocks using the same 'CTable',
|
* For example, it's possible to compress several blocks using the same 'CTable',
|
||||||
* or to save and regenerate 'CTable' using external methods.
|
* or to save and regenerate 'CTable' using external methods.
|
||||||
*/
|
*/
|
||||||
unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue);
|
unsigned HUF_minTableLog(unsigned symbolCardinality);
|
||||||
size_t HUF_buildCTable (HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits); /* @return : maxNbBits; CTable and count can overlap. In which case, CTable will overwrite count content */
|
unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue);
|
||||||
size_t HUF_writeCTable (void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog);
|
unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue, void* workSpace,
|
||||||
|
size_t wkspSize, HUF_CElt* table, const unsigned* count, int flags); /* table is used as scratch space for building and testing tables, not a return value */
|
||||||
size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog, void* workspace, size_t workspaceSize);
|
size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize, const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog, void* workspace, size_t workspaceSize);
|
||||||
size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
|
size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags);
|
||||||
size_t HUF_compress4X_usingCTable_bmi2(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int bmi2);
|
|
||||||
size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
|
size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
|
||||||
int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
|
int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue);
|
||||||
|
|
||||||
@@ -200,6 +147,7 @@ typedef enum {
|
|||||||
HUF_repeat_check, /**< Can use the previous table but it must be checked. Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */
|
HUF_repeat_check, /**< Can use the previous table but it must be checked. Note : The previous table must have been constructed by HUF_compress{1, 4}X_repeat */
|
||||||
HUF_repeat_valid /**< Can use the previous table and it is assumed to be valid */
|
HUF_repeat_valid /**< Can use the previous table and it is assumed to be valid */
|
||||||
} HUF_repeat;
|
} HUF_repeat;
|
||||||
|
|
||||||
/** HUF_compress4X_repeat() :
|
/** HUF_compress4X_repeat() :
|
||||||
* Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
|
* Same as HUF_compress4X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
|
||||||
* If it uses hufTable it does not modify hufTable or repeat.
|
* If it uses hufTable it does not modify hufTable or repeat.
|
||||||
@@ -210,13 +158,13 @@ size_t HUF_compress4X_repeat(void* dst, size_t dstSize,
|
|||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
unsigned maxSymbolValue, unsigned tableLog,
|
unsigned maxSymbolValue, unsigned tableLog,
|
||||||
void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
|
void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
|
||||||
HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2, unsigned suspectUncompressible);
|
HUF_CElt* hufTable, HUF_repeat* repeat, int flags);
|
||||||
|
|
||||||
/** HUF_buildCTable_wksp() :
|
/** HUF_buildCTable_wksp() :
|
||||||
* Same as HUF_buildCTable(), but using externally allocated scratch buffer.
|
* Same as HUF_buildCTable(), but using externally allocated scratch buffer.
|
||||||
* `workSpace` must be aligned on 4-bytes boundaries, and its size must be >= HUF_CTABLE_WORKSPACE_SIZE.
|
* `workSpace` must be aligned on 4-bytes boundaries, and its size must be >= HUF_CTABLE_WORKSPACE_SIZE.
|
||||||
*/
|
*/
|
||||||
#define HUF_CTABLE_WORKSPACE_SIZE_U32 (2*HUF_SYMBOLVALUE_MAX +1 +1)
|
#define HUF_CTABLE_WORKSPACE_SIZE_U32 ((4 * (HUF_SYMBOLVALUE_MAX + 1)) + 192)
|
||||||
#define HUF_CTABLE_WORKSPACE_SIZE (HUF_CTABLE_WORKSPACE_SIZE_U32 * sizeof(unsigned))
|
#define HUF_CTABLE_WORKSPACE_SIZE (HUF_CTABLE_WORKSPACE_SIZE_U32 * sizeof(unsigned))
|
||||||
size_t HUF_buildCTable_wksp (HUF_CElt* tree,
|
size_t HUF_buildCTable_wksp (HUF_CElt* tree,
|
||||||
const unsigned* count, U32 maxSymbolValue, U32 maxNbBits,
|
const unsigned* count, U32 maxSymbolValue, U32 maxNbBits,
|
||||||
@@ -242,7 +190,7 @@ size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize,
|
|||||||
U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr,
|
U32* rankStats, U32* nbSymbolsPtr, U32* tableLogPtr,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
void* workspace, size_t wkspSize,
|
void* workspace, size_t wkspSize,
|
||||||
int bmi2);
|
int flags);
|
||||||
|
|
||||||
/** HUF_readCTable() :
|
/** HUF_readCTable() :
|
||||||
* Loading a CTable saved with HUF_writeCTable() */
|
* Loading a CTable saved with HUF_writeCTable() */
|
||||||
@@ -250,9 +198,22 @@ size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void
|
|||||||
|
|
||||||
/** HUF_getNbBitsFromCTable() :
|
/** HUF_getNbBitsFromCTable() :
|
||||||
* Read nbBits from CTable symbolTable, for symbol `symbolValue` presumed <= HUF_SYMBOLVALUE_MAX
|
* Read nbBits from CTable symbolTable, for symbol `symbolValue` presumed <= HUF_SYMBOLVALUE_MAX
|
||||||
* Note 1 : is not inlined, as HUF_CElt definition is private */
|
* Note 1 : If symbolValue > HUF_readCTableHeader(symbolTable).maxSymbolValue, returns 0
|
||||||
|
* Note 2 : is not inlined, as HUF_CElt definition is private
|
||||||
|
*/
|
||||||
U32 HUF_getNbBitsFromCTable(const HUF_CElt* symbolTable, U32 symbolValue);
|
U32 HUF_getNbBitsFromCTable(const HUF_CElt* symbolTable, U32 symbolValue);
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
BYTE tableLog;
|
||||||
|
BYTE maxSymbolValue;
|
||||||
|
BYTE unused[sizeof(size_t) - 2];
|
||||||
|
} HUF_CTableHeader;
|
||||||
|
|
||||||
|
/** HUF_readCTableHeader() :
|
||||||
|
* @returns The header from the CTable specifying the tableLog and the maxSymbolValue.
|
||||||
|
*/
|
||||||
|
HUF_CTableHeader HUF_readCTableHeader(HUF_CElt const* ctable);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* HUF_decompress() does the following:
|
* HUF_decompress() does the following:
|
||||||
* 1. select the decompression algorithm (X1, X2) based on pre-computed heuristics
|
* 1. select the decompression algorithm (X1, X2) based on pre-computed heuristics
|
||||||
@@ -280,32 +241,12 @@ U32 HUF_selectDecoder (size_t dstSize, size_t cSrcSize);
|
|||||||
#define HUF_DECOMPRESS_WORKSPACE_SIZE ((2 << 10) + (1 << 9))
|
#define HUF_DECOMPRESS_WORKSPACE_SIZE ((2 << 10) + (1 << 9))
|
||||||
#define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32))
|
#define HUF_DECOMPRESS_WORKSPACE_SIZE_U32 (HUF_DECOMPRESS_WORKSPACE_SIZE / sizeof(U32))
|
||||||
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
|
||||||
size_t HUF_readDTableX1 (HUF_DTable* DTable, const void* src, size_t srcSize);
|
|
||||||
size_t HUF_readDTableX1_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
|
|
||||||
#endif
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
|
||||||
size_t HUF_readDTableX2 (HUF_DTable* DTable, const void* src, size_t srcSize);
|
|
||||||
size_t HUF_readDTableX2_wksp (HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
|
||||||
size_t HUF_decompress4X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
|
|
||||||
#endif
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
|
||||||
size_t HUF_decompress4X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* ====================== */
|
/* ====================== */
|
||||||
/* single stream variants */
|
/* single stream variants */
|
||||||
/* ====================== */
|
/* ====================== */
|
||||||
|
|
||||||
size_t HUF_compress1X (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog);
|
size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags);
|
||||||
size_t HUF_compress1X_wksp (void* dst, size_t dstSize, const void* src, size_t srcSize, unsigned maxSymbolValue, unsigned tableLog, void* workSpace, size_t wkspSize); /**< `workSpace` must be a table of at least HUF_WORKSPACE_SIZE_U64 U64 */
|
|
||||||
size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable);
|
|
||||||
size_t HUF_compress1X_usingCTable_bmi2(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int bmi2);
|
|
||||||
/** HUF_compress1X_repeat() :
|
/** HUF_compress1X_repeat() :
|
||||||
* Same as HUF_compress1X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
|
* Same as HUF_compress1X_wksp(), but considers using hufTable if *repeat != HUF_repeat_none.
|
||||||
* If it uses hufTable it does not modify hufTable or repeat.
|
* If it uses hufTable it does not modify hufTable or repeat.
|
||||||
@@ -316,49 +257,30 @@ size_t HUF_compress1X_repeat(void* dst, size_t dstSize,
|
|||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
unsigned maxSymbolValue, unsigned tableLog,
|
unsigned maxSymbolValue, unsigned tableLog,
|
||||||
void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
|
void* workSpace, size_t wkspSize, /**< `workSpace` must be aligned on 4-bytes boundaries, `wkspSize` must be >= HUF_WORKSPACE_SIZE */
|
||||||
HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2, unsigned suspectUncompressible);
|
HUF_CElt* hufTable, HUF_repeat* repeat, int flags);
|
||||||
|
|
||||||
size_t HUF_decompress1X1 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /* single-symbol decoder */
|
size_t HUF_decompress1X_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags);
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
#ifndef HUF_FORCE_DECOMPRESS_X1
|
||||||
size_t HUF_decompress1X2 (void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /* double-symbol decoder */
|
size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags); /**< double-symbols decoder */
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t HUF_decompress1X_DCtx (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize);
|
|
||||||
size_t HUF_decompress1X_DCtx_wksp (HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize);
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
|
||||||
size_t HUF_decompress1X1_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< single-symbol decoder */
|
|
||||||
size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< single-symbol decoder */
|
|
||||||
#endif
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
|
||||||
size_t HUF_decompress1X2_DCtx(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize); /**< double-symbols decoder */
|
|
||||||
size_t HUF_decompress1X2_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize); /**< double-symbols decoder */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable); /**< automatic selection of sing or double symbol decoder, based on DTable */
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
|
||||||
size_t HUF_decompress1X1_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
|
|
||||||
#endif
|
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
|
||||||
size_t HUF_decompress1X2_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* BMI2 variants.
|
/* BMI2 variants.
|
||||||
* If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0.
|
* If the CPU has BMI2 support, pass bmi2=1, otherwise pass bmi2=0.
|
||||||
*/
|
*/
|
||||||
size_t HUF_decompress1X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
|
size_t HUF_decompress1X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags);
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
#ifndef HUF_FORCE_DECOMPRESS_X2
|
||||||
size_t HUF_decompress1X1_DCtx_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
|
size_t HUF_decompress1X1_DCtx_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags);
|
||||||
#endif
|
#endif
|
||||||
size_t HUF_decompress4X_usingDTable_bmi2(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int bmi2);
|
size_t HUF_decompress4X_usingDTable(void* dst, size_t maxDstSize, const void* cSrc, size_t cSrcSize, const HUF_DTable* DTable, int flags);
|
||||||
size_t HUF_decompress4X_hufOnly_wksp_bmi2(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int bmi2);
|
size_t HUF_decompress4X_hufOnly_wksp(HUF_DTable* dctx, void* dst, size_t dstSize, const void* cSrc, size_t cSrcSize, void* workSpace, size_t wkspSize, int flags);
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X2
|
#ifndef HUF_FORCE_DECOMPRESS_X2
|
||||||
size_t HUF_readDTableX1_wksp_bmi2(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int bmi2);
|
size_t HUF_readDTableX1_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags);
|
||||||
#endif
|
#endif
|
||||||
#ifndef HUF_FORCE_DECOMPRESS_X1
|
#ifndef HUF_FORCE_DECOMPRESS_X1
|
||||||
size_t HUF_readDTableX2_wksp_bmi2(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int bmi2);
|
size_t HUF_readDTableX2_wksp(HUF_DTable* DTable, const void* src, size_t srcSize, void* workSpace, size_t wkspSize, int flags);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* HUF_STATIC_LINKING_ONLY */
|
#endif /* HUF_H_298734234 */
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
|
|||||||
472
vendor/github.com/DataDog/zstd/huf_compress.c
generated
vendored
472
vendor/github.com/DataDog/zstd/huf_compress.c
generated
vendored
@@ -1,7 +1,7 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/* ******************************************************************
|
/* ******************************************************************
|
||||||
* Huffman encoder, part of New Generation Entropy library
|
* Huffman encoder, part of New Generation Entropy library
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
*
|
*
|
||||||
* You can contact the author at :
|
* You can contact the author at :
|
||||||
* - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
* - FSE+HUF source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
||||||
@@ -30,9 +30,9 @@
|
|||||||
#include "hist.h"
|
#include "hist.h"
|
||||||
#define FSE_STATIC_LINKING_ONLY /* FSE_optimalTableLog_internal */
|
#define FSE_STATIC_LINKING_ONLY /* FSE_optimalTableLog_internal */
|
||||||
#include "fse.h" /* header compression */
|
#include "fse.h" /* header compression */
|
||||||
#define HUF_STATIC_LINKING_ONLY
|
|
||||||
#include "huf.h"
|
#include "huf.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
|
|
||||||
|
|
||||||
/* **************************************************************
|
/* **************************************************************
|
||||||
@@ -43,13 +43,67 @@
|
|||||||
|
|
||||||
|
|
||||||
/* **************************************************************
|
/* **************************************************************
|
||||||
* Utils
|
* Required declarations
|
||||||
****************************************************************/
|
****************************************************************/
|
||||||
unsigned HUF_optimalTableLog(unsigned maxTableLog, size_t srcSize, unsigned maxSymbolValue)
|
typedef struct nodeElt_s {
|
||||||
|
U32 count;
|
||||||
|
U16 parent;
|
||||||
|
BYTE byte;
|
||||||
|
BYTE nbBits;
|
||||||
|
} nodeElt;
|
||||||
|
|
||||||
|
|
||||||
|
/* **************************************************************
|
||||||
|
* Debug Traces
|
||||||
|
****************************************************************/
|
||||||
|
|
||||||
|
#if DEBUGLEVEL >= 2
|
||||||
|
|
||||||
|
static size_t showU32(const U32* arr, size_t size)
|
||||||
{
|
{
|
||||||
return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
|
size_t u;
|
||||||
|
for (u=0; u<size; u++) {
|
||||||
|
RAWLOG(6, " %u", arr[u]); (void)arr;
|
||||||
|
}
|
||||||
|
RAWLOG(6, " \n");
|
||||||
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static size_t HUF_getNbBits(HUF_CElt elt);
|
||||||
|
|
||||||
|
static size_t showCTableBits(const HUF_CElt* ctable, size_t size)
|
||||||
|
{
|
||||||
|
size_t u;
|
||||||
|
for (u=0; u<size; u++) {
|
||||||
|
RAWLOG(6, " %zu", HUF_getNbBits(ctable[u])); (void)ctable;
|
||||||
|
}
|
||||||
|
RAWLOG(6, " \n");
|
||||||
|
return size;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static size_t showHNodeSymbols(const nodeElt* hnode, size_t size)
|
||||||
|
{
|
||||||
|
size_t u;
|
||||||
|
for (u=0; u<size; u++) {
|
||||||
|
RAWLOG(6, " %u", hnode[u].byte); (void)hnode;
|
||||||
|
}
|
||||||
|
RAWLOG(6, " \n");
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
static size_t showHNodeBits(const nodeElt* hnode, size_t size)
|
||||||
|
{
|
||||||
|
size_t u;
|
||||||
|
for (u=0; u<size; u++) {
|
||||||
|
RAWLOG(6, " %u", hnode[u].nbBits); (void)hnode;
|
||||||
|
}
|
||||||
|
RAWLOG(6, " \n");
|
||||||
|
return size;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* *******************************************************
|
/* *******************************************************
|
||||||
* HUF : Huffman block compression
|
* HUF : Huffman block compression
|
||||||
@@ -90,7 +144,10 @@ typedef struct {
|
|||||||
S16 norm[HUF_TABLELOG_MAX+1];
|
S16 norm[HUF_TABLELOG_MAX+1];
|
||||||
} HUF_CompressWeightsWksp;
|
} HUF_CompressWeightsWksp;
|
||||||
|
|
||||||
static size_t HUF_compressWeights(void* dst, size_t dstSize, const void* weightTable, size_t wtSize, void* workspace, size_t workspaceSize)
|
static size_t
|
||||||
|
HUF_compressWeights(void* dst, size_t dstSize,
|
||||||
|
const void* weightTable, size_t wtSize,
|
||||||
|
void* workspace, size_t workspaceSize)
|
||||||
{
|
{
|
||||||
BYTE* const ostart = (BYTE*) dst;
|
BYTE* const ostart = (BYTE*) dst;
|
||||||
BYTE* op = ostart;
|
BYTE* op = ostart;
|
||||||
@@ -141,7 +198,7 @@ static size_t HUF_getNbBitsFast(HUF_CElt elt)
|
|||||||
|
|
||||||
static size_t HUF_getValue(HUF_CElt elt)
|
static size_t HUF_getValue(HUF_CElt elt)
|
||||||
{
|
{
|
||||||
return elt & ~0xFF;
|
return elt & ~(size_t)0xFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t HUF_getValueFast(HUF_CElt elt)
|
static size_t HUF_getValueFast(HUF_CElt elt)
|
||||||
@@ -164,6 +221,25 @@ static void HUF_setValue(HUF_CElt* elt, size_t value)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HUF_CTableHeader HUF_readCTableHeader(HUF_CElt const* ctable)
|
||||||
|
{
|
||||||
|
HUF_CTableHeader header;
|
||||||
|
ZSTD_memcpy(&header, ctable, sizeof(header));
|
||||||
|
return header;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void HUF_writeCTableHeader(HUF_CElt* ctable, U32 tableLog, U32 maxSymbolValue)
|
||||||
|
{
|
||||||
|
HUF_CTableHeader header;
|
||||||
|
HUF_STATIC_ASSERT(sizeof(ctable[0]) == sizeof(header));
|
||||||
|
ZSTD_memset(&header, 0, sizeof(header));
|
||||||
|
assert(tableLog < 256);
|
||||||
|
header.tableLog = (BYTE)tableLog;
|
||||||
|
assert(maxSymbolValue < 256);
|
||||||
|
header.maxSymbolValue = (BYTE)maxSymbolValue;
|
||||||
|
ZSTD_memcpy(ctable, &header, sizeof(header));
|
||||||
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
HUF_CompressWeightsWksp wksp;
|
HUF_CompressWeightsWksp wksp;
|
||||||
BYTE bitsToWeight[HUF_TABLELOG_MAX + 1]; /* precomputed conversion table */
|
BYTE bitsToWeight[HUF_TABLELOG_MAX + 1]; /* precomputed conversion table */
|
||||||
@@ -179,6 +255,11 @@ size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize,
|
|||||||
U32 n;
|
U32 n;
|
||||||
HUF_WriteCTableWksp* wksp = (HUF_WriteCTableWksp*)HUF_alignUpWorkspace(workspace, &workspaceSize, ZSTD_ALIGNOF(U32));
|
HUF_WriteCTableWksp* wksp = (HUF_WriteCTableWksp*)HUF_alignUpWorkspace(workspace, &workspaceSize, ZSTD_ALIGNOF(U32));
|
||||||
|
|
||||||
|
HUF_STATIC_ASSERT(HUF_CTABLE_WORKSPACE_SIZE >= sizeof(HUF_WriteCTableWksp));
|
||||||
|
|
||||||
|
assert(HUF_readCTableHeader(CTable).maxSymbolValue == maxSymbolValue);
|
||||||
|
assert(HUF_readCTableHeader(CTable).tableLog == huffLog);
|
||||||
|
|
||||||
/* check conditions */
|
/* check conditions */
|
||||||
if (workspaceSize < sizeof(HUF_WriteCTableWksp)) return ERROR(GENERIC);
|
if (workspaceSize < sizeof(HUF_WriteCTableWksp)) return ERROR(GENERIC);
|
||||||
if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
|
if (maxSymbolValue > HUF_SYMBOLVALUE_MAX) return ERROR(maxSymbolValue_tooLarge);
|
||||||
@@ -208,16 +289,6 @@ size_t HUF_writeCTable_wksp(void* dst, size_t maxDstSize,
|
|||||||
return ((maxSymbolValue+1)/2) + 1;
|
return ((maxSymbolValue+1)/2) + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! HUF_writeCTable() :
|
|
||||||
`CTable` : Huffman tree to save, using huf representation.
|
|
||||||
@return : size of saved CTable */
|
|
||||||
size_t HUF_writeCTable (void* dst, size_t maxDstSize,
|
|
||||||
const HUF_CElt* CTable, unsigned maxSymbolValue, unsigned huffLog)
|
|
||||||
{
|
|
||||||
HUF_WriteCTableWksp wksp;
|
|
||||||
return HUF_writeCTable_wksp(dst, maxDstSize, CTable, maxSymbolValue, huffLog, &wksp, sizeof(wksp));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned* hasZeroWeights)
|
size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void* src, size_t srcSize, unsigned* hasZeroWeights)
|
||||||
{
|
{
|
||||||
@@ -235,7 +306,9 @@ size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void
|
|||||||
if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
|
if (tableLog > HUF_TABLELOG_MAX) return ERROR(tableLog_tooLarge);
|
||||||
if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall);
|
if (nbSymbols > *maxSymbolValuePtr+1) return ERROR(maxSymbolValue_tooSmall);
|
||||||
|
|
||||||
CTable[0] = tableLog;
|
*maxSymbolValuePtr = nbSymbols - 1;
|
||||||
|
|
||||||
|
HUF_writeCTableHeader(CTable, tableLog, *maxSymbolValuePtr);
|
||||||
|
|
||||||
/* Prepare base value per rank */
|
/* Prepare base value per rank */
|
||||||
{ U32 n, nextRankStart = 0;
|
{ U32 n, nextRankStart = 0;
|
||||||
@@ -267,74 +340,71 @@ size_t HUF_readCTable (HUF_CElt* CTable, unsigned* maxSymbolValuePtr, const void
|
|||||||
{ U32 n; for (n=0; n<nbSymbols; n++) HUF_setValue(ct + n, valPerRank[HUF_getNbBits(ct[n])]++); }
|
{ U32 n; for (n=0; n<nbSymbols; n++) HUF_setValue(ct + n, valPerRank[HUF_getNbBits(ct[n])]++); }
|
||||||
}
|
}
|
||||||
|
|
||||||
*maxSymbolValuePtr = nbSymbols - 1;
|
|
||||||
return readSize;
|
return readSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
U32 HUF_getNbBitsFromCTable(HUF_CElt const* CTable, U32 symbolValue)
|
U32 HUF_getNbBitsFromCTable(HUF_CElt const* CTable, U32 symbolValue)
|
||||||
{
|
{
|
||||||
const HUF_CElt* ct = CTable + 1;
|
const HUF_CElt* const ct = CTable + 1;
|
||||||
assert(symbolValue <= HUF_SYMBOLVALUE_MAX);
|
assert(symbolValue <= HUF_SYMBOLVALUE_MAX);
|
||||||
|
if (symbolValue > HUF_readCTableHeader(CTable).maxSymbolValue)
|
||||||
|
return 0;
|
||||||
return (U32)HUF_getNbBits(ct[symbolValue]);
|
return (U32)HUF_getNbBits(ct[symbolValue]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
typedef struct nodeElt_s {
|
|
||||||
U32 count;
|
|
||||||
U16 parent;
|
|
||||||
BYTE byte;
|
|
||||||
BYTE nbBits;
|
|
||||||
} nodeElt;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* HUF_setMaxHeight():
|
* HUF_setMaxHeight():
|
||||||
* Enforces maxNbBits on the Huffman tree described in huffNode.
|
* Try to enforce @targetNbBits on the Huffman tree described in @huffNode.
|
||||||
*
|
*
|
||||||
* It sets all nodes with nbBits > maxNbBits to be maxNbBits. Then it adjusts
|
* It attempts to convert all nodes with nbBits > @targetNbBits
|
||||||
* the tree to so that it is a valid canonical Huffman tree.
|
* to employ @targetNbBits instead. Then it adjusts the tree
|
||||||
|
* so that it remains a valid canonical Huffman tree.
|
||||||
*
|
*
|
||||||
* @pre The sum of the ranks of each symbol == 2^largestBits,
|
* @pre The sum of the ranks of each symbol == 2^largestBits,
|
||||||
* where largestBits == huffNode[lastNonNull].nbBits.
|
* where largestBits == huffNode[lastNonNull].nbBits.
|
||||||
* @post The sum of the ranks of each symbol == 2^largestBits,
|
* @post The sum of the ranks of each symbol == 2^largestBits,
|
||||||
* where largestBits is the return value <= maxNbBits.
|
* where largestBits is the return value (expected <= targetNbBits).
|
||||||
*
|
*
|
||||||
* @param huffNode The Huffman tree modified in place to enforce maxNbBits.
|
* @param huffNode The Huffman tree modified in place to enforce targetNbBits.
|
||||||
|
* It's presumed sorted, from most frequent to rarest symbol.
|
||||||
* @param lastNonNull The symbol with the lowest count in the Huffman tree.
|
* @param lastNonNull The symbol with the lowest count in the Huffman tree.
|
||||||
* @param maxNbBits The maximum allowed number of bits, which the Huffman tree
|
* @param targetNbBits The allowed number of bits, which the Huffman tree
|
||||||
* may not respect. After this function the Huffman tree will
|
* may not respect. After this function the Huffman tree will
|
||||||
* respect maxNbBits.
|
* respect targetNbBits.
|
||||||
* @return The maximum number of bits of the Huffman tree after adjustment,
|
* @return The maximum number of bits of the Huffman tree after adjustment.
|
||||||
* necessarily no more than maxNbBits.
|
|
||||||
*/
|
*/
|
||||||
static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
|
static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 targetNbBits)
|
||||||
{
|
{
|
||||||
const U32 largestBits = huffNode[lastNonNull].nbBits;
|
const U32 largestBits = huffNode[lastNonNull].nbBits;
|
||||||
/* early exit : no elt > maxNbBits, so the tree is already valid. */
|
/* early exit : no elt > targetNbBits, so the tree is already valid. */
|
||||||
if (largestBits <= maxNbBits) return largestBits;
|
if (largestBits <= targetNbBits) return largestBits;
|
||||||
|
|
||||||
|
DEBUGLOG(5, "HUF_setMaxHeight (targetNbBits = %u)", targetNbBits);
|
||||||
|
|
||||||
/* there are several too large elements (at least >= 2) */
|
/* there are several too large elements (at least >= 2) */
|
||||||
{ int totalCost = 0;
|
{ int totalCost = 0;
|
||||||
const U32 baseCost = 1 << (largestBits - maxNbBits);
|
const U32 baseCost = 1 << (largestBits - targetNbBits);
|
||||||
int n = (int)lastNonNull;
|
int n = (int)lastNonNull;
|
||||||
|
|
||||||
/* Adjust any ranks > maxNbBits to maxNbBits.
|
/* Adjust any ranks > targetNbBits to targetNbBits.
|
||||||
* Compute totalCost, which is how far the sum of the ranks is
|
* Compute totalCost, which is how far the sum of the ranks is
|
||||||
* we are over 2^largestBits after adjust the offending ranks.
|
* we are over 2^largestBits after adjust the offending ranks.
|
||||||
*/
|
*/
|
||||||
while (huffNode[n].nbBits > maxNbBits) {
|
while (huffNode[n].nbBits > targetNbBits) {
|
||||||
totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits));
|
totalCost += baseCost - (1 << (largestBits - huffNode[n].nbBits));
|
||||||
huffNode[n].nbBits = (BYTE)maxNbBits;
|
huffNode[n].nbBits = (BYTE)targetNbBits;
|
||||||
n--;
|
n--;
|
||||||
}
|
}
|
||||||
/* n stops at huffNode[n].nbBits <= maxNbBits */
|
/* n stops at huffNode[n].nbBits <= targetNbBits */
|
||||||
assert(huffNode[n].nbBits <= maxNbBits);
|
assert(huffNode[n].nbBits <= targetNbBits);
|
||||||
/* n end at index of smallest symbol using < maxNbBits */
|
/* n end at index of smallest symbol using < targetNbBits */
|
||||||
while (huffNode[n].nbBits == maxNbBits) --n;
|
while (huffNode[n].nbBits == targetNbBits) --n;
|
||||||
|
|
||||||
/* renorm totalCost from 2^largestBits to 2^maxNbBits
|
/* renorm totalCost from 2^largestBits to 2^targetNbBits
|
||||||
* note : totalCost is necessarily a multiple of baseCost */
|
* note : totalCost is necessarily a multiple of baseCost */
|
||||||
assert((totalCost & (baseCost - 1)) == 0);
|
assert(((U32)totalCost & (baseCost - 1)) == 0);
|
||||||
totalCost >>= (largestBits - maxNbBits);
|
totalCost >>= (largestBits - targetNbBits);
|
||||||
assert(totalCost > 0);
|
assert(totalCost > 0);
|
||||||
|
|
||||||
/* repay normalized cost */
|
/* repay normalized cost */
|
||||||
@@ -343,19 +413,19 @@ static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
|
|||||||
|
|
||||||
/* Get pos of last (smallest = lowest cum. count) symbol per rank */
|
/* Get pos of last (smallest = lowest cum. count) symbol per rank */
|
||||||
ZSTD_memset(rankLast, 0xF0, sizeof(rankLast));
|
ZSTD_memset(rankLast, 0xF0, sizeof(rankLast));
|
||||||
{ U32 currentNbBits = maxNbBits;
|
{ U32 currentNbBits = targetNbBits;
|
||||||
int pos;
|
int pos;
|
||||||
for (pos=n ; pos >= 0; pos--) {
|
for (pos=n ; pos >= 0; pos--) {
|
||||||
if (huffNode[pos].nbBits >= currentNbBits) continue;
|
if (huffNode[pos].nbBits >= currentNbBits) continue;
|
||||||
currentNbBits = huffNode[pos].nbBits; /* < maxNbBits */
|
currentNbBits = huffNode[pos].nbBits; /* < targetNbBits */
|
||||||
rankLast[maxNbBits-currentNbBits] = (U32)pos;
|
rankLast[targetNbBits-currentNbBits] = (U32)pos;
|
||||||
} }
|
} }
|
||||||
|
|
||||||
while (totalCost > 0) {
|
while (totalCost > 0) {
|
||||||
/* Try to reduce the next power of 2 above totalCost because we
|
/* Try to reduce the next power of 2 above totalCost because we
|
||||||
* gain back half the rank.
|
* gain back half the rank.
|
||||||
*/
|
*/
|
||||||
U32 nBitsToDecrease = BIT_highbit32((U32)totalCost) + 1;
|
U32 nBitsToDecrease = ZSTD_highbit32((U32)totalCost) + 1;
|
||||||
for ( ; nBitsToDecrease > 1; nBitsToDecrease--) {
|
for ( ; nBitsToDecrease > 1; nBitsToDecrease--) {
|
||||||
U32 const highPos = rankLast[nBitsToDecrease];
|
U32 const highPos = rankLast[nBitsToDecrease];
|
||||||
U32 const lowPos = rankLast[nBitsToDecrease-1];
|
U32 const lowPos = rankLast[nBitsToDecrease-1];
|
||||||
@@ -395,7 +465,7 @@ static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
|
|||||||
rankLast[nBitsToDecrease] = noSymbol;
|
rankLast[nBitsToDecrease] = noSymbol;
|
||||||
else {
|
else {
|
||||||
rankLast[nBitsToDecrease]--;
|
rankLast[nBitsToDecrease]--;
|
||||||
if (huffNode[rankLast[nBitsToDecrease]].nbBits != maxNbBits-nBitsToDecrease)
|
if (huffNode[rankLast[nBitsToDecrease]].nbBits != targetNbBits-nBitsToDecrease)
|
||||||
rankLast[nBitsToDecrease] = noSymbol; /* this rank is now empty */
|
rankLast[nBitsToDecrease] = noSymbol; /* this rank is now empty */
|
||||||
}
|
}
|
||||||
} /* while (totalCost > 0) */
|
} /* while (totalCost > 0) */
|
||||||
@@ -407,11 +477,11 @@ static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
|
|||||||
* TODO.
|
* TODO.
|
||||||
*/
|
*/
|
||||||
while (totalCost < 0) { /* Sometimes, cost correction overshoot */
|
while (totalCost < 0) { /* Sometimes, cost correction overshoot */
|
||||||
/* special case : no rank 1 symbol (using maxNbBits-1);
|
/* special case : no rank 1 symbol (using targetNbBits-1);
|
||||||
* let's create one from largest rank 0 (using maxNbBits).
|
* let's create one from largest rank 0 (using targetNbBits).
|
||||||
*/
|
*/
|
||||||
if (rankLast[1] == noSymbol) {
|
if (rankLast[1] == noSymbol) {
|
||||||
while (huffNode[n].nbBits == maxNbBits) n--;
|
while (huffNode[n].nbBits == targetNbBits) n--;
|
||||||
huffNode[n+1].nbBits--;
|
huffNode[n+1].nbBits--;
|
||||||
assert(n >= 0);
|
assert(n >= 0);
|
||||||
rankLast[1] = (U32)(n+1);
|
rankLast[1] = (U32)(n+1);
|
||||||
@@ -425,7 +495,7 @@ static U32 HUF_setMaxHeight(nodeElt* huffNode, U32 lastNonNull, U32 maxNbBits)
|
|||||||
} /* repay normalized cost */
|
} /* repay normalized cost */
|
||||||
} /* there are several too large elements (at least >= 2) */
|
} /* there are several too large elements (at least >= 2) */
|
||||||
|
|
||||||
return maxNbBits;
|
return targetNbBits;
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -433,7 +503,7 @@ typedef struct {
|
|||||||
U16 curr;
|
U16 curr;
|
||||||
} rankPos;
|
} rankPos;
|
||||||
|
|
||||||
typedef nodeElt huffNodeTable[HUF_CTABLE_WORKSPACE_SIZE_U32];
|
typedef nodeElt huffNodeTable[2 * (HUF_SYMBOLVALUE_MAX + 1)];
|
||||||
|
|
||||||
/* Number of buckets available for HUF_sort() */
|
/* Number of buckets available for HUF_sort() */
|
||||||
#define RANK_POSITION_TABLE_SIZE 192
|
#define RANK_POSITION_TABLE_SIZE 192
|
||||||
@@ -452,8 +522,8 @@ typedef struct {
|
|||||||
* Let buckets 166 to 192 represent all remaining counts up to RANK_POSITION_MAX_COUNT_LOG using log2 bucketing.
|
* Let buckets 166 to 192 represent all remaining counts up to RANK_POSITION_MAX_COUNT_LOG using log2 bucketing.
|
||||||
*/
|
*/
|
||||||
#define RANK_POSITION_MAX_COUNT_LOG 32
|
#define RANK_POSITION_MAX_COUNT_LOG 32
|
||||||
#define RANK_POSITION_LOG_BUCKETS_BEGIN (RANK_POSITION_TABLE_SIZE - 1) - RANK_POSITION_MAX_COUNT_LOG - 1 /* == 158 */
|
#define RANK_POSITION_LOG_BUCKETS_BEGIN ((RANK_POSITION_TABLE_SIZE - 1) - RANK_POSITION_MAX_COUNT_LOG - 1 /* == 158 */)
|
||||||
#define RANK_POSITION_DISTINCT_COUNT_CUTOFF RANK_POSITION_LOG_BUCKETS_BEGIN + BIT_highbit32(RANK_POSITION_LOG_BUCKETS_BEGIN) /* == 166 */
|
#define RANK_POSITION_DISTINCT_COUNT_CUTOFF (RANK_POSITION_LOG_BUCKETS_BEGIN + ZSTD_highbit32(RANK_POSITION_LOG_BUCKETS_BEGIN) /* == 166 */)
|
||||||
|
|
||||||
/* Return the appropriate bucket index for a given count. See definition of
|
/* Return the appropriate bucket index for a given count. See definition of
|
||||||
* RANK_POSITION_DISTINCT_COUNT_CUTOFF for explanation of bucketing strategy.
|
* RANK_POSITION_DISTINCT_COUNT_CUTOFF for explanation of bucketing strategy.
|
||||||
@@ -461,7 +531,7 @@ typedef struct {
|
|||||||
static U32 HUF_getIndex(U32 const count) {
|
static U32 HUF_getIndex(U32 const count) {
|
||||||
return (count < RANK_POSITION_DISTINCT_COUNT_CUTOFF)
|
return (count < RANK_POSITION_DISTINCT_COUNT_CUTOFF)
|
||||||
? count
|
? count
|
||||||
: BIT_highbit32(count) + RANK_POSITION_LOG_BUCKETS_BEGIN;
|
: ZSTD_highbit32(count) + RANK_POSITION_LOG_BUCKETS_BEGIN;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Helper swap function for HUF_quickSortPartition() */
|
/* Helper swap function for HUF_quickSortPartition() */
|
||||||
@@ -584,7 +654,7 @@ static void HUF_sort(nodeElt huffNode[], const unsigned count[], U32 const maxSy
|
|||||||
|
|
||||||
/* Sort each bucket. */
|
/* Sort each bucket. */
|
||||||
for (n = RANK_POSITION_DISTINCT_COUNT_CUTOFF; n < RANK_POSITION_TABLE_SIZE - 1; ++n) {
|
for (n = RANK_POSITION_DISTINCT_COUNT_CUTOFF; n < RANK_POSITION_TABLE_SIZE - 1; ++n) {
|
||||||
U32 const bucketSize = rankPosition[n].curr-rankPosition[n].base;
|
int const bucketSize = rankPosition[n].curr - rankPosition[n].base;
|
||||||
U32 const bucketStartIdx = rankPosition[n].base;
|
U32 const bucketStartIdx = rankPosition[n].base;
|
||||||
if (bucketSize > 1) {
|
if (bucketSize > 1) {
|
||||||
assert(bucketStartIdx < maxSymbolValue1);
|
assert(bucketStartIdx < maxSymbolValue1);
|
||||||
@@ -595,6 +665,7 @@ static void HUF_sort(nodeElt huffNode[], const unsigned count[], U32 const maxSy
|
|||||||
assert(HUF_isSorted(huffNode, maxSymbolValue1));
|
assert(HUF_isSorted(huffNode, maxSymbolValue1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** HUF_buildCTable_wksp() :
|
/** HUF_buildCTable_wksp() :
|
||||||
* Same as HUF_buildCTable(), but using externally allocated scratch buffer.
|
* Same as HUF_buildCTable(), but using externally allocated scratch buffer.
|
||||||
* `workSpace` must be aligned on 4-bytes boundaries, and be at least as large as sizeof(HUF_buildCTable_wksp_tables).
|
* `workSpace` must be aligned on 4-bytes boundaries, and be at least as large as sizeof(HUF_buildCTable_wksp_tables).
|
||||||
@@ -615,6 +686,7 @@ static int HUF_buildTree(nodeElt* huffNode, U32 maxSymbolValue)
|
|||||||
int lowS, lowN;
|
int lowS, lowN;
|
||||||
int nodeNb = STARTNODE;
|
int nodeNb = STARTNODE;
|
||||||
int n, nodeRoot;
|
int n, nodeRoot;
|
||||||
|
DEBUGLOG(5, "HUF_buildTree (alphabet size = %u)", maxSymbolValue + 1);
|
||||||
/* init for parents */
|
/* init for parents */
|
||||||
nonNullRank = (int)maxSymbolValue;
|
nonNullRank = (int)maxSymbolValue;
|
||||||
while(huffNode[nonNullRank].count == 0) nonNullRank--;
|
while(huffNode[nonNullRank].count == 0) nonNullRank--;
|
||||||
@@ -641,6 +713,8 @@ static int HUF_buildTree(nodeElt* huffNode, U32 maxSymbolValue)
|
|||||||
for (n=0; n<=nonNullRank; n++)
|
for (n=0; n<=nonNullRank; n++)
|
||||||
huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
|
huffNode[n].nbBits = huffNode[ huffNode[n].parent ].nbBits + 1;
|
||||||
|
|
||||||
|
DEBUGLOG(6, "Initial distribution of bits completed (%zu sorted symbols)", showHNodeBits(huffNode, maxSymbolValue+1));
|
||||||
|
|
||||||
return nonNullRank;
|
return nonNullRank;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -675,31 +749,40 @@ static void HUF_buildCTableFromTree(HUF_CElt* CTable, nodeElt const* huffNode, i
|
|||||||
HUF_setNbBits(ct + huffNode[n].byte, huffNode[n].nbBits); /* push nbBits per symbol, symbol order */
|
HUF_setNbBits(ct + huffNode[n].byte, huffNode[n].nbBits); /* push nbBits per symbol, symbol order */
|
||||||
for (n=0; n<alphabetSize; n++)
|
for (n=0; n<alphabetSize; n++)
|
||||||
HUF_setValue(ct + n, valPerRank[HUF_getNbBits(ct[n])]++); /* assign value within rank, symbol order */
|
HUF_setValue(ct + n, valPerRank[HUF_getNbBits(ct[n])]++); /* assign value within rank, symbol order */
|
||||||
CTable[0] = maxNbBits;
|
|
||||||
|
HUF_writeCTableHeader(CTable, maxNbBits, maxSymbolValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t HUF_buildCTable_wksp (HUF_CElt* CTable, const unsigned* count, U32 maxSymbolValue, U32 maxNbBits, void* workSpace, size_t wkspSize)
|
size_t
|
||||||
|
HUF_buildCTable_wksp(HUF_CElt* CTable, const unsigned* count, U32 maxSymbolValue, U32 maxNbBits,
|
||||||
|
void* workSpace, size_t wkspSize)
|
||||||
{
|
{
|
||||||
HUF_buildCTable_wksp_tables* const wksp_tables = (HUF_buildCTable_wksp_tables*)HUF_alignUpWorkspace(workSpace, &wkspSize, ZSTD_ALIGNOF(U32));
|
HUF_buildCTable_wksp_tables* const wksp_tables =
|
||||||
|
(HUF_buildCTable_wksp_tables*)HUF_alignUpWorkspace(workSpace, &wkspSize, ZSTD_ALIGNOF(U32));
|
||||||
nodeElt* const huffNode0 = wksp_tables->huffNodeTbl;
|
nodeElt* const huffNode0 = wksp_tables->huffNodeTbl;
|
||||||
nodeElt* const huffNode = huffNode0+1;
|
nodeElt* const huffNode = huffNode0+1;
|
||||||
int nonNullRank;
|
int nonNullRank;
|
||||||
|
|
||||||
|
HUF_STATIC_ASSERT(HUF_CTABLE_WORKSPACE_SIZE == sizeof(HUF_buildCTable_wksp_tables));
|
||||||
|
|
||||||
|
DEBUGLOG(5, "HUF_buildCTable_wksp (alphabet size = %u)", maxSymbolValue+1);
|
||||||
|
|
||||||
/* safety checks */
|
/* safety checks */
|
||||||
if (wkspSize < sizeof(HUF_buildCTable_wksp_tables))
|
if (wkspSize < sizeof(HUF_buildCTable_wksp_tables))
|
||||||
return ERROR(workSpace_tooSmall);
|
return ERROR(workSpace_tooSmall);
|
||||||
if (maxNbBits == 0) maxNbBits = HUF_TABLELOG_DEFAULT;
|
if (maxNbBits == 0) maxNbBits = HUF_TABLELOG_DEFAULT;
|
||||||
if (maxSymbolValue > HUF_SYMBOLVALUE_MAX)
|
if (maxSymbolValue > HUF_SYMBOLVALUE_MAX)
|
||||||
return ERROR(maxSymbolValue_tooLarge);
|
return ERROR(maxSymbolValue_tooLarge);
|
||||||
ZSTD_memset(huffNode0, 0, sizeof(huffNodeTable));
|
ZSTD_memset(huffNode0, 0, sizeof(huffNodeTable));
|
||||||
|
|
||||||
/* sort, decreasing order */
|
/* sort, decreasing order */
|
||||||
HUF_sort(huffNode, count, maxSymbolValue, wksp_tables->rankPosition);
|
HUF_sort(huffNode, count, maxSymbolValue, wksp_tables->rankPosition);
|
||||||
|
DEBUGLOG(6, "sorted symbols completed (%zu symbols)", showHNodeSymbols(huffNode, maxSymbolValue+1));
|
||||||
|
|
||||||
/* build tree */
|
/* build tree */
|
||||||
nonNullRank = HUF_buildTree(huffNode, maxSymbolValue);
|
nonNullRank = HUF_buildTree(huffNode, maxSymbolValue);
|
||||||
|
|
||||||
/* enforce maxTableLog */
|
/* determine and enforce maxTableLog */
|
||||||
maxNbBits = HUF_setMaxHeight(huffNode, (U32)nonNullRank, maxNbBits);
|
maxNbBits = HUF_setMaxHeight(huffNode, (U32)nonNullRank, maxNbBits);
|
||||||
if (maxNbBits > HUF_TABLELOG_MAX) return ERROR(GENERIC); /* check fit into table */
|
if (maxNbBits > HUF_TABLELOG_MAX) return ERROR(GENERIC); /* check fit into table */
|
||||||
|
|
||||||
@@ -720,13 +803,20 @@ size_t HUF_estimateCompressedSize(const HUF_CElt* CTable, const unsigned* count,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) {
|
int HUF_validateCTable(const HUF_CElt* CTable, const unsigned* count, unsigned maxSymbolValue) {
|
||||||
HUF_CElt const* ct = CTable + 1;
|
HUF_CTableHeader header = HUF_readCTableHeader(CTable);
|
||||||
int bad = 0;
|
HUF_CElt const* ct = CTable + 1;
|
||||||
int s;
|
int bad = 0;
|
||||||
for (s = 0; s <= (int)maxSymbolValue; ++s) {
|
int s;
|
||||||
bad |= (count[s] != 0) & (HUF_getNbBits(ct[s]) == 0);
|
|
||||||
}
|
assert(header.tableLog <= HUF_TABLELOG_ABSOLUTEMAX);
|
||||||
return !bad;
|
|
||||||
|
if (header.maxSymbolValue < maxSymbolValue)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
for (s = 0; s <= (int)maxSymbolValue; ++s) {
|
||||||
|
bad |= (count[s] != 0) & (HUF_getNbBits(ct[s]) == 0);
|
||||||
|
}
|
||||||
|
return !bad;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); }
|
size_t HUF_compressBound(size_t size) { return HUF_COMPRESSBOUND(size); }
|
||||||
@@ -808,7 +898,7 @@ FORCE_INLINE_TEMPLATE void HUF_addBits(HUF_CStream_t* bitC, HUF_CElt elt, int id
|
|||||||
#if DEBUGLEVEL >= 1
|
#if DEBUGLEVEL >= 1
|
||||||
{
|
{
|
||||||
size_t const nbBits = HUF_getNbBits(elt);
|
size_t const nbBits = HUF_getNbBits(elt);
|
||||||
size_t const dirtyBits = nbBits == 0 ? 0 : BIT_highbit32((U32)nbBits) + 1;
|
size_t const dirtyBits = nbBits == 0 ? 0 : ZSTD_highbit32((U32)nbBits) + 1;
|
||||||
(void)dirtyBits;
|
(void)dirtyBits;
|
||||||
/* Middle bits are 0. */
|
/* Middle bits are 0. */
|
||||||
assert(((elt >> dirtyBits) << (dirtyBits + nbBits)) == 0);
|
assert(((elt >> dirtyBits) << (dirtyBits + nbBits)) == 0);
|
||||||
@@ -888,7 +978,7 @@ static size_t HUF_closeCStream(HUF_CStream_t* bitC)
|
|||||||
{
|
{
|
||||||
size_t const nbBits = bitC->bitPos[0] & 0xFF;
|
size_t const nbBits = bitC->bitPos[0] & 0xFF;
|
||||||
if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */
|
if (bitC->ptr >= bitC->endPtr) return 0; /* overflow detected */
|
||||||
return (bitC->ptr - bitC->startPtr) + (nbBits > 0);
|
return (size_t)(bitC->ptr - bitC->startPtr) + (nbBits > 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -968,17 +1058,17 @@ HUF_compress1X_usingCTable_internal_body(void* dst, size_t dstSize,
|
|||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
const HUF_CElt* CTable)
|
const HUF_CElt* CTable)
|
||||||
{
|
{
|
||||||
U32 const tableLog = (U32)CTable[0];
|
U32 const tableLog = HUF_readCTableHeader(CTable).tableLog;
|
||||||
HUF_CElt const* ct = CTable + 1;
|
HUF_CElt const* ct = CTable + 1;
|
||||||
const BYTE* ip = (const BYTE*) src;
|
const BYTE* ip = (const BYTE*) src;
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
BYTE* const oend = ostart + dstSize;
|
BYTE* const oend = ostart + dstSize;
|
||||||
BYTE* op = ostart;
|
|
||||||
HUF_CStream_t bitC;
|
HUF_CStream_t bitC;
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
if (dstSize < 8) return 0; /* not enough space to compress */
|
if (dstSize < 8) return 0; /* not enough space to compress */
|
||||||
{ size_t const initErr = HUF_initCStream(&bitC, op, (size_t)(oend-op));
|
{ BYTE* op = ostart;
|
||||||
|
size_t const initErr = HUF_initCStream(&bitC, op, (size_t)(oend-op));
|
||||||
if (HUF_isError(initErr)) return 0; }
|
if (HUF_isError(initErr)) return 0; }
|
||||||
|
|
||||||
if (dstSize < HUF_tightCompressBound(srcSize, (size_t)tableLog) || tableLog > 11)
|
if (dstSize < HUF_tightCompressBound(srcSize, (size_t)tableLog) || tableLog > 11)
|
||||||
@@ -1049,9 +1139,9 @@ HUF_compress1X_usingCTable_internal_default(void* dst, size_t dstSize,
|
|||||||
static size_t
|
static size_t
|
||||||
HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
|
HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
const HUF_CElt* CTable, const int bmi2)
|
const HUF_CElt* CTable, const int flags)
|
||||||
{
|
{
|
||||||
if (bmi2) {
|
if (flags & HUF_flags_bmi2) {
|
||||||
return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src, srcSize, CTable);
|
return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src, srcSize, CTable);
|
||||||
}
|
}
|
||||||
return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, srcSize, CTable);
|
return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, srcSize, CTable);
|
||||||
@@ -1062,28 +1152,23 @@ HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
static size_t
|
static size_t
|
||||||
HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
|
HUF_compress1X_usingCTable_internal(void* dst, size_t dstSize,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
const HUF_CElt* CTable, const int bmi2)
|
const HUF_CElt* CTable, const int flags)
|
||||||
{
|
{
|
||||||
(void)bmi2;
|
(void)flags;
|
||||||
return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
|
return HUF_compress1X_usingCTable_internal_body(dst, dstSize, src, srcSize, CTable);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
|
size_t HUF_compress1X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags)
|
||||||
{
|
{
|
||||||
return HUF_compress1X_usingCTable_bmi2(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
|
return HUF_compress1X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, flags);
|
||||||
}
|
|
||||||
|
|
||||||
size_t HUF_compress1X_usingCTable_bmi2(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int bmi2)
|
|
||||||
{
|
|
||||||
return HUF_compress1X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, bmi2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t
|
static size_t
|
||||||
HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
const HUF_CElt* CTable, int bmi2)
|
const HUF_CElt* CTable, int flags)
|
||||||
{
|
{
|
||||||
size_t const segmentSize = (srcSize+3)/4; /* first 3 segments */
|
size_t const segmentSize = (srcSize+3)/4; /* first 3 segments */
|
||||||
const BYTE* ip = (const BYTE*) src;
|
const BYTE* ip = (const BYTE*) src;
|
||||||
@@ -1097,7 +1182,7 @@ HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
op += 6; /* jumpTable */
|
op += 6; /* jumpTable */
|
||||||
|
|
||||||
assert(op <= oend);
|
assert(op <= oend);
|
||||||
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
|
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) );
|
||||||
if (cSize == 0 || cSize > 65535) return 0;
|
if (cSize == 0 || cSize > 65535) return 0;
|
||||||
MEM_writeLE16(ostart, (U16)cSize);
|
MEM_writeLE16(ostart, (U16)cSize);
|
||||||
op += cSize;
|
op += cSize;
|
||||||
@@ -1105,7 +1190,7 @@ HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
|
|
||||||
ip += segmentSize;
|
ip += segmentSize;
|
||||||
assert(op <= oend);
|
assert(op <= oend);
|
||||||
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
|
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) );
|
||||||
if (cSize == 0 || cSize > 65535) return 0;
|
if (cSize == 0 || cSize > 65535) return 0;
|
||||||
MEM_writeLE16(ostart+2, (U16)cSize);
|
MEM_writeLE16(ostart+2, (U16)cSize);
|
||||||
op += cSize;
|
op += cSize;
|
||||||
@@ -1113,7 +1198,7 @@ HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
|
|
||||||
ip += segmentSize;
|
ip += segmentSize;
|
||||||
assert(op <= oend);
|
assert(op <= oend);
|
||||||
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, bmi2) );
|
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, segmentSize, CTable, flags) );
|
||||||
if (cSize == 0 || cSize > 65535) return 0;
|
if (cSize == 0 || cSize > 65535) return 0;
|
||||||
MEM_writeLE16(ostart+4, (U16)cSize);
|
MEM_writeLE16(ostart+4, (U16)cSize);
|
||||||
op += cSize;
|
op += cSize;
|
||||||
@@ -1122,7 +1207,7 @@ HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
ip += segmentSize;
|
ip += segmentSize;
|
||||||
assert(op <= oend);
|
assert(op <= oend);
|
||||||
assert(ip <= iend);
|
assert(ip <= iend);
|
||||||
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, (size_t)(iend-ip), CTable, bmi2) );
|
{ CHECK_V_F(cSize, HUF_compress1X_usingCTable_internal(op, (size_t)(oend-op), ip, (size_t)(iend-ip), CTable, flags) );
|
||||||
if (cSize == 0 || cSize > 65535) return 0;
|
if (cSize == 0 || cSize > 65535) return 0;
|
||||||
op += cSize;
|
op += cSize;
|
||||||
}
|
}
|
||||||
@@ -1130,14 +1215,9 @@ HUF_compress4X_usingCTable_internal(void* dst, size_t dstSize,
|
|||||||
return (size_t)(op-ostart);
|
return (size_t)(op-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable)
|
size_t HUF_compress4X_usingCTable(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int flags)
|
||||||
{
|
{
|
||||||
return HUF_compress4X_usingCTable_bmi2(dst, dstSize, src, srcSize, CTable, /* bmi2 */ 0);
|
return HUF_compress4X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, flags);
|
||||||
}
|
|
||||||
|
|
||||||
size_t HUF_compress4X_usingCTable_bmi2(void* dst, size_t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, int bmi2)
|
|
||||||
{
|
|
||||||
return HUF_compress4X_usingCTable_internal(dst, dstSize, src, srcSize, CTable, bmi2);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e;
|
typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e;
|
||||||
@@ -1145,11 +1225,11 @@ typedef enum { HUF_singleStream, HUF_fourStreams } HUF_nbStreams_e;
|
|||||||
static size_t HUF_compressCTable_internal(
|
static size_t HUF_compressCTable_internal(
|
||||||
BYTE* const ostart, BYTE* op, BYTE* const oend,
|
BYTE* const ostart, BYTE* op, BYTE* const oend,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
HUF_nbStreams_e nbStreams, const HUF_CElt* CTable, const int bmi2)
|
HUF_nbStreams_e nbStreams, const HUF_CElt* CTable, const int flags)
|
||||||
{
|
{
|
||||||
size_t const cSize = (nbStreams==HUF_singleStream) ?
|
size_t const cSize = (nbStreams==HUF_singleStream) ?
|
||||||
HUF_compress1X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, bmi2) :
|
HUF_compress1X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, flags) :
|
||||||
HUF_compress4X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, bmi2);
|
HUF_compress4X_usingCTable_internal(op, (size_t)(oend - op), src, srcSize, CTable, flags);
|
||||||
if (HUF_isError(cSize)) { return cSize; }
|
if (HUF_isError(cSize)) { return cSize; }
|
||||||
if (cSize==0) { return 0; } /* uncompressible */
|
if (cSize==0) { return 0; } /* uncompressible */
|
||||||
op += cSize;
|
op += cSize;
|
||||||
@@ -1172,6 +1252,81 @@ typedef struct {
|
|||||||
#define SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE 4096
|
#define SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE 4096
|
||||||
#define SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO 10 /* Must be >= 2 */
|
#define SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO 10 /* Must be >= 2 */
|
||||||
|
|
||||||
|
unsigned HUF_cardinality(const unsigned* count, unsigned maxSymbolValue)
|
||||||
|
{
|
||||||
|
unsigned cardinality = 0;
|
||||||
|
unsigned i;
|
||||||
|
|
||||||
|
for (i = 0; i < maxSymbolValue + 1; i++) {
|
||||||
|
if (count[i] != 0) cardinality += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return cardinality;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned HUF_minTableLog(unsigned symbolCardinality)
|
||||||
|
{
|
||||||
|
U32 minBitsSymbols = ZSTD_highbit32(symbolCardinality) + 1;
|
||||||
|
return minBitsSymbols;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned HUF_optimalTableLog(
|
||||||
|
unsigned maxTableLog,
|
||||||
|
size_t srcSize,
|
||||||
|
unsigned maxSymbolValue,
|
||||||
|
void* workSpace, size_t wkspSize,
|
||||||
|
HUF_CElt* table,
|
||||||
|
const unsigned* count,
|
||||||
|
int flags)
|
||||||
|
{
|
||||||
|
assert(srcSize > 1); /* Not supported, RLE should be used instead */
|
||||||
|
assert(wkspSize >= sizeof(HUF_buildCTable_wksp_tables));
|
||||||
|
|
||||||
|
if (!(flags & HUF_flags_optimalDepth)) {
|
||||||
|
/* cheap evaluation, based on FSE */
|
||||||
|
return FSE_optimalTableLog_internal(maxTableLog, srcSize, maxSymbolValue, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
{ BYTE* dst = (BYTE*)workSpace + sizeof(HUF_WriteCTableWksp);
|
||||||
|
size_t dstSize = wkspSize - sizeof(HUF_WriteCTableWksp);
|
||||||
|
size_t hSize, newSize;
|
||||||
|
const unsigned symbolCardinality = HUF_cardinality(count, maxSymbolValue);
|
||||||
|
const unsigned minTableLog = HUF_minTableLog(symbolCardinality);
|
||||||
|
size_t optSize = ((size_t) ~0) - 1;
|
||||||
|
unsigned optLog = maxTableLog, optLogGuess;
|
||||||
|
|
||||||
|
DEBUGLOG(6, "HUF_optimalTableLog: probing huf depth (srcSize=%zu)", srcSize);
|
||||||
|
|
||||||
|
/* Search until size increases */
|
||||||
|
for (optLogGuess = minTableLog; optLogGuess <= maxTableLog; optLogGuess++) {
|
||||||
|
DEBUGLOG(7, "checking for huffLog=%u", optLogGuess);
|
||||||
|
|
||||||
|
{ size_t maxBits = HUF_buildCTable_wksp(table, count, maxSymbolValue, optLogGuess, workSpace, wkspSize);
|
||||||
|
if (ERR_isError(maxBits)) continue;
|
||||||
|
|
||||||
|
if (maxBits < optLogGuess && optLogGuess > minTableLog) break;
|
||||||
|
|
||||||
|
hSize = HUF_writeCTable_wksp(dst, dstSize, table, maxSymbolValue, (U32)maxBits, workSpace, wkspSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ERR_isError(hSize)) continue;
|
||||||
|
|
||||||
|
newSize = HUF_estimateCompressedSize(table, count, maxSymbolValue) + hSize;
|
||||||
|
|
||||||
|
if (newSize > optSize + 1) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newSize < optSize) {
|
||||||
|
optSize = newSize;
|
||||||
|
optLog = optLogGuess;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assert(optLog <= HUF_TABLELOG_MAX);
|
||||||
|
return optLog;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* HUF_compress_internal() :
|
/* HUF_compress_internal() :
|
||||||
* `workSpace_align4` must be aligned on 4-bytes boundaries,
|
* `workSpace_align4` must be aligned on 4-bytes boundaries,
|
||||||
* and occupies the same space as a table of HUF_WORKSPACE_SIZE_U64 unsigned */
|
* and occupies the same space as a table of HUF_WORKSPACE_SIZE_U64 unsigned */
|
||||||
@@ -1181,14 +1336,14 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
unsigned maxSymbolValue, unsigned huffLog,
|
unsigned maxSymbolValue, unsigned huffLog,
|
||||||
HUF_nbStreams_e nbStreams,
|
HUF_nbStreams_e nbStreams,
|
||||||
void* workSpace, size_t wkspSize,
|
void* workSpace, size_t wkspSize,
|
||||||
HUF_CElt* oldHufTable, HUF_repeat* repeat, int preferRepeat,
|
HUF_CElt* oldHufTable, HUF_repeat* repeat, int flags)
|
||||||
const int bmi2, unsigned suspectUncompressible)
|
|
||||||
{
|
{
|
||||||
HUF_compress_tables_t* const table = (HUF_compress_tables_t*)HUF_alignUpWorkspace(workSpace, &wkspSize, ZSTD_ALIGNOF(size_t));
|
HUF_compress_tables_t* const table = (HUF_compress_tables_t*)HUF_alignUpWorkspace(workSpace, &wkspSize, ZSTD_ALIGNOF(size_t));
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
BYTE* const oend = ostart + dstSize;
|
BYTE* const oend = ostart + dstSize;
|
||||||
BYTE* op = ostart;
|
BYTE* op = ostart;
|
||||||
|
|
||||||
|
DEBUGLOG(5, "HUF_compress_internal (srcSize=%zu)", srcSize);
|
||||||
HUF_STATIC_ASSERT(sizeof(*table) + HUF_WORKSPACE_MAX_ALIGNMENT <= HUF_WORKSPACE_SIZE);
|
HUF_STATIC_ASSERT(sizeof(*table) + HUF_WORKSPACE_MAX_ALIGNMENT <= HUF_WORKSPACE_SIZE);
|
||||||
|
|
||||||
/* checks & inits */
|
/* checks & inits */
|
||||||
@@ -1202,16 +1357,17 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
if (!huffLog) huffLog = HUF_TABLELOG_DEFAULT;
|
if (!huffLog) huffLog = HUF_TABLELOG_DEFAULT;
|
||||||
|
|
||||||
/* Heuristic : If old table is valid, use it for small inputs */
|
/* Heuristic : If old table is valid, use it for small inputs */
|
||||||
if (preferRepeat && repeat && *repeat == HUF_repeat_valid) {
|
if ((flags & HUF_flags_preferRepeat) && repeat && *repeat == HUF_repeat_valid) {
|
||||||
return HUF_compressCTable_internal(ostart, op, oend,
|
return HUF_compressCTable_internal(ostart, op, oend,
|
||||||
src, srcSize,
|
src, srcSize,
|
||||||
nbStreams, oldHufTable, bmi2);
|
nbStreams, oldHufTable, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If uncompressible data is suspected, do a smaller sampling first */
|
/* If uncompressible data is suspected, do a smaller sampling first */
|
||||||
DEBUG_STATIC_ASSERT(SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO >= 2);
|
DEBUG_STATIC_ASSERT(SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO >= 2);
|
||||||
if (suspectUncompressible && srcSize >= (SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE * SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO)) {
|
if ((flags & HUF_flags_suspectUncompressible) && srcSize >= (SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE * SUSPECT_INCOMPRESSIBLE_SAMPLE_RATIO)) {
|
||||||
size_t largestTotal = 0;
|
size_t largestTotal = 0;
|
||||||
|
DEBUGLOG(5, "input suspected incompressible : sampling to check");
|
||||||
{ unsigned maxSymbolValueBegin = maxSymbolValue;
|
{ unsigned maxSymbolValueBegin = maxSymbolValue;
|
||||||
CHECK_V_F(largestBegin, HIST_count_simple (table->count, &maxSymbolValueBegin, (const BYTE*)src, SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE) );
|
CHECK_V_F(largestBegin, HIST_count_simple (table->count, &maxSymbolValueBegin, (const BYTE*)src, SUSPECT_INCOMPRESSIBLE_SAMPLE_SIZE) );
|
||||||
largestTotal += largestBegin;
|
largestTotal += largestBegin;
|
||||||
@@ -1228,6 +1384,7 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
if (largest == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; } /* single symbol, rle */
|
if (largest == srcSize) { *ostart = ((const BYTE*)src)[0]; return 1; } /* single symbol, rle */
|
||||||
if (largest <= (srcSize >> 7)+4) return 0; /* heuristic : probably not compressible enough */
|
if (largest <= (srcSize >> 7)+4) return 0; /* heuristic : probably not compressible enough */
|
||||||
}
|
}
|
||||||
|
DEBUGLOG(6, "histogram detail completed (%zu symbols)", showU32(table->count, maxSymbolValue+1));
|
||||||
|
|
||||||
/* Check validity of previous table */
|
/* Check validity of previous table */
|
||||||
if ( repeat
|
if ( repeat
|
||||||
@@ -1236,25 +1393,20 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
*repeat = HUF_repeat_none;
|
*repeat = HUF_repeat_none;
|
||||||
}
|
}
|
||||||
/* Heuristic : use existing table for small inputs */
|
/* Heuristic : use existing table for small inputs */
|
||||||
if (preferRepeat && repeat && *repeat != HUF_repeat_none) {
|
if ((flags & HUF_flags_preferRepeat) && repeat && *repeat != HUF_repeat_none) {
|
||||||
return HUF_compressCTable_internal(ostart, op, oend,
|
return HUF_compressCTable_internal(ostart, op, oend,
|
||||||
src, srcSize,
|
src, srcSize,
|
||||||
nbStreams, oldHufTable, bmi2);
|
nbStreams, oldHufTable, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Build Huffman Tree */
|
/* Build Huffman Tree */
|
||||||
huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue);
|
huffLog = HUF_optimalTableLog(huffLog, srcSize, maxSymbolValue, &table->wksps, sizeof(table->wksps), table->CTable, table->count, flags);
|
||||||
{ size_t const maxBits = HUF_buildCTable_wksp(table->CTable, table->count,
|
{ size_t const maxBits = HUF_buildCTable_wksp(table->CTable, table->count,
|
||||||
maxSymbolValue, huffLog,
|
maxSymbolValue, huffLog,
|
||||||
&table->wksps.buildCTable_wksp, sizeof(table->wksps.buildCTable_wksp));
|
&table->wksps.buildCTable_wksp, sizeof(table->wksps.buildCTable_wksp));
|
||||||
CHECK_F(maxBits);
|
CHECK_F(maxBits);
|
||||||
huffLog = (U32)maxBits;
|
huffLog = (U32)maxBits;
|
||||||
}
|
DEBUGLOG(6, "bit distribution completed (%zu symbols)", showCTableBits(table->CTable + 1, maxSymbolValue+1));
|
||||||
/* Zero unused symbols in CTable, so we can check it for validity */
|
|
||||||
{
|
|
||||||
size_t const ctableSize = HUF_CTABLE_SIZE_ST(maxSymbolValue);
|
|
||||||
size_t const unusedSize = sizeof(table->CTable) - ctableSize * sizeof(HUF_CElt);
|
|
||||||
ZSTD_memset(table->CTable + ctableSize, 0, unusedSize);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Write table description header */
|
/* Write table description header */
|
||||||
@@ -1267,7 +1419,7 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
if (oldSize <= hSize + newSize || hSize + 12 >= srcSize) {
|
if (oldSize <= hSize + newSize || hSize + 12 >= srcSize) {
|
||||||
return HUF_compressCTable_internal(ostart, op, oend,
|
return HUF_compressCTable_internal(ostart, op, oend,
|
||||||
src, srcSize,
|
src, srcSize,
|
||||||
nbStreams, oldHufTable, bmi2);
|
nbStreams, oldHufTable, flags);
|
||||||
} }
|
} }
|
||||||
|
|
||||||
/* Use the new huffman table */
|
/* Use the new huffman table */
|
||||||
@@ -1279,95 +1431,37 @@ HUF_compress_internal (void* dst, size_t dstSize,
|
|||||||
}
|
}
|
||||||
return HUF_compressCTable_internal(ostart, op, oend,
|
return HUF_compressCTable_internal(ostart, op, oend,
|
||||||
src, srcSize,
|
src, srcSize,
|
||||||
nbStreams, table->CTable, bmi2);
|
nbStreams, table->CTable, flags);
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
size_t HUF_compress1X_wksp (void* dst, size_t dstSize,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned huffLog,
|
|
||||||
void* workSpace, size_t wkspSize)
|
|
||||||
{
|
|
||||||
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
|
||||||
maxSymbolValue, huffLog, HUF_singleStream,
|
|
||||||
workSpace, wkspSize,
|
|
||||||
NULL, NULL, 0, 0 /*bmi2*/, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t HUF_compress1X_repeat (void* dst, size_t dstSize,
|
size_t HUF_compress1X_repeat (void* dst, size_t dstSize,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
unsigned maxSymbolValue, unsigned huffLog,
|
unsigned maxSymbolValue, unsigned huffLog,
|
||||||
void* workSpace, size_t wkspSize,
|
void* workSpace, size_t wkspSize,
|
||||||
HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat,
|
HUF_CElt* hufTable, HUF_repeat* repeat, int flags)
|
||||||
int bmi2, unsigned suspectUncompressible)
|
|
||||||
{
|
{
|
||||||
|
DEBUGLOG(5, "HUF_compress1X_repeat (srcSize = %zu)", srcSize);
|
||||||
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
||||||
maxSymbolValue, huffLog, HUF_singleStream,
|
maxSymbolValue, huffLog, HUF_singleStream,
|
||||||
workSpace, wkspSize, hufTable,
|
workSpace, wkspSize, hufTable,
|
||||||
repeat, preferRepeat, bmi2, suspectUncompressible);
|
repeat, flags);
|
||||||
}
|
|
||||||
|
|
||||||
/* HUF_compress4X_repeat():
|
|
||||||
* compress input using 4 streams.
|
|
||||||
* provide workspace to generate compression tables */
|
|
||||||
size_t HUF_compress4X_wksp (void* dst, size_t dstSize,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned huffLog,
|
|
||||||
void* workSpace, size_t wkspSize)
|
|
||||||
{
|
|
||||||
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
|
||||||
maxSymbolValue, huffLog, HUF_fourStreams,
|
|
||||||
workSpace, wkspSize,
|
|
||||||
NULL, NULL, 0, 0 /*bmi2*/, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* HUF_compress4X_repeat():
|
/* HUF_compress4X_repeat():
|
||||||
* compress input using 4 streams.
|
* compress input using 4 streams.
|
||||||
* consider skipping quickly
|
* consider skipping quickly
|
||||||
* re-use an existing huffman compression table */
|
* reuse an existing huffman compression table */
|
||||||
size_t HUF_compress4X_repeat (void* dst, size_t dstSize,
|
size_t HUF_compress4X_repeat (void* dst, size_t dstSize,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
unsigned maxSymbolValue, unsigned huffLog,
|
unsigned maxSymbolValue, unsigned huffLog,
|
||||||
void* workSpace, size_t wkspSize,
|
void* workSpace, size_t wkspSize,
|
||||||
HUF_CElt* hufTable, HUF_repeat* repeat, int preferRepeat, int bmi2, unsigned suspectUncompressible)
|
HUF_CElt* hufTable, HUF_repeat* repeat, int flags)
|
||||||
{
|
{
|
||||||
|
DEBUGLOG(5, "HUF_compress4X_repeat (srcSize = %zu)", srcSize);
|
||||||
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
return HUF_compress_internal(dst, dstSize, src, srcSize,
|
||||||
maxSymbolValue, huffLog, HUF_fourStreams,
|
maxSymbolValue, huffLog, HUF_fourStreams,
|
||||||
workSpace, wkspSize,
|
workSpace, wkspSize,
|
||||||
hufTable, repeat, preferRepeat, bmi2, suspectUncompressible);
|
hufTable, repeat, flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef ZSTD_NO_UNUSED_FUNCTIONS
|
|
||||||
/** HUF_buildCTable() :
|
|
||||||
* @return : maxNbBits
|
|
||||||
* Note : count is used before tree is written, so they can safely overlap
|
|
||||||
*/
|
|
||||||
size_t HUF_buildCTable (HUF_CElt* tree, const unsigned* count, unsigned maxSymbolValue, unsigned maxNbBits)
|
|
||||||
{
|
|
||||||
HUF_buildCTable_wksp_tables workspace;
|
|
||||||
return HUF_buildCTable_wksp(tree, count, maxSymbolValue, maxNbBits, &workspace, sizeof(workspace));
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t HUF_compress1X (void* dst, size_t dstSize,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned huffLog)
|
|
||||||
{
|
|
||||||
U64 workSpace[HUF_WORKSPACE_SIZE_U64];
|
|
||||||
return HUF_compress1X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t HUF_compress2 (void* dst, size_t dstSize,
|
|
||||||
const void* src, size_t srcSize,
|
|
||||||
unsigned maxSymbolValue, unsigned huffLog)
|
|
||||||
{
|
|
||||||
U64 workSpace[HUF_WORKSPACE_SIZE_U64];
|
|
||||||
return HUF_compress4X_wksp(dst, dstSize, src, srcSize, maxSymbolValue, huffLog, workSpace, sizeof(workSpace));
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t HUF_compress (void* dst, size_t maxDstSize, const void* src, size_t srcSize)
|
|
||||||
{
|
|
||||||
return HUF_compress2(dst, maxDstSize, src, srcSize, 255, HUF_TABLELOG_DEFAULT);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
1049
vendor/github.com/DataDog/zstd/huf_decompress.c
generated
vendored
1049
vendor/github.com/DataDog/zstd/huf_decompress.c
generated
vendored
File diff suppressed because it is too large
Load Diff
126
vendor/github.com/DataDog/zstd/huf_decompress_amd64.S
generated
vendored
126
vendor/github.com/DataDog/zstd/huf_decompress_amd64.S
generated
vendored
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -10,11 +10,32 @@
|
|||||||
|
|
||||||
#include "portability_macros.h"
|
#include "portability_macros.h"
|
||||||
|
|
||||||
|
#if defined(__ELF__) && defined(__GNUC__)
|
||||||
/* Stack marking
|
/* Stack marking
|
||||||
* ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
|
* ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart
|
||||||
*/
|
*/
|
||||||
#if defined(__ELF__) && defined(__GNUC__)
|
|
||||||
.section .note.GNU-stack,"",%progbits
|
.section .note.GNU-stack,"",%progbits
|
||||||
|
|
||||||
|
#if defined(__aarch64__)
|
||||||
|
/* Mark that this assembly supports BTI & PAC, because it is empty for aarch64.
|
||||||
|
* See: https://github.com/facebook/zstd/issues/3841
|
||||||
|
* See: https://gcc.godbolt.org/z/sqr5T4ffK
|
||||||
|
* See: https://lore.kernel.org/linux-arm-kernel/20200429211641.9279-8-broonie@kernel.org/
|
||||||
|
* See: https://reviews.llvm.org/D62609
|
||||||
|
*/
|
||||||
|
.pushsection .note.gnu.property, "a"
|
||||||
|
.p2align 3
|
||||||
|
.long 4 /* size of the name - "GNU\0" */
|
||||||
|
.long 0x10 /* size of descriptor */
|
||||||
|
.long 0x5 /* NT_GNU_PROPERTY_TYPE_0 */
|
||||||
|
.asciz "GNU"
|
||||||
|
.long 0xc0000000 /* pr_type - GNU_PROPERTY_AARCH64_FEATURE_1_AND */
|
||||||
|
.long 4 /* pr_datasz - 4 bytes */
|
||||||
|
.long 3 /* pr_data - GNU_PROPERTY_AARCH64_FEATURE_1_BTI | GNU_PROPERTY_AARCH64_FEATURE_1_PAC */
|
||||||
|
.p2align 3 /* pr_padding - bring everything to 8 byte alignment */
|
||||||
|
.popsection
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ZSTD_ENABLE_ASM_X86_64_BMI2
|
#if ZSTD_ENABLE_ASM_X86_64_BMI2
|
||||||
@@ -30,14 +51,14 @@
|
|||||||
* TODO: Support Windows calling convention.
|
* TODO: Support Windows calling convention.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
ZSTD_HIDE_ASM_FUNCTION(HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop)
|
ZSTD_HIDE_ASM_FUNCTION(HUF_decompress4X1_usingDTable_internal_fast_asm_loop)
|
||||||
ZSTD_HIDE_ASM_FUNCTION(HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop)
|
ZSTD_HIDE_ASM_FUNCTION(HUF_decompress4X2_usingDTable_internal_fast_asm_loop)
|
||||||
ZSTD_HIDE_ASM_FUNCTION(_HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop)
|
ZSTD_HIDE_ASM_FUNCTION(_HUF_decompress4X2_usingDTable_internal_fast_asm_loop)
|
||||||
ZSTD_HIDE_ASM_FUNCTION(_HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop)
|
ZSTD_HIDE_ASM_FUNCTION(_HUF_decompress4X1_usingDTable_internal_fast_asm_loop)
|
||||||
.global HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop
|
.global HUF_decompress4X1_usingDTable_internal_fast_asm_loop
|
||||||
.global HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop
|
.global HUF_decompress4X2_usingDTable_internal_fast_asm_loop
|
||||||
.global _HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop
|
.global _HUF_decompress4X1_usingDTable_internal_fast_asm_loop
|
||||||
.global _HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop
|
.global _HUF_decompress4X2_usingDTable_internal_fast_asm_loop
|
||||||
.text
|
.text
|
||||||
|
|
||||||
/* Sets up register mappings for clarity.
|
/* Sets up register mappings for clarity.
|
||||||
@@ -95,8 +116,9 @@ ZSTD_HIDE_ASM_FUNCTION(_HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop)
|
|||||||
/* Define both _HUF_* & HUF_* symbols because MacOS
|
/* Define both _HUF_* & HUF_* symbols because MacOS
|
||||||
* C symbols are prefixed with '_' & Linux symbols aren't.
|
* C symbols are prefixed with '_' & Linux symbols aren't.
|
||||||
*/
|
*/
|
||||||
_HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
_HUF_decompress4X1_usingDTable_internal_fast_asm_loop:
|
||||||
HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
HUF_decompress4X1_usingDTable_internal_fast_asm_loop:
|
||||||
|
ZSTD_CET_ENDBRANCH
|
||||||
/* Save all registers - even if they are callee saved for simplicity. */
|
/* Save all registers - even if they are callee saved for simplicity. */
|
||||||
push %rax
|
push %rax
|
||||||
push %rbx
|
push %rbx
|
||||||
@@ -130,7 +152,7 @@ HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
|||||||
movq 88(%rax), %bits3
|
movq 88(%rax), %bits3
|
||||||
movq 96(%rax), %dtable
|
movq 96(%rax), %dtable
|
||||||
push %rax /* argument */
|
push %rax /* argument */
|
||||||
push 104(%rax) /* ilimit */
|
push 104(%rax) /* ilowest */
|
||||||
push 112(%rax) /* oend */
|
push 112(%rax) /* oend */
|
||||||
push %olimit /* olimit space */
|
push %olimit /* olimit space */
|
||||||
|
|
||||||
@@ -155,11 +177,11 @@ HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
|||||||
shrq $2, %r15
|
shrq $2, %r15
|
||||||
|
|
||||||
movq %ip0, %rax /* rax = ip0 */
|
movq %ip0, %rax /* rax = ip0 */
|
||||||
movq 40(%rsp), %rdx /* rdx = ilimit */
|
movq 40(%rsp), %rdx /* rdx = ilowest */
|
||||||
subq %rdx, %rax /* rax = ip0 - ilimit */
|
subq %rdx, %rax /* rax = ip0 - ilowest */
|
||||||
movq %rax, %rbx /* rbx = ip0 - ilimit */
|
movq %rax, %rbx /* rbx = ip0 - ilowest */
|
||||||
|
|
||||||
/* rdx = (ip0 - ilimit) / 7 */
|
/* rdx = (ip0 - ilowest) / 7 */
|
||||||
movabsq $2635249153387078803, %rdx
|
movabsq $2635249153387078803, %rdx
|
||||||
mulq %rdx
|
mulq %rdx
|
||||||
subq %rdx, %rbx
|
subq %rdx, %rbx
|
||||||
@@ -182,9 +204,8 @@ HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
|||||||
|
|
||||||
/* If (op3 + 20 > olimit) */
|
/* If (op3 + 20 > olimit) */
|
||||||
movq %op3, %rax /* rax = op3 */
|
movq %op3, %rax /* rax = op3 */
|
||||||
addq $20, %rax /* rax = op3 + 20 */
|
cmpq %rax, %olimit /* op3 == olimit */
|
||||||
cmpq %rax, %olimit /* op3 + 20 > olimit */
|
je .L_4X1_exit
|
||||||
jb .L_4X1_exit
|
|
||||||
|
|
||||||
/* If (ip1 < ip0) go to exit */
|
/* If (ip1 < ip0) go to exit */
|
||||||
cmpq %ip0, %ip1
|
cmpq %ip0, %ip1
|
||||||
@@ -315,7 +336,7 @@ HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
|||||||
/* Restore stack (oend & olimit) */
|
/* Restore stack (oend & olimit) */
|
||||||
pop %rax /* olimit */
|
pop %rax /* olimit */
|
||||||
pop %rax /* oend */
|
pop %rax /* oend */
|
||||||
pop %rax /* ilimit */
|
pop %rax /* ilowest */
|
||||||
pop %rax /* arg */
|
pop %rax /* arg */
|
||||||
|
|
||||||
/* Save ip / op / bits */
|
/* Save ip / op / bits */
|
||||||
@@ -350,8 +371,9 @@ HUF_decompress4X1_usingDTable_internal_bmi2_asm_loop:
|
|||||||
pop %rax
|
pop %rax
|
||||||
ret
|
ret
|
||||||
|
|
||||||
_HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
_HUF_decompress4X2_usingDTable_internal_fast_asm_loop:
|
||||||
HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
HUF_decompress4X2_usingDTable_internal_fast_asm_loop:
|
||||||
|
ZSTD_CET_ENDBRANCH
|
||||||
/* Save all registers - even if they are callee saved for simplicity. */
|
/* Save all registers - even if they are callee saved for simplicity. */
|
||||||
push %rax
|
push %rax
|
||||||
push %rbx
|
push %rbx
|
||||||
@@ -385,7 +407,7 @@ HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
|||||||
movq 96(%rax), %dtable
|
movq 96(%rax), %dtable
|
||||||
push %rax /* argument */
|
push %rax /* argument */
|
||||||
push %rax /* olimit */
|
push %rax /* olimit */
|
||||||
push 104(%rax) /* ilimit */
|
push 104(%rax) /* ilowest */
|
||||||
|
|
||||||
movq 112(%rax), %rax
|
movq 112(%rax), %rax
|
||||||
push %rax /* oend3 */
|
push %rax /* oend3 */
|
||||||
@@ -412,9 +434,9 @@ HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
|||||||
|
|
||||||
/* We can consume up to 7 input bytes each iteration. */
|
/* We can consume up to 7 input bytes each iteration. */
|
||||||
movq %ip0, %rax /* rax = ip0 */
|
movq %ip0, %rax /* rax = ip0 */
|
||||||
movq 40(%rsp), %rdx /* rdx = ilimit */
|
movq 40(%rsp), %rdx /* rdx = ilowest */
|
||||||
subq %rdx, %rax /* rax = ip0 - ilimit */
|
subq %rdx, %rax /* rax = ip0 - ilowest */
|
||||||
movq %rax, %r15 /* r15 = ip0 - ilimit */
|
movq %rax, %r15 /* r15 = ip0 - ilowest */
|
||||||
|
|
||||||
/* rdx = rax / 7 */
|
/* rdx = rax / 7 */
|
||||||
movabsq $2635249153387078803, %rdx
|
movabsq $2635249153387078803, %rdx
|
||||||
@@ -424,44 +446,33 @@ HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
|||||||
addq %r15, %rdx
|
addq %r15, %rdx
|
||||||
shrq $2, %rdx
|
shrq $2, %rdx
|
||||||
|
|
||||||
/* r15 = (ip0 - ilimit) / 7 */
|
/* r15 = (ip0 - ilowest) / 7 */
|
||||||
movq %rdx, %r15
|
movq %rdx, %r15
|
||||||
|
|
||||||
movabsq $-3689348814741910323, %rdx
|
/* r15 = min(r15, min(oend0 - op0, oend1 - op1, oend2 - op2, oend3 - op3) / 10) */
|
||||||
movq 8(%rsp), %rax /* rax = oend0 */
|
movq 8(%rsp), %rax /* rax = oend0 */
|
||||||
subq %op0, %rax /* rax = oend0 - op0 */
|
subq %op0, %rax /* rax = oend0 - op0 */
|
||||||
mulq %rdx
|
movq 16(%rsp), %rdx /* rdx = oend1 */
|
||||||
shrq $3, %rdx /* rdx = rax / 10 */
|
subq %op1, %rdx /* rdx = oend1 - op1 */
|
||||||
|
|
||||||
/* r15 = min(%rdx, %r15) */
|
cmpq %rax, %rdx
|
||||||
cmpq %rdx, %r15
|
cmova %rax, %rdx /* rdx = min(%rdx, %rax) */
|
||||||
cmova %rdx, %r15
|
|
||||||
|
|
||||||
movabsq $-3689348814741910323, %rdx
|
|
||||||
movq 16(%rsp), %rax /* rax = oend1 */
|
|
||||||
subq %op1, %rax /* rax = oend1 - op1 */
|
|
||||||
mulq %rdx
|
|
||||||
shrq $3, %rdx /* rdx = rax / 10 */
|
|
||||||
|
|
||||||
/* r15 = min(%rdx, %r15) */
|
|
||||||
cmpq %rdx, %r15
|
|
||||||
cmova %rdx, %r15
|
|
||||||
|
|
||||||
movabsq $-3689348814741910323, %rdx
|
|
||||||
movq 24(%rsp), %rax /* rax = oend2 */
|
movq 24(%rsp), %rax /* rax = oend2 */
|
||||||
subq %op2, %rax /* rax = oend2 - op2 */
|
subq %op2, %rax /* rax = oend2 - op2 */
|
||||||
mulq %rdx
|
|
||||||
shrq $3, %rdx /* rdx = rax / 10 */
|
|
||||||
|
|
||||||
/* r15 = min(%rdx, %r15) */
|
cmpq %rax, %rdx
|
||||||
cmpq %rdx, %r15
|
cmova %rax, %rdx /* rdx = min(%rdx, %rax) */
|
||||||
cmova %rdx, %r15
|
|
||||||
|
|
||||||
movabsq $-3689348814741910323, %rdx
|
|
||||||
movq 32(%rsp), %rax /* rax = oend3 */
|
movq 32(%rsp), %rax /* rax = oend3 */
|
||||||
subq %op3, %rax /* rax = oend3 - op3 */
|
subq %op3, %rax /* rax = oend3 - op3 */
|
||||||
|
|
||||||
|
cmpq %rax, %rdx
|
||||||
|
cmova %rax, %rdx /* rdx = min(%rdx, %rax) */
|
||||||
|
|
||||||
|
movabsq $-3689348814741910323, %rax
|
||||||
mulq %rdx
|
mulq %rdx
|
||||||
shrq $3, %rdx /* rdx = rax / 10 */
|
shrq $3, %rdx /* rdx = rdx / 10 */
|
||||||
|
|
||||||
/* r15 = min(%rdx, %r15) */
|
/* r15 = min(%rdx, %r15) */
|
||||||
cmpq %rdx, %r15
|
cmpq %rdx, %r15
|
||||||
@@ -476,9 +487,8 @@ HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
|||||||
|
|
||||||
/* If (op3 + 10 > olimit) */
|
/* If (op3 + 10 > olimit) */
|
||||||
movq %op3, %rax /* rax = op3 */
|
movq %op3, %rax /* rax = op3 */
|
||||||
addq $10, %rax /* rax = op3 + 10 */
|
cmpq %rax, %olimit /* op3 == olimit */
|
||||||
cmpq %rax, %olimit /* op3 + 10 > olimit */
|
je .L_4X2_exit
|
||||||
jb .L_4X2_exit
|
|
||||||
|
|
||||||
/* If (ip1 < ip0) go to exit */
|
/* If (ip1 < ip0) go to exit */
|
||||||
cmpq %ip0, %ip1
|
cmpq %ip0, %ip1
|
||||||
@@ -546,7 +556,7 @@ HUF_decompress4X2_usingDTable_internal_bmi2_asm_loop:
|
|||||||
pop %rax /* oend1 */
|
pop %rax /* oend1 */
|
||||||
pop %rax /* oend2 */
|
pop %rax /* oend2 */
|
||||||
pop %rax /* oend3 */
|
pop %rax /* oend3 */
|
||||||
pop %rax /* ilimit */
|
pop %rax /* ilowest */
|
||||||
pop %rax /* olimit */
|
pop %rax /* olimit */
|
||||||
pop %rax /* arg */
|
pop %rax /* arg */
|
||||||
|
|
||||||
|
|||||||
94
vendor/github.com/DataDog/zstd/mem.h
generated
vendored
94
vendor/github.com/DataDog/zstd/mem.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -32,15 +32,6 @@ extern "C" {
|
|||||||
# include <stdlib.h> /* _byteswap_ulong */
|
# include <stdlib.h> /* _byteswap_ulong */
|
||||||
# include <intrin.h> /* _byteswap_* */
|
# include <intrin.h> /* _byteswap_* */
|
||||||
#endif
|
#endif
|
||||||
#if defined(__GNUC__)
|
|
||||||
# define MEM_STATIC static __inline __attribute__((unused))
|
|
||||||
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
|
||||||
# define MEM_STATIC static inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# define MEM_STATIC static __inline
|
|
||||||
#else
|
|
||||||
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-**************************************************************
|
/*-**************************************************************
|
||||||
* Basic Types
|
* Basic Types
|
||||||
@@ -134,21 +125,15 @@ MEM_STATIC size_t MEM_swapST(size_t in);
|
|||||||
/*-**************************************************************
|
/*-**************************************************************
|
||||||
* Memory I/O Implementation
|
* Memory I/O Implementation
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
/* MEM_FORCE_MEMORY_ACCESS :
|
/* MEM_FORCE_MEMORY_ACCESS : For accessing unaligned memory:
|
||||||
* By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
|
* Method 0 : always use `memcpy()`. Safe and portable.
|
||||||
* Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
|
* Method 1 : Use compiler extension to set unaligned access.
|
||||||
* The below switch allow to select different access method for improved performance.
|
|
||||||
* Method 0 (default) : use `memcpy()`. Safe and portable.
|
|
||||||
* Method 1 : `__packed` statement. It depends on compiler extension (i.e., not portable).
|
|
||||||
* This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
|
|
||||||
* Method 2 : direct access. This method is portable but violate C standard.
|
* Method 2 : direct access. This method is portable but violate C standard.
|
||||||
* It can generate buggy code on targets depending on alignment.
|
* It can generate buggy code on targets depending on alignment.
|
||||||
* In some circumstances, it's the only known way to get the most performance (i.e. GCC + ARMv6)
|
* Default : method 1 if supported, else method 0
|
||||||
* See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
|
|
||||||
* Prefer these methods in priority order (0 > 1 > 2)
|
|
||||||
*/
|
*/
|
||||||
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
||||||
# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
|
# ifdef __GNUC__
|
||||||
# define MEM_FORCE_MEMORY_ACCESS 1
|
# define MEM_FORCE_MEMORY_ACCESS 1
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
@@ -191,30 +176,19 @@ MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(U64*)memPtr = value; }
|
|||||||
|
|
||||||
#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
|
#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
|
||||||
|
|
||||||
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
|
typedef __attribute__((aligned(1))) U16 unalign16;
|
||||||
/* currently only defined for gcc and icc */
|
typedef __attribute__((aligned(1))) U32 unalign32;
|
||||||
#if defined(_MSC_VER) || (defined(__INTEL_COMPILER) && defined(WIN32))
|
typedef __attribute__((aligned(1))) U64 unalign64;
|
||||||
__pragma( pack(push, 1) )
|
typedef __attribute__((aligned(1))) size_t unalignArch;
|
||||||
typedef struct { U16 v; } unalign16;
|
|
||||||
typedef struct { U32 v; } unalign32;
|
|
||||||
typedef struct { U64 v; } unalign64;
|
|
||||||
typedef struct { size_t v; } unalignArch;
|
|
||||||
__pragma( pack(pop) )
|
|
||||||
#else
|
|
||||||
typedef struct { U16 v; } __attribute__((packed)) unalign16;
|
|
||||||
typedef struct { U32 v; } __attribute__((packed)) unalign32;
|
|
||||||
typedef struct { U64 v; } __attribute__((packed)) unalign64;
|
|
||||||
typedef struct { size_t v; } __attribute__((packed)) unalignArch;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign16*)ptr)->v; }
|
MEM_STATIC U16 MEM_read16(const void* ptr) { return *(const unalign16*)ptr; }
|
||||||
MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign32*)ptr)->v; }
|
MEM_STATIC U32 MEM_read32(const void* ptr) { return *(const unalign32*)ptr; }
|
||||||
MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign64*)ptr)->v; }
|
MEM_STATIC U64 MEM_read64(const void* ptr) { return *(const unalign64*)ptr; }
|
||||||
MEM_STATIC size_t MEM_readST(const void* ptr) { return ((const unalignArch*)ptr)->v; }
|
MEM_STATIC size_t MEM_readST(const void* ptr) { return *(const unalignArch*)ptr; }
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign16*)memPtr)->v = value; }
|
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(unalign16*)memPtr = value; }
|
||||||
MEM_STATIC void MEM_write32(void* memPtr, U32 value) { ((unalign32*)memPtr)->v = value; }
|
MEM_STATIC void MEM_write32(void* memPtr, U32 value) { *(unalign32*)memPtr = value; }
|
||||||
MEM_STATIC void MEM_write64(void* memPtr, U64 value) { ((unalign64*)memPtr)->v = value; }
|
MEM_STATIC void MEM_write64(void* memPtr, U64 value) { *(unalign64*)memPtr = value; }
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@@ -258,6 +232,14 @@ MEM_STATIC void MEM_write64(void* memPtr, U64 value)
|
|||||||
|
|
||||||
#endif /* MEM_FORCE_MEMORY_ACCESS */
|
#endif /* MEM_FORCE_MEMORY_ACCESS */
|
||||||
|
|
||||||
|
MEM_STATIC U32 MEM_swap32_fallback(U32 in)
|
||||||
|
{
|
||||||
|
return ((in << 24) & 0xff000000 ) |
|
||||||
|
((in << 8) & 0x00ff0000 ) |
|
||||||
|
((in >> 8) & 0x0000ff00 ) |
|
||||||
|
((in >> 24) & 0x000000ff );
|
||||||
|
}
|
||||||
|
|
||||||
MEM_STATIC U32 MEM_swap32(U32 in)
|
MEM_STATIC U32 MEM_swap32(U32 in)
|
||||||
{
|
{
|
||||||
#if defined(_MSC_VER) /* Visual Studio */
|
#if defined(_MSC_VER) /* Visual Studio */
|
||||||
@@ -266,13 +248,22 @@ MEM_STATIC U32 MEM_swap32(U32 in)
|
|||||||
|| (defined(__clang__) && __has_builtin(__builtin_bswap32))
|
|| (defined(__clang__) && __has_builtin(__builtin_bswap32))
|
||||||
return __builtin_bswap32(in);
|
return __builtin_bswap32(in);
|
||||||
#else
|
#else
|
||||||
return ((in << 24) & 0xff000000 ) |
|
return MEM_swap32_fallback(in);
|
||||||
((in << 8) & 0x00ff0000 ) |
|
|
||||||
((in >> 8) & 0x0000ff00 ) |
|
|
||||||
((in >> 24) & 0x000000ff );
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MEM_STATIC U64 MEM_swap64_fallback(U64 in)
|
||||||
|
{
|
||||||
|
return ((in << 56) & 0xff00000000000000ULL) |
|
||||||
|
((in << 40) & 0x00ff000000000000ULL) |
|
||||||
|
((in << 24) & 0x0000ff0000000000ULL) |
|
||||||
|
((in << 8) & 0x000000ff00000000ULL) |
|
||||||
|
((in >> 8) & 0x00000000ff000000ULL) |
|
||||||
|
((in >> 24) & 0x0000000000ff0000ULL) |
|
||||||
|
((in >> 40) & 0x000000000000ff00ULL) |
|
||||||
|
((in >> 56) & 0x00000000000000ffULL);
|
||||||
|
}
|
||||||
|
|
||||||
MEM_STATIC U64 MEM_swap64(U64 in)
|
MEM_STATIC U64 MEM_swap64(U64 in)
|
||||||
{
|
{
|
||||||
#if defined(_MSC_VER) /* Visual Studio */
|
#if defined(_MSC_VER) /* Visual Studio */
|
||||||
@@ -281,14 +272,7 @@ MEM_STATIC U64 MEM_swap64(U64 in)
|
|||||||
|| (defined(__clang__) && __has_builtin(__builtin_bswap64))
|
|| (defined(__clang__) && __has_builtin(__builtin_bswap64))
|
||||||
return __builtin_bswap64(in);
|
return __builtin_bswap64(in);
|
||||||
#else
|
#else
|
||||||
return ((in << 56) & 0xff00000000000000ULL) |
|
return MEM_swap64_fallback(in);
|
||||||
((in << 40) & 0x00ff000000000000ULL) |
|
|
||||||
((in << 24) & 0x0000ff0000000000ULL) |
|
|
||||||
((in << 8) & 0x000000ff00000000ULL) |
|
|
||||||
((in >> 8) & 0x00000000ff000000ULL) |
|
|
||||||
((in >> 24) & 0x0000000000ff0000ULL) |
|
|
||||||
((in >> 40) & 0x000000000000ff00ULL) |
|
|
||||||
((in >> 56) & 0x00000000000000ffULL);
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
38
vendor/github.com/DataDog/zstd/pool.c
generated
vendored
38
vendor/github.com/DataDog/zstd/pool.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
|
|
||||||
/* ====== Dependencies ======= */
|
/* ====== Dependencies ======= */
|
||||||
|
#include "allocations.h" /* ZSTD_customCalloc, ZSTD_customFree */
|
||||||
#include "zstd_deps.h" /* size_t */
|
#include "zstd_deps.h" /* size_t */
|
||||||
#include "debug.h" /* assert */
|
#include "debug.h" /* assert */
|
||||||
#include "zstd_internal.h" /* ZSTD_customMalloc, ZSTD_customFree */
|
|
||||||
#include "pool.h"
|
#include "pool.h"
|
||||||
|
|
||||||
/* ====== Compiler specifics ====== */
|
/* ====== Compiler specifics ====== */
|
||||||
@@ -97,9 +97,7 @@ static void* POOL_thread(void* opaque) {
|
|||||||
/* If the intended queue size was 0, signal after finishing job */
|
/* If the intended queue size was 0, signal after finishing job */
|
||||||
ZSTD_pthread_mutex_lock(&ctx->queueMutex);
|
ZSTD_pthread_mutex_lock(&ctx->queueMutex);
|
||||||
ctx->numThreadsBusy--;
|
ctx->numThreadsBusy--;
|
||||||
if (ctx->queueSize == 1) {
|
ZSTD_pthread_cond_signal(&ctx->queuePushCond);
|
||||||
ZSTD_pthread_cond_signal(&ctx->queuePushCond);
|
|
||||||
}
|
|
||||||
ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
|
ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
|
||||||
}
|
}
|
||||||
} /* for (;;) */
|
} /* for (;;) */
|
||||||
@@ -129,7 +127,7 @@ POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
|
|||||||
* empty and full queues.
|
* empty and full queues.
|
||||||
*/
|
*/
|
||||||
ctx->queueSize = queueSize + 1;
|
ctx->queueSize = queueSize + 1;
|
||||||
ctx->queue = (POOL_job*)ZSTD_customMalloc(ctx->queueSize * sizeof(POOL_job), customMem);
|
ctx->queue = (POOL_job*)ZSTD_customCalloc(ctx->queueSize * sizeof(POOL_job), customMem);
|
||||||
ctx->queueHead = 0;
|
ctx->queueHead = 0;
|
||||||
ctx->queueTail = 0;
|
ctx->queueTail = 0;
|
||||||
ctx->numThreadsBusy = 0;
|
ctx->numThreadsBusy = 0;
|
||||||
@@ -143,7 +141,7 @@ POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
|
|||||||
}
|
}
|
||||||
ctx->shutdown = 0;
|
ctx->shutdown = 0;
|
||||||
/* Allocate space for the thread handles */
|
/* Allocate space for the thread handles */
|
||||||
ctx->threads = (ZSTD_pthread_t*)ZSTD_customMalloc(numThreads * sizeof(ZSTD_pthread_t), customMem);
|
ctx->threads = (ZSTD_pthread_t*)ZSTD_customCalloc(numThreads * sizeof(ZSTD_pthread_t), customMem);
|
||||||
ctx->threadCapacity = 0;
|
ctx->threadCapacity = 0;
|
||||||
ctx->customMem = customMem;
|
ctx->customMem = customMem;
|
||||||
/* Check for errors */
|
/* Check for errors */
|
||||||
@@ -176,7 +174,7 @@ static void POOL_join(POOL_ctx* ctx) {
|
|||||||
/* Join all of the threads */
|
/* Join all of the threads */
|
||||||
{ size_t i;
|
{ size_t i;
|
||||||
for (i = 0; i < ctx->threadCapacity; ++i) {
|
for (i = 0; i < ctx->threadCapacity; ++i) {
|
||||||
ZSTD_pthread_join(ctx->threads[i], NULL); /* note : could fail */
|
ZSTD_pthread_join(ctx->threads[i]); /* note : could fail */
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -191,6 +189,17 @@ void POOL_free(POOL_ctx *ctx) {
|
|||||||
ZSTD_customFree(ctx, ctx->customMem);
|
ZSTD_customFree(ctx, ctx->customMem);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*! POOL_joinJobs() :
|
||||||
|
* Waits for all queued jobs to finish executing.
|
||||||
|
*/
|
||||||
|
void POOL_joinJobs(POOL_ctx* ctx) {
|
||||||
|
ZSTD_pthread_mutex_lock(&ctx->queueMutex);
|
||||||
|
while(!ctx->queueEmpty || ctx->numThreadsBusy > 0) {
|
||||||
|
ZSTD_pthread_cond_wait(&ctx->queuePushCond, &ctx->queueMutex);
|
||||||
|
}
|
||||||
|
ZSTD_pthread_mutex_unlock(&ctx->queueMutex);
|
||||||
|
}
|
||||||
|
|
||||||
void ZSTD_freeThreadPool (ZSTD_threadPool* pool) {
|
void ZSTD_freeThreadPool (ZSTD_threadPool* pool) {
|
||||||
POOL_free (pool);
|
POOL_free (pool);
|
||||||
}
|
}
|
||||||
@@ -212,10 +221,10 @@ static int POOL_resize_internal(POOL_ctx* ctx, size_t numThreads)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
/* numThreads > threadCapacity */
|
/* numThreads > threadCapacity */
|
||||||
{ ZSTD_pthread_t* const threadPool = (ZSTD_pthread_t*)ZSTD_customMalloc(numThreads * sizeof(ZSTD_pthread_t), ctx->customMem);
|
{ ZSTD_pthread_t* const threadPool = (ZSTD_pthread_t*)ZSTD_customCalloc(numThreads * sizeof(ZSTD_pthread_t), ctx->customMem);
|
||||||
if (!threadPool) return 1;
|
if (!threadPool) return 1;
|
||||||
/* replace existing thread pool */
|
/* replace existing thread pool */
|
||||||
ZSTD_memcpy(threadPool, ctx->threads, ctx->threadCapacity * sizeof(*threadPool));
|
ZSTD_memcpy(threadPool, ctx->threads, ctx->threadCapacity * sizeof(ZSTD_pthread_t));
|
||||||
ZSTD_customFree(ctx->threads, ctx->customMem);
|
ZSTD_customFree(ctx->threads, ctx->customMem);
|
||||||
ctx->threads = threadPool;
|
ctx->threads = threadPool;
|
||||||
/* Initialize additional threads */
|
/* Initialize additional threads */
|
||||||
@@ -263,7 +272,9 @@ static int isQueueFull(POOL_ctx const* ctx) {
|
|||||||
static void
|
static void
|
||||||
POOL_add_internal(POOL_ctx* ctx, POOL_function function, void *opaque)
|
POOL_add_internal(POOL_ctx* ctx, POOL_function function, void *opaque)
|
||||||
{
|
{
|
||||||
POOL_job const job = {function, opaque};
|
POOL_job job;
|
||||||
|
job.function = function;
|
||||||
|
job.opaque = opaque;
|
||||||
assert(ctx != NULL);
|
assert(ctx != NULL);
|
||||||
if (ctx->shutdown) return;
|
if (ctx->shutdown) return;
|
||||||
|
|
||||||
@@ -331,6 +342,11 @@ void POOL_free(POOL_ctx* ctx) {
|
|||||||
(void)ctx;
|
(void)ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void POOL_joinJobs(POOL_ctx* ctx){
|
||||||
|
assert(!ctx || ctx == &g_poolCtx);
|
||||||
|
(void)ctx;
|
||||||
|
}
|
||||||
|
|
||||||
int POOL_resize(POOL_ctx* ctx, size_t numThreads) {
|
int POOL_resize(POOL_ctx* ctx, size_t numThreads) {
|
||||||
(void)ctx; (void)numThreads;
|
(void)ctx; (void)numThreads;
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
10
vendor/github.com/DataDog/zstd/pool.h
generated
vendored
10
vendor/github.com/DataDog/zstd/pool.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -39,10 +39,16 @@ POOL_ctx* POOL_create_advanced(size_t numThreads, size_t queueSize,
|
|||||||
*/
|
*/
|
||||||
void POOL_free(POOL_ctx* ctx);
|
void POOL_free(POOL_ctx* ctx);
|
||||||
|
|
||||||
|
|
||||||
|
/*! POOL_joinJobs() :
|
||||||
|
* Waits for all queued jobs to finish executing.
|
||||||
|
*/
|
||||||
|
void POOL_joinJobs(POOL_ctx* ctx);
|
||||||
|
|
||||||
/*! POOL_resize() :
|
/*! POOL_resize() :
|
||||||
* Expands or shrinks pool's number of threads.
|
* Expands or shrinks pool's number of threads.
|
||||||
* This is more efficient than releasing + creating a new context,
|
* This is more efficient than releasing + creating a new context,
|
||||||
* since it tries to preserve and re-use existing threads.
|
* since it tries to preserve and reuse existing threads.
|
||||||
* `numThreads` must be at least 1.
|
* `numThreads` must be at least 1.
|
||||||
* @return : 0 when resize was successful,
|
* @return : 0 when resize was successful,
|
||||||
* !0 (typically 1) if there is an error.
|
* !0 (typically 1) if there is an error.
|
||||||
|
|||||||
27
vendor/github.com/DataDog/zstd/portability_macros.h
generated
vendored
27
vendor/github.com/DataDog/zstd/portability_macros.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
#define ZSTD_PORTABILITY_MACROS_H
|
#define ZSTD_PORTABILITY_MACROS_H
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This header file contains macro defintions to support portability.
|
* This header file contains macro definitions to support portability.
|
||||||
* This header is shared between C and ASM code, so it MUST only
|
* This header is shared between C and ASM code, so it MUST only
|
||||||
* contain macro definitions. It MUST not contain any C code.
|
* contain macro definitions. It MUST not contain any C code.
|
||||||
*
|
*
|
||||||
@@ -69,6 +69,8 @@
|
|||||||
/* Mark the internal assembly functions as hidden */
|
/* Mark the internal assembly functions as hidden */
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
# define ZSTD_HIDE_ASM_FUNCTION(func) .hidden func
|
# define ZSTD_HIDE_ASM_FUNCTION(func) .hidden func
|
||||||
|
#elif defined(__APPLE__)
|
||||||
|
# define ZSTD_HIDE_ASM_FUNCTION(func) .private_extern func
|
||||||
#else
|
#else
|
||||||
# define ZSTD_HIDE_ASM_FUNCTION(func)
|
# define ZSTD_HIDE_ASM_FUNCTION(func)
|
||||||
#endif
|
#endif
|
||||||
@@ -89,7 +91,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Only enable assembly for GNUC comptabile compilers,
|
* Only enable assembly for GNUC compatible compilers,
|
||||||
* because other platforms may not support GAS assembly syntax.
|
* because other platforms may not support GAS assembly syntax.
|
||||||
*
|
*
|
||||||
* Only enable assembly for Linux / MacOS, other platforms may
|
* Only enable assembly for Linux / MacOS, other platforms may
|
||||||
@@ -135,6 +137,25 @@
|
|||||||
# define ZSTD_ENABLE_ASM_X86_64_BMI2 0
|
# define ZSTD_ENABLE_ASM_X86_64_BMI2 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For x86 ELF targets, add .note.gnu.property section for Intel CET in
|
||||||
|
* assembly sources when CET is enabled.
|
||||||
|
*
|
||||||
|
* Additionally, any function that may be called indirectly must begin
|
||||||
|
* with ZSTD_CET_ENDBRANCH.
|
||||||
|
*/
|
||||||
|
#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) \
|
||||||
|
&& defined(__has_include)
|
||||||
|
# if __has_include(<cet.h>)
|
||||||
|
# include <cet.h>
|
||||||
|
# define ZSTD_CET_ENDBRANCH _CET_ENDBR
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_CET_ENDBRANCH
|
||||||
|
# define ZSTD_CET_ENDBRANCH
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* ZSTD_PORTABILITY_MACROS_H */
|
#endif /* ZSTD_PORTABILITY_MACROS_H */
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
88
vendor/github.com/DataDog/zstd/threading.c
generated
vendored
88
vendor/github.com/DataDog/zstd/threading.c
generated
vendored
@@ -24,8 +24,7 @@ int g_ZSTD_threading_useless_symbol;
|
|||||||
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
|
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Windows minimalist Pthread Wrapper, based on :
|
* Windows minimalist Pthread Wrapper
|
||||||
* http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@@ -36,37 +35,94 @@ int g_ZSTD_threading_useless_symbol;
|
|||||||
|
|
||||||
/* === Implementation === */
|
/* === Implementation === */
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
void* (*start_routine)(void*);
|
||||||
|
void* arg;
|
||||||
|
int initialized;
|
||||||
|
ZSTD_pthread_cond_t initialized_cond;
|
||||||
|
ZSTD_pthread_mutex_t initialized_mutex;
|
||||||
|
} ZSTD_thread_params_t;
|
||||||
|
|
||||||
static unsigned __stdcall worker(void *arg)
|
static unsigned __stdcall worker(void *arg)
|
||||||
{
|
{
|
||||||
ZSTD_pthread_t* const thread = (ZSTD_pthread_t*) arg;
|
void* (*start_routine)(void*);
|
||||||
thread->arg = thread->start_routine(thread->arg);
|
void* thread_arg;
|
||||||
|
|
||||||
|
/* Initialized thread_arg and start_routine and signal main thread that we don't need it
|
||||||
|
* to wait any longer.
|
||||||
|
*/
|
||||||
|
{
|
||||||
|
ZSTD_thread_params_t* thread_param = (ZSTD_thread_params_t*)arg;
|
||||||
|
thread_arg = thread_param->arg;
|
||||||
|
start_routine = thread_param->start_routine;
|
||||||
|
|
||||||
|
/* Signal main thread that we are running and do not depend on its memory anymore */
|
||||||
|
ZSTD_pthread_mutex_lock(&thread_param->initialized_mutex);
|
||||||
|
thread_param->initialized = 1;
|
||||||
|
ZSTD_pthread_cond_signal(&thread_param->initialized_cond);
|
||||||
|
ZSTD_pthread_mutex_unlock(&thread_param->initialized_mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
start_routine(thread_arg);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
|
int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
|
||||||
void* (*start_routine) (void*), void* arg)
|
void* (*start_routine) (void*), void* arg)
|
||||||
{
|
{
|
||||||
|
ZSTD_thread_params_t thread_param;
|
||||||
(void)unused;
|
(void)unused;
|
||||||
thread->arg = arg;
|
|
||||||
thread->start_routine = start_routine;
|
|
||||||
thread->handle = (HANDLE) _beginthreadex(NULL, 0, worker, thread, 0, NULL);
|
|
||||||
|
|
||||||
if (!thread->handle)
|
if (thread==NULL) return -1;
|
||||||
|
*thread = NULL;
|
||||||
|
|
||||||
|
thread_param.start_routine = start_routine;
|
||||||
|
thread_param.arg = arg;
|
||||||
|
thread_param.initialized = 0;
|
||||||
|
|
||||||
|
/* Setup thread initialization synchronization */
|
||||||
|
if(ZSTD_pthread_cond_init(&thread_param.initialized_cond, NULL)) {
|
||||||
|
/* Should never happen on Windows */
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
if(ZSTD_pthread_mutex_init(&thread_param.initialized_mutex, NULL)) {
|
||||||
|
/* Should never happen on Windows */
|
||||||
|
ZSTD_pthread_cond_destroy(&thread_param.initialized_cond);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Spawn thread */
|
||||||
|
*thread = (HANDLE)_beginthreadex(NULL, 0, worker, &thread_param, 0, NULL);
|
||||||
|
if (*thread==NULL) {
|
||||||
|
ZSTD_pthread_mutex_destroy(&thread_param.initialized_mutex);
|
||||||
|
ZSTD_pthread_cond_destroy(&thread_param.initialized_cond);
|
||||||
return errno;
|
return errno;
|
||||||
else
|
}
|
||||||
return 0;
|
|
||||||
|
/* Wait for thread to be initialized */
|
||||||
|
ZSTD_pthread_mutex_lock(&thread_param.initialized_mutex);
|
||||||
|
while(!thread_param.initialized) {
|
||||||
|
ZSTD_pthread_cond_wait(&thread_param.initialized_cond, &thread_param.initialized_mutex);
|
||||||
|
}
|
||||||
|
ZSTD_pthread_mutex_unlock(&thread_param.initialized_mutex);
|
||||||
|
ZSTD_pthread_mutex_destroy(&thread_param.initialized_mutex);
|
||||||
|
ZSTD_pthread_cond_destroy(&thread_param.initialized_cond);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ZSTD_pthread_join(ZSTD_pthread_t thread, void **value_ptr)
|
int ZSTD_pthread_join(ZSTD_pthread_t thread)
|
||||||
{
|
{
|
||||||
DWORD result;
|
DWORD result;
|
||||||
|
|
||||||
if (!thread.handle) return 0;
|
if (!thread) return 0;
|
||||||
|
|
||||||
|
result = WaitForSingleObject(thread, INFINITE);
|
||||||
|
CloseHandle(thread);
|
||||||
|
|
||||||
result = WaitForSingleObject(thread.handle, INFINITE);
|
|
||||||
switch (result) {
|
switch (result) {
|
||||||
case WAIT_OBJECT_0:
|
case WAIT_OBJECT_0:
|
||||||
if (value_ptr) *value_ptr = thread.arg;
|
|
||||||
return 0;
|
return 0;
|
||||||
case WAIT_ABANDONED:
|
case WAIT_ABANDONED:
|
||||||
return EINVAL;
|
return EINVAL;
|
||||||
@@ -84,6 +140,7 @@ int ZSTD_pthread_join(ZSTD_pthread_t thread, void **value_ptr)
|
|||||||
|
|
||||||
int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr)
|
int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t const* attr)
|
||||||
{
|
{
|
||||||
|
assert(mutex != NULL);
|
||||||
*mutex = (pthread_mutex_t*)ZSTD_malloc(sizeof(pthread_mutex_t));
|
*mutex = (pthread_mutex_t*)ZSTD_malloc(sizeof(pthread_mutex_t));
|
||||||
if (!*mutex)
|
if (!*mutex)
|
||||||
return 1;
|
return 1;
|
||||||
@@ -92,6 +149,7 @@ int ZSTD_pthread_mutex_init(ZSTD_pthread_mutex_t* mutex, pthread_mutexattr_t con
|
|||||||
|
|
||||||
int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex)
|
int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex)
|
||||||
{
|
{
|
||||||
|
assert(mutex != NULL);
|
||||||
if (!*mutex)
|
if (!*mutex)
|
||||||
return 0;
|
return 0;
|
||||||
{
|
{
|
||||||
@@ -103,6 +161,7 @@ int ZSTD_pthread_mutex_destroy(ZSTD_pthread_mutex_t* mutex)
|
|||||||
|
|
||||||
int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr)
|
int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const* attr)
|
||||||
{
|
{
|
||||||
|
assert(cond != NULL);
|
||||||
*cond = (pthread_cond_t*)ZSTD_malloc(sizeof(pthread_cond_t));
|
*cond = (pthread_cond_t*)ZSTD_malloc(sizeof(pthread_cond_t));
|
||||||
if (!*cond)
|
if (!*cond)
|
||||||
return 1;
|
return 1;
|
||||||
@@ -111,6 +170,7 @@ int ZSTD_pthread_cond_init(ZSTD_pthread_cond_t* cond, pthread_condattr_t const*
|
|||||||
|
|
||||||
int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond)
|
int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond)
|
||||||
{
|
{
|
||||||
|
assert(cond != NULL);
|
||||||
if (!*cond)
|
if (!*cond)
|
||||||
return 0;
|
return 0;
|
||||||
{
|
{
|
||||||
|
|||||||
15
vendor/github.com/DataDog/zstd/threading.h
generated
vendored
15
vendor/github.com/DataDog/zstd/threading.h
generated
vendored
@@ -24,8 +24,7 @@ extern "C" {
|
|||||||
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
|
#if defined(ZSTD_MULTITHREAD) && defined(_WIN32)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Windows minimalist Pthread Wrapper, based on :
|
* Windows minimalist Pthread Wrapper
|
||||||
* http://www.cse.wustl.edu/~schmidt/win32-cv-1.html
|
|
||||||
*/
|
*/
|
||||||
#ifdef WINVER
|
#ifdef WINVER
|
||||||
# undef WINVER
|
# undef WINVER
|
||||||
@@ -63,16 +62,12 @@ extern "C" {
|
|||||||
#define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a))
|
#define ZSTD_pthread_cond_broadcast(a) WakeAllConditionVariable((a))
|
||||||
|
|
||||||
/* ZSTD_pthread_create() and ZSTD_pthread_join() */
|
/* ZSTD_pthread_create() and ZSTD_pthread_join() */
|
||||||
typedef struct {
|
typedef HANDLE ZSTD_pthread_t;
|
||||||
HANDLE handle;
|
|
||||||
void* (*start_routine)(void*);
|
|
||||||
void* arg;
|
|
||||||
} ZSTD_pthread_t;
|
|
||||||
|
|
||||||
int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
|
int ZSTD_pthread_create(ZSTD_pthread_t* thread, const void* unused,
|
||||||
void* (*start_routine) (void*), void* arg);
|
void* (*start_routine) (void*), void* arg);
|
||||||
|
|
||||||
int ZSTD_pthread_join(ZSTD_pthread_t thread, void** value_ptr);
|
int ZSTD_pthread_join(ZSTD_pthread_t thread);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add here more wrappers as required
|
* add here more wrappers as required
|
||||||
@@ -100,7 +95,7 @@ int ZSTD_pthread_join(ZSTD_pthread_t thread, void** value_ptr);
|
|||||||
|
|
||||||
#define ZSTD_pthread_t pthread_t
|
#define ZSTD_pthread_t pthread_t
|
||||||
#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
|
#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
|
||||||
#define ZSTD_pthread_join(a, b) pthread_join((a),(b))
|
#define ZSTD_pthread_join(a) pthread_join((a),NULL)
|
||||||
|
|
||||||
#else /* DEBUGLEVEL >= 1 */
|
#else /* DEBUGLEVEL >= 1 */
|
||||||
|
|
||||||
@@ -125,7 +120,7 @@ int ZSTD_pthread_cond_destroy(ZSTD_pthread_cond_t* cond);
|
|||||||
|
|
||||||
#define ZSTD_pthread_t pthread_t
|
#define ZSTD_pthread_t pthread_t
|
||||||
#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
|
#define ZSTD_pthread_create(a, b, c, d) pthread_create((a), (b), (c), (d))
|
||||||
#define ZSTD_pthread_join(a, b) pthread_join((a),(b))
|
#define ZSTD_pthread_join(a) pthread_join((a),NULL)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
16
vendor/github.com/DataDog/zstd/xxhash.c
generated
vendored
16
vendor/github.com/DataDog/zstd/xxhash.c
generated
vendored
@@ -1,26 +1,20 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* xxHash - Fast Hash algorithm
|
* xxHash - Extremely Fast Hash algorithm
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet - Meta Platforms, Inc
|
||||||
*
|
|
||||||
* You can contact the author at :
|
|
||||||
* - xxHash homepage: http://www.xxhash.com
|
|
||||||
* - xxHash source repository : https://github.com/Cyan4973/xxHash
|
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
||||||
* in the COPYING file in the root directory of this source tree).
|
* in the COPYING file in the root directory of this source tree).
|
||||||
* You may select, at your option, one of the above-listed licenses.
|
* You may select, at your option, one of the above-listed licenses.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* xxhash.c instantiates functions defined in xxhash.h
|
* xxhash.c instantiates functions defined in xxhash.h
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
|
#define XXH_STATIC_LINKING_ONLY /* access advanced declarations */
|
||||||
#define XXH_IMPLEMENTATION /* access definitions */
|
#define XXH_IMPLEMENTATION /* access definitions */
|
||||||
|
|
||||||
#include "xxhash.h"
|
#include "xxhash.h"
|
||||||
|
|
||||||
|
|||||||
3326
vendor/github.com/DataDog/zstd/xxhash.h
generated
vendored
3326
vendor/github.com/DataDog/zstd/xxhash.h
generated
vendored
File diff suppressed because it is too large
Load Diff
2
vendor/github.com/DataDog/zstd/zbuff.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zbuff.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zbuff_common.c
generated
vendored
2
vendor/github.com/DataDog/zstd/zbuff_common.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zbuff_compress.c
generated
vendored
2
vendor/github.com/DataDog/zstd/zbuff_compress.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
4
vendor/github.com/DataDog/zstd/zbuff_decompress.c
generated
vendored
4
vendor/github.com/DataDog/zstd/zbuff_decompress.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -14,6 +14,8 @@
|
|||||||
/* *************************************
|
/* *************************************
|
||||||
* Dependencies
|
* Dependencies
|
||||||
***************************************/
|
***************************************/
|
||||||
|
#define ZSTD_DISABLE_DEPRECATE_WARNINGS /* suppress warning on ZSTD_initDStream_usingDict */
|
||||||
|
#include "zstd.h" /* ZSTD_CStream, ZSTD_DStream, ZSTDLIB_API */
|
||||||
#define ZBUFF_STATIC_LINKING_ONLY
|
#define ZBUFF_STATIC_LINKING_ONLY
|
||||||
#include "zbuff.h"
|
#include "zbuff.h"
|
||||||
|
|
||||||
|
|||||||
118
vendor/github.com/DataDog/zstd/zdict.c
generated
vendored
118
vendor/github.com/DataDog/zstd/zdict.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -45,7 +45,6 @@
|
|||||||
#ifndef ZDICT_STATIC_LINKING_ONLY
|
#ifndef ZDICT_STATIC_LINKING_ONLY
|
||||||
# define ZDICT_STATIC_LINKING_ONLY
|
# define ZDICT_STATIC_LINKING_ONLY
|
||||||
#endif
|
#endif
|
||||||
#define HUF_STATIC_LINKING_ONLY
|
|
||||||
|
|
||||||
#include "mem.h" /* read */
|
#include "mem.h" /* read */
|
||||||
#include "fse.h" /* FSE_normalizeCount, FSE_writeNCount */
|
#include "fse.h" /* FSE_normalizeCount, FSE_writeNCount */
|
||||||
@@ -55,6 +54,7 @@
|
|||||||
#include "zstd_compress_internal.h" /* ZSTD_loadCEntropy() */
|
#include "zstd_compress_internal.h" /* ZSTD_loadCEntropy() */
|
||||||
#include "zdict.h"
|
#include "zdict.h"
|
||||||
#include "divsufsort.h"
|
#include "divsufsort.h"
|
||||||
|
#include "bits.h" /* ZSTD_NbCommonBytes */
|
||||||
|
|
||||||
|
|
||||||
/*-*************************************
|
/*-*************************************
|
||||||
@@ -75,9 +75,9 @@ static const U32 g_selectivity_default = 9;
|
|||||||
* Console display
|
* Console display
|
||||||
***************************************/
|
***************************************/
|
||||||
#undef DISPLAY
|
#undef DISPLAY
|
||||||
#define DISPLAY(...) { fprintf(stderr, __VA_ARGS__); fflush( stderr ); }
|
#define DISPLAY(...) do { fprintf(stderr, __VA_ARGS__); fflush( stderr ); } while (0)
|
||||||
#undef DISPLAYLEVEL
|
#undef DISPLAYLEVEL
|
||||||
#define DISPLAYLEVEL(l, ...) if (notificationLevel>=l) { DISPLAY(__VA_ARGS__); } /* 0 : no display; 1: errors; 2: default; 3: details; 4: debug */
|
#define DISPLAYLEVEL(l, ...) do { if (notificationLevel>=l) { DISPLAY(__VA_ARGS__); } } while (0) /* 0 : no display; 1: errors; 2: default; 3: details; 4: debug */
|
||||||
|
|
||||||
static clock_t ZDICT_clockSpan(clock_t nPrevious) { return clock() - nPrevious; }
|
static clock_t ZDICT_clockSpan(clock_t nPrevious) { return clock() - nPrevious; }
|
||||||
|
|
||||||
@@ -131,85 +131,6 @@ size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictSize)
|
|||||||
/*-********************************************************
|
/*-********************************************************
|
||||||
* Dictionary training functions
|
* Dictionary training functions
|
||||||
**********************************************************/
|
**********************************************************/
|
||||||
static unsigned ZDICT_NbCommonBytes (size_t val)
|
|
||||||
{
|
|
||||||
if (MEM_isLittleEndian()) {
|
|
||||||
if (MEM_64bits()) {
|
|
||||||
# if defined(_MSC_VER) && defined(_WIN64)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward64(&r, (U64)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (unsigned)(__builtin_ctzll((U64)val) >> 3);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2, 0, 3, 1, 3, 1, 4, 2, 7, 0, 2, 3, 6, 1, 5, 3, 5, 1, 3, 4, 4, 2, 5, 6, 7, 7, 0, 1, 2, 3, 3, 4, 6, 2, 6, 5, 5, 3, 4, 5, 6, 7, 1, 2, 4, 6, 4, 4, 5, 7, 2, 6, 5, 7, 6, 7, 7 };
|
|
||||||
return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
|
|
||||||
# endif
|
|
||||||
} else { /* 32 bits */
|
|
||||||
# if defined(_MSC_VER)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward(&r, (U32)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (unsigned)(__builtin_ctz((U32)val) >> 3);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0, 3, 2, 2, 1, 3, 2, 0, 1, 3, 3, 1, 2, 2, 2, 2, 0, 3, 1, 2, 0, 1, 0, 1, 1 };
|
|
||||||
return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
} else { /* Big Endian CPU */
|
|
||||||
if (MEM_64bits()) {
|
|
||||||
# if defined(_MSC_VER) && defined(_WIN64)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse64(&r, val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (unsigned)(__builtin_clzll(val) >> 3);
|
|
||||||
# else
|
|
||||||
unsigned r;
|
|
||||||
const unsigned n32 = sizeof(size_t)*4; /* calculate this way due to compiler complaining in 32-bits mode */
|
|
||||||
if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
|
|
||||||
if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
|
|
||||||
r += (!val);
|
|
||||||
return r;
|
|
||||||
# endif
|
|
||||||
} else { /* 32 bits */
|
|
||||||
# if defined(_MSC_VER)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse(&r, (unsigned long)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (unsigned)(__builtin_clz((U32)val) >> 3);
|
|
||||||
# else
|
|
||||||
unsigned r;
|
|
||||||
if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
|
|
||||||
r += (!val);
|
|
||||||
return r;
|
|
||||||
# endif
|
|
||||||
} }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*! ZDICT_count() :
|
/*! ZDICT_count() :
|
||||||
Count the nb of common bytes between 2 pointers.
|
Count the nb of common bytes between 2 pointers.
|
||||||
Note : this function presumes end of buffer followed by noisy guard band.
|
Note : this function presumes end of buffer followed by noisy guard band.
|
||||||
@@ -224,7 +145,7 @@ static size_t ZDICT_count(const void* pIn, const void* pMatch)
|
|||||||
pMatch = (const char*)pMatch+sizeof(size_t);
|
pMatch = (const char*)pMatch+sizeof(size_t);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
pIn = (const char*)pIn+ZDICT_NbCommonBytes(diff);
|
pIn = (const char*)pIn+ZSTD_NbCommonBytes(diff);
|
||||||
return (size_t)((const char*)pIn - pStart);
|
return (size_t)((const char*)pIn - pStart);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -452,7 +373,7 @@ static U32 ZDICT_tryMerge(dictItem* table, dictItem elt, U32 eltNbToSkip, const
|
|||||||
elt = table[u];
|
elt = table[u];
|
||||||
/* sort : improve rank */
|
/* sort : improve rank */
|
||||||
while ((u>1) && (table[u-1].savings < elt.savings))
|
while ((u>1) && (table[u-1].savings < elt.savings))
|
||||||
table[u] = table[u-1], u--;
|
table[u] = table[u-1], u--;
|
||||||
table[u] = elt;
|
table[u] = elt;
|
||||||
return u;
|
return u;
|
||||||
} }
|
} }
|
||||||
@@ -557,10 +478,16 @@ static size_t ZDICT_trainBuffer_legacy(dictItem* dictList, U32 dictListSize,
|
|||||||
clock_t const refreshRate = CLOCKS_PER_SEC * 3 / 10;
|
clock_t const refreshRate = CLOCKS_PER_SEC * 3 / 10;
|
||||||
|
|
||||||
# undef DISPLAYUPDATE
|
# undef DISPLAYUPDATE
|
||||||
# define DISPLAYUPDATE(l, ...) if (notificationLevel>=l) { \
|
# define DISPLAYUPDATE(l, ...) \
|
||||||
if (ZDICT_clockSpan(displayClock) > refreshRate) \
|
do { \
|
||||||
{ displayClock = clock(); DISPLAY(__VA_ARGS__); \
|
if (notificationLevel>=l) { \
|
||||||
if (notificationLevel>=4) fflush(stderr); } }
|
if (ZDICT_clockSpan(displayClock) > refreshRate) { \
|
||||||
|
displayClock = clock(); \
|
||||||
|
DISPLAY(__VA_ARGS__); \
|
||||||
|
} \
|
||||||
|
if (notificationLevel>=4) fflush(stderr); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
DISPLAYLEVEL(2, "\r%70s\r", ""); /* clean display line */
|
DISPLAYLEVEL(2, "\r%70s\r", ""); /* clean display line */
|
||||||
@@ -603,7 +530,7 @@ static size_t ZDICT_trainBuffer_legacy(dictItem* dictList, U32 dictListSize,
|
|||||||
if (solution.length==0) { cursor++; continue; }
|
if (solution.length==0) { cursor++; continue; }
|
||||||
ZDICT_insertDictItem(dictList, dictListSize, solution, buffer);
|
ZDICT_insertDictItem(dictList, dictListSize, solution, buffer);
|
||||||
cursor += solution.length;
|
cursor += solution.length;
|
||||||
DISPLAYUPDATE(2, "\r%4.2f %% \r", (double)cursor / bufferSize * 100);
|
DISPLAYUPDATE(2, "\r%4.2f %% \r", (double)cursor / (double)bufferSize * 100.0);
|
||||||
} }
|
} }
|
||||||
|
|
||||||
_cleanup:
|
_cleanup:
|
||||||
@@ -646,11 +573,11 @@ static void ZDICT_countEStats(EStats_ress_t esr, const ZSTD_parameters* params,
|
|||||||
size_t cSize;
|
size_t cSize;
|
||||||
|
|
||||||
if (srcSize > blockSizeMax) srcSize = blockSizeMax; /* protection vs large samples */
|
if (srcSize > blockSizeMax) srcSize = blockSizeMax; /* protection vs large samples */
|
||||||
{ size_t const errorCode = ZSTD_compressBegin_usingCDict(esr.zc, esr.dict);
|
{ size_t const errorCode = ZSTD_compressBegin_usingCDict_deprecated(esr.zc, esr.dict);
|
||||||
if (ZSTD_isError(errorCode)) { DISPLAYLEVEL(1, "warning : ZSTD_compressBegin_usingCDict failed \n"); return; }
|
if (ZSTD_isError(errorCode)) { DISPLAYLEVEL(1, "warning : ZSTD_compressBegin_usingCDict failed \n"); return; }
|
||||||
|
|
||||||
}
|
}
|
||||||
cSize = ZSTD_compressBlock(esr.zc, esr.workPlace, ZSTD_BLOCKSIZE_MAX, src, srcSize);
|
cSize = ZSTD_compressBlock_deprecated(esr.zc, esr.workPlace, ZSTD_BLOCKSIZE_MAX, src, srcSize);
|
||||||
if (ZSTD_isError(cSize)) { DISPLAYLEVEL(3, "warning : could not compress sample size %u \n", (unsigned)srcSize); return; }
|
if (ZSTD_isError(cSize)) { DISPLAYLEVEL(3, "warning : could not compress sample size %u \n", (unsigned)srcSize); return; }
|
||||||
|
|
||||||
if (cSize) { /* if == 0; block is not compressible */
|
if (cSize) { /* if == 0; block is not compressible */
|
||||||
@@ -755,6 +682,7 @@ static size_t ZDICT_analyzeEntropy(void* dstBuffer, size_t maxDstSize,
|
|||||||
size_t const totalSrcSize = ZDICT_totalSampleSize(fileSizes, nbFiles);
|
size_t const totalSrcSize = ZDICT_totalSampleSize(fileSizes, nbFiles);
|
||||||
size_t const averageSampleSize = totalSrcSize / (nbFiles + !nbFiles);
|
size_t const averageSampleSize = totalSrcSize / (nbFiles + !nbFiles);
|
||||||
BYTE* dstPtr = (BYTE*)dstBuffer;
|
BYTE* dstPtr = (BYTE*)dstBuffer;
|
||||||
|
U32 wksp[HUF_CTABLE_WORKSPACE_SIZE_U32];
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
DEBUGLOG(4, "ZDICT_analyzeEntropy");
|
DEBUGLOG(4, "ZDICT_analyzeEntropy");
|
||||||
@@ -795,7 +723,7 @@ static size_t ZDICT_analyzeEntropy(void* dstBuffer, size_t maxDstSize,
|
|||||||
} }
|
} }
|
||||||
|
|
||||||
/* analyze, build stats, starting with literals */
|
/* analyze, build stats, starting with literals */
|
||||||
{ size_t maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
|
{ size_t maxNbBits = HUF_buildCTable_wksp(hufTable, countLit, 255, huffLog, wksp, sizeof(wksp));
|
||||||
if (HUF_isError(maxNbBits)) {
|
if (HUF_isError(maxNbBits)) {
|
||||||
eSize = maxNbBits;
|
eSize = maxNbBits;
|
||||||
DISPLAYLEVEL(1, " HUF_buildCTable error \n");
|
DISPLAYLEVEL(1, " HUF_buildCTable error \n");
|
||||||
@@ -804,7 +732,7 @@ static size_t ZDICT_analyzeEntropy(void* dstBuffer, size_t maxDstSize,
|
|||||||
if (maxNbBits==8) { /* not compressible : will fail on HUF_writeCTable() */
|
if (maxNbBits==8) { /* not compressible : will fail on HUF_writeCTable() */
|
||||||
DISPLAYLEVEL(2, "warning : pathological dataset : literals are not compressible : samples are noisy or too regular \n");
|
DISPLAYLEVEL(2, "warning : pathological dataset : literals are not compressible : samples are noisy or too regular \n");
|
||||||
ZDICT_flatLit(countLit); /* replace distribution by a fake "mostly flat but still compressible" distribution, that HUF_writeCTable() can encode */
|
ZDICT_flatLit(countLit); /* replace distribution by a fake "mostly flat but still compressible" distribution, that HUF_writeCTable() can encode */
|
||||||
maxNbBits = HUF_buildCTable (hufTable, countLit, 255, huffLog);
|
maxNbBits = HUF_buildCTable_wksp(hufTable, countLit, 255, huffLog, wksp, sizeof(wksp));
|
||||||
assert(maxNbBits==9);
|
assert(maxNbBits==9);
|
||||||
}
|
}
|
||||||
huffLog = (U32)maxNbBits;
|
huffLog = (U32)maxNbBits;
|
||||||
@@ -845,7 +773,7 @@ static size_t ZDICT_analyzeEntropy(void* dstBuffer, size_t maxDstSize,
|
|||||||
llLog = (U32)errorCode;
|
llLog = (U32)errorCode;
|
||||||
|
|
||||||
/* write result to buffer */
|
/* write result to buffer */
|
||||||
{ size_t const hhSize = HUF_writeCTable(dstPtr, maxDstSize, hufTable, 255, huffLog);
|
{ size_t const hhSize = HUF_writeCTable_wksp(dstPtr, maxDstSize, hufTable, 255, huffLog, wksp, sizeof(wksp));
|
||||||
if (HUF_isError(hhSize)) {
|
if (HUF_isError(hhSize)) {
|
||||||
eSize = hhSize;
|
eSize = hhSize;
|
||||||
DISPLAYLEVEL(1, "HUF_writeCTable error \n");
|
DISPLAYLEVEL(1, "HUF_writeCTable error \n");
|
||||||
|
|||||||
84
vendor/github.com/DataDog/zstd/zdict.h
generated
vendored
84
vendor/github.com/DataDog/zstd/zdict.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -9,32 +9,43 @@
|
|||||||
* You may select, at your option, one of the above-listed licenses.
|
* You may select, at your option, one of the above-listed licenses.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef DICTBUILDER_H_001
|
|
||||||
#define DICTBUILDER_H_001
|
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_ZDICT_H
|
||||||
|
#define ZSTD_ZDICT_H
|
||||||
|
|
||||||
/*====== Dependencies ======*/
|
/*====== Dependencies ======*/
|
||||||
#include <stddef.h> /* size_t */
|
#include <stddef.h> /* size_t */
|
||||||
|
|
||||||
|
|
||||||
/* ===== ZDICTLIB_API : control library symbols visibility ===== */
|
/* ===== ZDICTLIB_API : control library symbols visibility ===== */
|
||||||
#ifndef ZDICTLIB_VISIBILITY
|
#ifndef ZDICTLIB_VISIBLE
|
||||||
# if defined(__GNUC__) && (__GNUC__ >= 4)
|
/* Backwards compatibility with old macro name */
|
||||||
# define ZDICTLIB_VISIBILITY __attribute__ ((visibility ("default")))
|
# ifdef ZDICTLIB_VISIBILITY
|
||||||
|
# define ZDICTLIB_VISIBLE ZDICTLIB_VISIBILITY
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
|
||||||
|
# define ZDICTLIB_VISIBLE __attribute__ ((visibility ("default")))
|
||||||
# else
|
# else
|
||||||
# define ZDICTLIB_VISIBILITY
|
# define ZDICTLIB_VISIBLE
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZDICTLIB_HIDDEN
|
||||||
|
# if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
|
||||||
|
# define ZDICTLIB_HIDDEN __attribute__ ((visibility ("hidden")))
|
||||||
|
# else
|
||||||
|
# define ZDICTLIB_HIDDEN
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
|
#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
|
||||||
# define ZDICTLIB_API __declspec(dllexport) ZDICTLIB_VISIBILITY
|
# define ZDICTLIB_API __declspec(dllexport) ZDICTLIB_VISIBLE
|
||||||
#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
|
#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
|
||||||
# define ZDICTLIB_API __declspec(dllimport) ZDICTLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
|
# define ZDICTLIB_API __declspec(dllimport) ZDICTLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
|
||||||
#else
|
#else
|
||||||
# define ZDICTLIB_API ZDICTLIB_VISIBILITY
|
# define ZDICTLIB_API ZDICTLIB_VISIBLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
@@ -111,8 +122,8 @@ extern "C" {
|
|||||||
* The zstd CLI defaults to a 110KB dictionary. You likely don't need a
|
* The zstd CLI defaults to a 110KB dictionary. You likely don't need a
|
||||||
* dictionary larger than that. But, most use cases can get away with a
|
* dictionary larger than that. But, most use cases can get away with a
|
||||||
* smaller dictionary. The advanced dictionary builders can automatically
|
* smaller dictionary. The advanced dictionary builders can automatically
|
||||||
* shrink the dictionary for you, and select a the smallest size that
|
* shrink the dictionary for you, and select the smallest size that doesn't
|
||||||
* doesn't hurt compression ratio too much. See the `shrinkDict` parameter.
|
* hurt compression ratio too much. See the `shrinkDict` parameter.
|
||||||
* A smaller dictionary can save memory, and potentially speed up
|
* A smaller dictionary can save memory, and potentially speed up
|
||||||
* compression.
|
* compression.
|
||||||
*
|
*
|
||||||
@@ -202,9 +213,9 @@ ZDICTLIB_API size_t ZDICT_trainFromBuffer(void* dictBuffer, size_t dictBufferCap
|
|||||||
const size_t* samplesSizes, unsigned nbSamples);
|
const size_t* samplesSizes, unsigned nbSamples);
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int compressionLevel; /*< optimize for a specific zstd compression level; 0 means default */
|
int compressionLevel; /**< optimize for a specific zstd compression level; 0 means default */
|
||||||
unsigned notificationLevel; /*< Write log to stderr; 0 = none (default); 1 = errors; 2 = progression; 3 = details; 4 = debug; */
|
unsigned notificationLevel; /**< Write log to stderr; 0 = none (default); 1 = errors; 2 = progression; 3 = details; 4 = debug; */
|
||||||
unsigned dictID; /*< force dictID value; 0 means auto mode (32-bits random value)
|
unsigned dictID; /**< force dictID value; 0 means auto mode (32-bits random value)
|
||||||
* NOTE: The zstd format reserves some dictionary IDs for future use.
|
* NOTE: The zstd format reserves some dictionary IDs for future use.
|
||||||
* You may use them in private settings, but be warned that they
|
* You may use them in private settings, but be warned that they
|
||||||
* may be used by zstd in a public dictionary registry in the future.
|
* may be used by zstd in a public dictionary registry in the future.
|
||||||
@@ -261,9 +272,21 @@ ZDICTLIB_API size_t ZDICT_getDictHeaderSize(const void* dictBuffer, size_t dictS
|
|||||||
ZDICTLIB_API unsigned ZDICT_isError(size_t errorCode);
|
ZDICTLIB_API unsigned ZDICT_isError(size_t errorCode);
|
||||||
ZDICTLIB_API const char* ZDICT_getErrorName(size_t errorCode);
|
ZDICTLIB_API const char* ZDICT_getErrorName(size_t errorCode);
|
||||||
|
|
||||||
|
#endif /* ZSTD_ZDICT_H */
|
||||||
|
|
||||||
|
#if defined(ZDICT_STATIC_LINKING_ONLY) && !defined(ZSTD_ZDICT_H_STATIC)
|
||||||
|
#define ZSTD_ZDICT_H_STATIC
|
||||||
|
|
||||||
#ifdef ZDICT_STATIC_LINKING_ONLY
|
/* This can be overridden externally to hide static symbols. */
|
||||||
|
#ifndef ZDICTLIB_STATIC_API
|
||||||
|
# if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
|
||||||
|
# define ZDICTLIB_STATIC_API __declspec(dllexport) ZDICTLIB_VISIBLE
|
||||||
|
# elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
|
||||||
|
# define ZDICTLIB_STATIC_API __declspec(dllimport) ZDICTLIB_VISIBLE
|
||||||
|
# else
|
||||||
|
# define ZDICTLIB_STATIC_API ZDICTLIB_VISIBLE
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/* ====================================================================================
|
/* ====================================================================================
|
||||||
* The definitions in this section are considered experimental.
|
* The definitions in this section are considered experimental.
|
||||||
@@ -319,7 +342,7 @@ typedef struct {
|
|||||||
* In general, it's recommended to provide a few thousands samples, though this can vary a lot.
|
* In general, it's recommended to provide a few thousands samples, though this can vary a lot.
|
||||||
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
||||||
*/
|
*/
|
||||||
ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
|
ZDICTLIB_STATIC_API size_t ZDICT_trainFromBuffer_cover(
|
||||||
void *dictBuffer, size_t dictBufferCapacity,
|
void *dictBuffer, size_t dictBufferCapacity,
|
||||||
const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
|
const void *samplesBuffer, const size_t *samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_cover_params_t parameters);
|
ZDICT_cover_params_t parameters);
|
||||||
@@ -341,7 +364,7 @@ ZDICTLIB_API size_t ZDICT_trainFromBuffer_cover(
|
|||||||
* See ZDICT_trainFromBuffer() for details on failure modes.
|
* See ZDICT_trainFromBuffer() for details on failure modes.
|
||||||
* Note: ZDICT_optimizeTrainFromBuffer_cover() requires about 8 bytes of memory for each input byte and additionally another 5 bytes of memory for each byte of memory for each thread.
|
* Note: ZDICT_optimizeTrainFromBuffer_cover() requires about 8 bytes of memory for each input byte and additionally another 5 bytes of memory for each byte of memory for each thread.
|
||||||
*/
|
*/
|
||||||
ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
|
ZDICTLIB_STATIC_API size_t ZDICT_optimizeTrainFromBuffer_cover(
|
||||||
void* dictBuffer, size_t dictBufferCapacity,
|
void* dictBuffer, size_t dictBufferCapacity,
|
||||||
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
|
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_cover_params_t* parameters);
|
ZDICT_cover_params_t* parameters);
|
||||||
@@ -362,7 +385,7 @@ ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_cover(
|
|||||||
* In general, it's recommended to provide a few thousands samples, though this can vary a lot.
|
* In general, it's recommended to provide a few thousands samples, though this can vary a lot.
|
||||||
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
||||||
*/
|
*/
|
||||||
ZDICTLIB_API size_t ZDICT_trainFromBuffer_fastCover(void *dictBuffer,
|
ZDICTLIB_STATIC_API size_t ZDICT_trainFromBuffer_fastCover(void *dictBuffer,
|
||||||
size_t dictBufferCapacity, const void *samplesBuffer,
|
size_t dictBufferCapacity, const void *samplesBuffer,
|
||||||
const size_t *samplesSizes, unsigned nbSamples,
|
const size_t *samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_fastCover_params_t parameters);
|
ZDICT_fastCover_params_t parameters);
|
||||||
@@ -385,7 +408,7 @@ ZDICTLIB_API size_t ZDICT_trainFromBuffer_fastCover(void *dictBuffer,
|
|||||||
* See ZDICT_trainFromBuffer() for details on failure modes.
|
* See ZDICT_trainFromBuffer() for details on failure modes.
|
||||||
* Note: ZDICT_optimizeTrainFromBuffer_fastCover() requires about 6 * 2^f bytes of memory for each thread.
|
* Note: ZDICT_optimizeTrainFromBuffer_fastCover() requires about 6 * 2^f bytes of memory for each thread.
|
||||||
*/
|
*/
|
||||||
ZDICTLIB_API size_t ZDICT_optimizeTrainFromBuffer_fastCover(void* dictBuffer,
|
ZDICTLIB_STATIC_API size_t ZDICT_optimizeTrainFromBuffer_fastCover(void* dictBuffer,
|
||||||
size_t dictBufferCapacity, const void* samplesBuffer,
|
size_t dictBufferCapacity, const void* samplesBuffer,
|
||||||
const size_t* samplesSizes, unsigned nbSamples,
|
const size_t* samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_fastCover_params_t* parameters);
|
ZDICT_fastCover_params_t* parameters);
|
||||||
@@ -410,7 +433,7 @@ typedef struct {
|
|||||||
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
* It's recommended that total size of all samples be about ~x100 times the target size of dictionary.
|
||||||
* Note: ZDICT_trainFromBuffer_legacy() will send notifications into stderr if instructed to, using notificationLevel>0.
|
* Note: ZDICT_trainFromBuffer_legacy() will send notifications into stderr if instructed to, using notificationLevel>0.
|
||||||
*/
|
*/
|
||||||
ZDICTLIB_API size_t ZDICT_trainFromBuffer_legacy(
|
ZDICTLIB_STATIC_API size_t ZDICT_trainFromBuffer_legacy(
|
||||||
void* dictBuffer, size_t dictBufferCapacity,
|
void* dictBuffer, size_t dictBufferCapacity,
|
||||||
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
|
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples,
|
||||||
ZDICT_legacy_params_t parameters);
|
ZDICT_legacy_params_t parameters);
|
||||||
@@ -422,34 +445,33 @@ ZDICTLIB_API size_t ZDICT_trainFromBuffer_legacy(
|
|||||||
or _CRT_SECURE_NO_WARNINGS in Visual.
|
or _CRT_SECURE_NO_WARNINGS in Visual.
|
||||||
Otherwise, it's also possible to manually define ZDICT_DISABLE_DEPRECATE_WARNINGS */
|
Otherwise, it's also possible to manually define ZDICT_DISABLE_DEPRECATE_WARNINGS */
|
||||||
#ifdef ZDICT_DISABLE_DEPRECATE_WARNINGS
|
#ifdef ZDICT_DISABLE_DEPRECATE_WARNINGS
|
||||||
# define ZDICT_DEPRECATED(message) ZDICTLIB_API /* disable deprecation warnings */
|
# define ZDICT_DEPRECATED(message) /* disable deprecation warnings */
|
||||||
#else
|
#else
|
||||||
# define ZDICT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
|
# define ZDICT_GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
|
||||||
# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
|
# if defined (__cplusplus) && (__cplusplus >= 201402) /* C++14 or greater */
|
||||||
# define ZDICT_DEPRECATED(message) [[deprecated(message)]] ZDICTLIB_API
|
# define ZDICT_DEPRECATED(message) [[deprecated(message)]]
|
||||||
# elif defined(__clang__) || (ZDICT_GCC_VERSION >= 405)
|
# elif defined(__clang__) || (ZDICT_GCC_VERSION >= 405)
|
||||||
# define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated(message)))
|
# define ZDICT_DEPRECATED(message) __attribute__((deprecated(message)))
|
||||||
# elif (ZDICT_GCC_VERSION >= 301)
|
# elif (ZDICT_GCC_VERSION >= 301)
|
||||||
# define ZDICT_DEPRECATED(message) ZDICTLIB_API __attribute__((deprecated))
|
# define ZDICT_DEPRECATED(message) __attribute__((deprecated))
|
||||||
# elif defined(_MSC_VER)
|
# elif defined(_MSC_VER)
|
||||||
# define ZDICT_DEPRECATED(message) ZDICTLIB_API __declspec(deprecated(message))
|
# define ZDICT_DEPRECATED(message) __declspec(deprecated(message))
|
||||||
# else
|
# else
|
||||||
# pragma message("WARNING: You need to implement ZDICT_DEPRECATED for this compiler")
|
# pragma message("WARNING: You need to implement ZDICT_DEPRECATED for this compiler")
|
||||||
# define ZDICT_DEPRECATED(message) ZDICTLIB_API
|
# define ZDICT_DEPRECATED(message)
|
||||||
# endif
|
# endif
|
||||||
#endif /* ZDICT_DISABLE_DEPRECATE_WARNINGS */
|
#endif /* ZDICT_DISABLE_DEPRECATE_WARNINGS */
|
||||||
|
|
||||||
ZDICT_DEPRECATED("use ZDICT_finalizeDictionary() instead")
|
ZDICT_DEPRECATED("use ZDICT_finalizeDictionary() instead")
|
||||||
|
ZDICTLIB_STATIC_API
|
||||||
size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
|
size_t ZDICT_addEntropyTablesFromBuffer(void* dictBuffer, size_t dictContentSize, size_t dictBufferCapacity,
|
||||||
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples);
|
const void* samplesBuffer, const size_t* samplesSizes, unsigned nbSamples);
|
||||||
|
|
||||||
|
|
||||||
#endif /* ZDICT_STATIC_LINKING_ONLY */
|
#endif /* ZSTD_ZDICT_H_STATIC */
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* DICTBUILDER_H_001 */
|
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
36
vendor/github.com/DataDog/zstd/zstd.go
generated
vendored
36
vendor/github.com/DataDog/zstd/zstd.go
generated
vendored
@@ -4,7 +4,7 @@ package zstd
|
|||||||
// support decoding of "legacy" zstd payloads from versions [0.4, 0.8], matching the
|
// support decoding of "legacy" zstd payloads from versions [0.4, 0.8], matching the
|
||||||
// default configuration of the zstd command line tool:
|
// default configuration of the zstd command line tool:
|
||||||
// https://github.com/facebook/zstd/blob/dev/programs/README.md
|
// https://github.com/facebook/zstd/blob/dev/programs/README.md
|
||||||
#cgo CFLAGS: -DZSTD_LEGACY_SUPPORT=4
|
#cgo CFLAGS: -DZSTD_LEGACY_SUPPORT=4 -DZSTD_MULTITHREAD=1
|
||||||
|
|
||||||
#include "zstd.h"
|
#include "zstd.h"
|
||||||
*/
|
*/
|
||||||
@@ -36,7 +36,7 @@ const (
|
|||||||
// decompressed, err := zstd.Decompress(dst, src)
|
// decompressed, err := zstd.Decompress(dst, src)
|
||||||
decompressSizeBufferLimit = 1000 * 1000
|
decompressSizeBufferLimit = 1000 * 1000
|
||||||
|
|
||||||
zstdFrameHeaderSizeMax = 18 // From zstd.h. Since it's experimental API, hardcoding it
|
zstdFrameHeaderSizeMin = 2 // From zstd.h. Since it's experimental API, hardcoding it
|
||||||
)
|
)
|
||||||
|
|
||||||
// CompressBound returns the worst case size needed for a destination buffer,
|
// CompressBound returns the worst case size needed for a destination buffer,
|
||||||
@@ -60,18 +60,21 @@ func cCompressBound(srcSize int) int {
|
|||||||
// decompressSizeHint tries to give a hint on how much of the output buffer size we should have
|
// decompressSizeHint tries to give a hint on how much of the output buffer size we should have
|
||||||
// based on zstd frame descriptors. To prevent DOS from maliciously-created payloads, limit the size
|
// based on zstd frame descriptors. To prevent DOS from maliciously-created payloads, limit the size
|
||||||
func decompressSizeHint(src []byte) int {
|
func decompressSizeHint(src []byte) int {
|
||||||
// 1 MB or 10x input size
|
// 1 MB or 50x input size
|
||||||
upperBound := 10 * len(src)
|
upperBound := 50 * len(src)
|
||||||
if upperBound < decompressSizeBufferLimit {
|
if upperBound < decompressSizeBufferLimit {
|
||||||
upperBound = decompressSizeBufferLimit
|
upperBound = decompressSizeBufferLimit
|
||||||
}
|
}
|
||||||
|
|
||||||
hint := upperBound
|
hint := upperBound
|
||||||
if len(src) >= zstdFrameHeaderSizeMax {
|
if len(src) >= zstdFrameHeaderSizeMin {
|
||||||
hint = int(C.ZSTD_getFrameContentSize(unsafe.Pointer(&src[0]), C.size_t(len(src))))
|
hint = int(C.ZSTD_getFrameContentSize(unsafe.Pointer(&src[0]), C.size_t(len(src))))
|
||||||
if hint < 0 { // On error, just use upperBound
|
if hint < 0 { // On error, just use upperBound
|
||||||
hint = upperBound
|
hint = upperBound
|
||||||
}
|
}
|
||||||
|
if hint == 0 { // When compressing the empty slice, we need an output of at least 1 to pass down to the C lib
|
||||||
|
hint = 1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Take the minimum of both
|
// Take the minimum of both
|
||||||
@@ -140,12 +143,7 @@ func Decompress(dst, src []byte) ([]byte, error) {
|
|||||||
dst = make([]byte, bound)
|
dst = make([]byte, bound)
|
||||||
}
|
}
|
||||||
|
|
||||||
written := int(C.ZSTD_decompress(
|
written, err := DecompressInto(dst, src)
|
||||||
unsafe.Pointer(&dst[0]),
|
|
||||||
C.size_t(len(dst)),
|
|
||||||
unsafe.Pointer(&src[0]),
|
|
||||||
C.size_t(len(src))))
|
|
||||||
err := getError(written)
|
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return dst[:written], nil
|
return dst[:written], nil
|
||||||
}
|
}
|
||||||
@@ -158,3 +156,19 @@ func Decompress(dst, src []byte) ([]byte, error) {
|
|||||||
defer r.Close()
|
defer r.Close()
|
||||||
return ioutil.ReadAll(r)
|
return ioutil.ReadAll(r)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// DecompressInto decompresses src into dst. Unlike Decompress, DecompressInto
|
||||||
|
// requires that dst be sufficiently large to hold the decompressed payload.
|
||||||
|
// DecompressInto may be used when the caller knows the size of the decompressed
|
||||||
|
// payload before attempting decompression.
|
||||||
|
//
|
||||||
|
// It returns the number of bytes copied and an error if any is encountered. If
|
||||||
|
// dst is too small, DecompressInto errors.
|
||||||
|
func DecompressInto(dst, src []byte) (int, error) {
|
||||||
|
written := int(C.ZSTD_decompress(
|
||||||
|
unsafe.Pointer(&dst[0]),
|
||||||
|
C.size_t(len(dst)),
|
||||||
|
unsafe.Pointer(&src[0]),
|
||||||
|
C.size_t(len(src))))
|
||||||
|
return written, getError(written)
|
||||||
|
}
|
||||||
|
|||||||
868
vendor/github.com/DataDog/zstd/zstd.h
generated
vendored
868
vendor/github.com/DataDog/zstd/zstd.h
generated
vendored
File diff suppressed because it is too large
Load Diff
6
vendor/github.com/DataDog/zstd/zstd_bulk.go
generated
vendored
6
vendor/github.com/DataDog/zstd/zstd_bulk.go
generated
vendored
@@ -112,12 +112,12 @@ func (p *BulkProcessor) Decompress(dst, src []byte) ([]byte, error) {
|
|||||||
|
|
||||||
contentSize := decompressSizeHint(src)
|
contentSize := decompressSizeHint(src)
|
||||||
if cap(dst) >= contentSize {
|
if cap(dst) >= contentSize {
|
||||||
dst = dst[0:contentSize]
|
dst = dst[0:cap(dst)]
|
||||||
} else {
|
} else {
|
||||||
dst = make([]byte, contentSize)
|
dst = make([]byte, contentSize)
|
||||||
}
|
}
|
||||||
|
|
||||||
if contentSize == 0 {
|
if len(dst) == 0 {
|
||||||
return dst, nil
|
return dst, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ func (p *BulkProcessor) Decompress(dst, src []byte) ([]byte, error) {
|
|||||||
cWritten := C.ZSTD_decompress_usingDDict(
|
cWritten := C.ZSTD_decompress_usingDDict(
|
||||||
dctx,
|
dctx,
|
||||||
unsafe.Pointer(&dst[0]),
|
unsafe.Pointer(&dst[0]),
|
||||||
C.size_t(contentSize),
|
C.size_t(len(dst)),
|
||||||
unsafe.Pointer(&src[0]),
|
unsafe.Pointer(&src[0]),
|
||||||
C.size_t(len(src)),
|
C.size_t(len(src)),
|
||||||
p.dDict,
|
p.dDict,
|
||||||
|
|||||||
37
vendor/github.com/DataDog/zstd/zstd_common.c
generated
vendored
37
vendor/github.com/DataDog/zstd/zstd_common.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -15,7 +15,6 @@
|
|||||||
* Dependencies
|
* Dependencies
|
||||||
***************************************/
|
***************************************/
|
||||||
#define ZSTD_DEPS_NEED_MALLOC
|
#define ZSTD_DEPS_NEED_MALLOC
|
||||||
#include "zstd_deps.h" /* ZSTD_malloc, ZSTD_calloc, ZSTD_free, ZSTD_memset */
|
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
#include "zstd_internal.h"
|
#include "zstd_internal.h"
|
||||||
|
|
||||||
@@ -49,38 +48,4 @@ ZSTD_ErrorCode ZSTD_getErrorCode(size_t code) { return ERR_getErrorCode(code); }
|
|||||||
* provides error code string from enum */
|
* provides error code string from enum */
|
||||||
const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); }
|
const char* ZSTD_getErrorString(ZSTD_ErrorCode code) { return ERR_getErrorString(code); }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*=**************************************************************
|
|
||||||
* Custom allocator
|
|
||||||
****************************************************************/
|
|
||||||
void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem)
|
|
||||||
{
|
|
||||||
if (customMem.customAlloc)
|
|
||||||
return customMem.customAlloc(customMem.opaque, size);
|
|
||||||
return ZSTD_malloc(size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem)
|
|
||||||
{
|
|
||||||
if (customMem.customAlloc) {
|
|
||||||
/* calloc implemented as malloc+memset;
|
|
||||||
* not as efficient as calloc, but next best guess for custom malloc */
|
|
||||||
void* const ptr = customMem.customAlloc(customMem.opaque, size);
|
|
||||||
ZSTD_memset(ptr, 0, size);
|
|
||||||
return ptr;
|
|
||||||
}
|
|
||||||
return ZSTD_calloc(1, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
void ZSTD_customFree(void* ptr, ZSTD_customMem customMem)
|
|
||||||
{
|
|
||||||
if (ptr!=NULL) {
|
|
||||||
if (customMem.customFree)
|
|
||||||
customMem.customFree(customMem.opaque, ptr);
|
|
||||||
else
|
|
||||||
ZSTD_free(ptr);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
2134
vendor/github.com/DataDog/zstd/zstd_compress.c
generated
vendored
2134
vendor/github.com/DataDog/zstd/zstd_compress.c
generated
vendored
File diff suppressed because it is too large
Load Diff
402
vendor/github.com/DataDog/zstd/zstd_compress_internal.h
generated
vendored
402
vendor/github.com/DataDog/zstd/zstd_compress_internal.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -24,6 +24,7 @@
|
|||||||
#ifdef ZSTD_MULTITHREAD
|
#ifdef ZSTD_MULTITHREAD
|
||||||
# include "zstdmt_compress.h"
|
# include "zstdmt_compress.h"
|
||||||
#endif
|
#endif
|
||||||
|
#include "bits.h" /* ZSTD_highbit32, ZSTD_NbCommonBytes */
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@@ -39,7 +40,7 @@ extern "C" {
|
|||||||
It's not a big deal though : candidate will just be sorted again.
|
It's not a big deal though : candidate will just be sorted again.
|
||||||
Additionally, candidate position 1 will be lost.
|
Additionally, candidate position 1 will be lost.
|
||||||
But candidate 1 cannot hide a large tree of candidates, so it's a minimal loss.
|
But candidate 1 cannot hide a large tree of candidates, so it's a minimal loss.
|
||||||
The benefit is that ZSTD_DUBT_UNSORTED_MARK cannot be mishandled after table re-use with a different strategy.
|
The benefit is that ZSTD_DUBT_UNSORTED_MARK cannot be mishandled after table reuse with a different strategy.
|
||||||
This constant is required by ZSTD_compressBlock_btlazy2() and ZSTD_reduceTable_internal() */
|
This constant is required by ZSTD_compressBlock_btlazy2() and ZSTD_reduceTable_internal() */
|
||||||
|
|
||||||
|
|
||||||
@@ -118,12 +119,13 @@ typedef struct {
|
|||||||
/** ZSTD_buildBlockEntropyStats() :
|
/** ZSTD_buildBlockEntropyStats() :
|
||||||
* Builds entropy for the block.
|
* Builds entropy for the block.
|
||||||
* @return : 0 on success or error code */
|
* @return : 0 on success or error code */
|
||||||
size_t ZSTD_buildBlockEntropyStats(seqStore_t* seqStorePtr,
|
size_t ZSTD_buildBlockEntropyStats(
|
||||||
const ZSTD_entropyCTables_t* prevEntropy,
|
const seqStore_t* seqStorePtr,
|
||||||
ZSTD_entropyCTables_t* nextEntropy,
|
const ZSTD_entropyCTables_t* prevEntropy,
|
||||||
const ZSTD_CCtx_params* cctxParams,
|
ZSTD_entropyCTables_t* nextEntropy,
|
||||||
ZSTD_entropyCTablesMetadata_t* entropyMetadata,
|
const ZSTD_CCtx_params* cctxParams,
|
||||||
void* workspace, size_t wkspSize);
|
ZSTD_entropyCTablesMetadata_t* entropyMetadata,
|
||||||
|
void* workspace, size_t wkspSize);
|
||||||
|
|
||||||
/*********************************
|
/*********************************
|
||||||
* Compression internals structs *
|
* Compression internals structs *
|
||||||
@@ -149,26 +151,33 @@ typedef struct {
|
|||||||
size_t capacity; /* The capacity starting from `seq` pointer */
|
size_t capacity; /* The capacity starting from `seq` pointer */
|
||||||
} rawSeqStore_t;
|
} rawSeqStore_t;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
U32 idx; /* Index in array of ZSTD_Sequence */
|
||||||
|
U32 posInSequence; /* Position within sequence at idx */
|
||||||
|
size_t posInSrc; /* Number of bytes given by sequences provided so far */
|
||||||
|
} ZSTD_sequencePosition;
|
||||||
|
|
||||||
UNUSED_ATTR static const rawSeqStore_t kNullRawSeqStore = {NULL, 0, 0, 0, 0};
|
UNUSED_ATTR static const rawSeqStore_t kNullRawSeqStore = {NULL, 0, 0, 0, 0};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
int price;
|
int price; /* price from beginning of segment to this position */
|
||||||
U32 off;
|
U32 off; /* offset of previous match */
|
||||||
U32 mlen;
|
U32 mlen; /* length of previous match */
|
||||||
U32 litlen;
|
U32 litlen; /* nb of literals since previous match */
|
||||||
U32 rep[ZSTD_REP_NUM];
|
U32 rep[ZSTD_REP_NUM]; /* offset history after previous match */
|
||||||
} ZSTD_optimal_t;
|
} ZSTD_optimal_t;
|
||||||
|
|
||||||
typedef enum { zop_dynamic=0, zop_predef } ZSTD_OptPrice_e;
|
typedef enum { zop_dynamic=0, zop_predef } ZSTD_OptPrice_e;
|
||||||
|
|
||||||
|
#define ZSTD_OPT_SIZE (ZSTD_OPT_NUM+3)
|
||||||
typedef struct {
|
typedef struct {
|
||||||
/* All tables are allocated inside cctx->workspace by ZSTD_resetCCtx_internal() */
|
/* All tables are allocated inside cctx->workspace by ZSTD_resetCCtx_internal() */
|
||||||
unsigned* litFreq; /* table of literals statistics, of size 256 */
|
unsigned* litFreq; /* table of literals statistics, of size 256 */
|
||||||
unsigned* litLengthFreq; /* table of litLength statistics, of size (MaxLL+1) */
|
unsigned* litLengthFreq; /* table of litLength statistics, of size (MaxLL+1) */
|
||||||
unsigned* matchLengthFreq; /* table of matchLength statistics, of size (MaxML+1) */
|
unsigned* matchLengthFreq; /* table of matchLength statistics, of size (MaxML+1) */
|
||||||
unsigned* offCodeFreq; /* table of offCode statistics, of size (MaxOff+1) */
|
unsigned* offCodeFreq; /* table of offCode statistics, of size (MaxOff+1) */
|
||||||
ZSTD_match_t* matchTable; /* list of found matches, of size ZSTD_OPT_NUM+1 */
|
ZSTD_match_t* matchTable; /* list of found matches, of size ZSTD_OPT_SIZE */
|
||||||
ZSTD_optimal_t* priceTable; /* All positions tracked by optimal parser, of size ZSTD_OPT_NUM+1 */
|
ZSTD_optimal_t* priceTable; /* All positions tracked by optimal parser, of size ZSTD_OPT_SIZE */
|
||||||
|
|
||||||
U32 litSum; /* nb of literals */
|
U32 litSum; /* nb of literals */
|
||||||
U32 litLengthSum; /* nb of litLength codes */
|
U32 litLengthSum; /* nb of litLength codes */
|
||||||
@@ -219,8 +228,10 @@ struct ZSTD_matchState_t {
|
|||||||
U32 hashLog3; /* dispatch table for matches of len==3 : larger == faster, more memory */
|
U32 hashLog3; /* dispatch table for matches of len==3 : larger == faster, more memory */
|
||||||
|
|
||||||
U32 rowHashLog; /* For row-based matchfinder: Hashlog based on nb of rows in the hashTable.*/
|
U32 rowHashLog; /* For row-based matchfinder: Hashlog based on nb of rows in the hashTable.*/
|
||||||
U16* tagTable; /* For row-based matchFinder: A row-based table containing the hashes and head index. */
|
BYTE* tagTable; /* For row-based matchFinder: A row-based table containing the hashes and head index. */
|
||||||
U32 hashCache[ZSTD_ROW_HASH_CACHE_SIZE]; /* For row-based matchFinder: a cache of hashes to improve speed */
|
U32 hashCache[ZSTD_ROW_HASH_CACHE_SIZE]; /* For row-based matchFinder: a cache of hashes to improve speed */
|
||||||
|
U64 hashSalt; /* For row-based matchFinder: salts the hash for reuse of tag table */
|
||||||
|
U32 hashSaltEntropy; /* For row-based matchFinder: collects entropy for salt generation */
|
||||||
|
|
||||||
U32* hashTable;
|
U32* hashTable;
|
||||||
U32* hashTable3;
|
U32* hashTable3;
|
||||||
@@ -235,6 +246,18 @@ struct ZSTD_matchState_t {
|
|||||||
const ZSTD_matchState_t* dictMatchState;
|
const ZSTD_matchState_t* dictMatchState;
|
||||||
ZSTD_compressionParameters cParams;
|
ZSTD_compressionParameters cParams;
|
||||||
const rawSeqStore_t* ldmSeqStore;
|
const rawSeqStore_t* ldmSeqStore;
|
||||||
|
|
||||||
|
/* Controls prefetching in some dictMatchState matchfinders.
|
||||||
|
* This behavior is controlled from the cctx ms.
|
||||||
|
* This parameter has no effect in the cdict ms. */
|
||||||
|
int prefetchCDictTables;
|
||||||
|
|
||||||
|
/* When == 0, lazy match finders insert every position.
|
||||||
|
* When != 0, lazy match finders only insert positions they search.
|
||||||
|
* This allows them to skip much faster over incompressible data,
|
||||||
|
* at a small cost to compression ratio.
|
||||||
|
*/
|
||||||
|
int lazySkipping;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -331,6 +354,25 @@ struct ZSTD_CCtx_params_s {
|
|||||||
|
|
||||||
/* Internal use, for createCCtxParams() and freeCCtxParams() only */
|
/* Internal use, for createCCtxParams() and freeCCtxParams() only */
|
||||||
ZSTD_customMem customMem;
|
ZSTD_customMem customMem;
|
||||||
|
|
||||||
|
/* Controls prefetching in some dictMatchState matchfinders */
|
||||||
|
ZSTD_paramSwitch_e prefetchCDictTables;
|
||||||
|
|
||||||
|
/* Controls whether zstd will fall back to an internal matchfinder
|
||||||
|
* if the external matchfinder returns an error code. */
|
||||||
|
int enableMatchFinderFallback;
|
||||||
|
|
||||||
|
/* Parameters for the external sequence producer API.
|
||||||
|
* Users set these parameters through ZSTD_registerSequenceProducer().
|
||||||
|
* It is not possible to set these parameters individually through the public API. */
|
||||||
|
void* extSeqProdState;
|
||||||
|
ZSTD_sequenceProducer_F extSeqProdFunc;
|
||||||
|
|
||||||
|
/* Adjust the max block size*/
|
||||||
|
size_t maxBlockSize;
|
||||||
|
|
||||||
|
/* Controls repcode search in external sequence parsing */
|
||||||
|
ZSTD_paramSwitch_e searchForExternalRepcodes;
|
||||||
}; /* typedef'd to ZSTD_CCtx_params within "zstd.h" */
|
}; /* typedef'd to ZSTD_CCtx_params within "zstd.h" */
|
||||||
|
|
||||||
#define COMPRESS_SEQUENCES_WORKSPACE_SIZE (sizeof(unsigned) * (MaxSeq + 2))
|
#define COMPRESS_SEQUENCES_WORKSPACE_SIZE (sizeof(unsigned) * (MaxSeq + 2))
|
||||||
@@ -411,6 +453,7 @@ struct ZSTD_CCtx_s {
|
|||||||
|
|
||||||
/* Stable in/out buffer verification */
|
/* Stable in/out buffer verification */
|
||||||
ZSTD_inBuffer expectedInBuffer;
|
ZSTD_inBuffer expectedInBuffer;
|
||||||
|
size_t stableIn_notConsumed; /* nb bytes within stable input buffer that are said to be consumed but are not */
|
||||||
size_t expectedOutBufferSize;
|
size_t expectedOutBufferSize;
|
||||||
|
|
||||||
/* Dictionary */
|
/* Dictionary */
|
||||||
@@ -430,9 +473,14 @@ struct ZSTD_CCtx_s {
|
|||||||
|
|
||||||
/* Workspace for block splitter */
|
/* Workspace for block splitter */
|
||||||
ZSTD_blockSplitCtx blockSplitCtx;
|
ZSTD_blockSplitCtx blockSplitCtx;
|
||||||
|
|
||||||
|
/* Buffer for output from external sequence producer */
|
||||||
|
ZSTD_Sequence* extSeqBuf;
|
||||||
|
size_t extSeqBufCapacity;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef enum { ZSTD_dtlm_fast, ZSTD_dtlm_full } ZSTD_dictTableLoadMethod_e;
|
typedef enum { ZSTD_dtlm_fast, ZSTD_dtlm_full } ZSTD_dictTableLoadMethod_e;
|
||||||
|
typedef enum { ZSTD_tfp_forCCtx, ZSTD_tfp_forCDict } ZSTD_tableFillPurpose_e;
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ZSTD_noDict = 0,
|
ZSTD_noDict = 0,
|
||||||
@@ -454,7 +502,7 @@ typedef enum {
|
|||||||
* In this mode we take both the source size and the dictionary size
|
* In this mode we take both the source size and the dictionary size
|
||||||
* into account when selecting and adjusting the parameters.
|
* into account when selecting and adjusting the parameters.
|
||||||
*/
|
*/
|
||||||
ZSTD_cpm_unknown = 3, /* ZSTD_getCParams, ZSTD_getParams, ZSTD_adjustParams.
|
ZSTD_cpm_unknown = 3 /* ZSTD_getCParams, ZSTD_getParams, ZSTD_adjustParams.
|
||||||
* We don't know what these parameters are for. We default to the legacy
|
* We don't know what these parameters are for. We default to the legacy
|
||||||
* behavior of taking both the source size and the dict size into account
|
* behavior of taking both the source size and the dict size into account
|
||||||
* when selecting and adjusting parameters.
|
* when selecting and adjusting parameters.
|
||||||
@@ -513,9 +561,11 @@ MEM_STATIC int ZSTD_cParam_withinBounds(ZSTD_cParameter cParam, int value)
|
|||||||
/* ZSTD_noCompressBlock() :
|
/* ZSTD_noCompressBlock() :
|
||||||
* Writes uncompressed block to dst buffer from given src.
|
* Writes uncompressed block to dst buffer from given src.
|
||||||
* Returns the size of the block */
|
* Returns the size of the block */
|
||||||
MEM_STATIC size_t ZSTD_noCompressBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize, U32 lastBlock)
|
MEM_STATIC size_t
|
||||||
|
ZSTD_noCompressBlock(void* dst, size_t dstCapacity, const void* src, size_t srcSize, U32 lastBlock)
|
||||||
{
|
{
|
||||||
U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(srcSize << 3);
|
U32 const cBlockHeader24 = lastBlock + (((U32)bt_raw)<<1) + (U32)(srcSize << 3);
|
||||||
|
DEBUGLOG(5, "ZSTD_noCompressBlock (srcSize=%zu, dstCapacity=%zu)", srcSize, dstCapacity);
|
||||||
RETURN_ERROR_IF(srcSize + ZSTD_blockHeaderSize > dstCapacity,
|
RETURN_ERROR_IF(srcSize + ZSTD_blockHeaderSize > dstCapacity,
|
||||||
dstSize_tooSmall, "dst buf too small for uncompressed block");
|
dstSize_tooSmall, "dst buf too small for uncompressed block");
|
||||||
MEM_writeLE24(dst, cBlockHeader24);
|
MEM_writeLE24(dst, cBlockHeader24);
|
||||||
@@ -523,7 +573,8 @@ MEM_STATIC size_t ZSTD_noCompressBlock (void* dst, size_t dstCapacity, const voi
|
|||||||
return ZSTD_blockHeaderSize + srcSize;
|
return ZSTD_blockHeaderSize + srcSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC size_t ZSTD_rleCompressBlock (void* dst, size_t dstCapacity, BYTE src, size_t srcSize, U32 lastBlock)
|
MEM_STATIC size_t
|
||||||
|
ZSTD_rleCompressBlock(void* dst, size_t dstCapacity, BYTE src, size_t srcSize, U32 lastBlock)
|
||||||
{
|
{
|
||||||
BYTE* const op = (BYTE*)dst;
|
BYTE* const op = (BYTE*)dst;
|
||||||
U32 const cBlockHeader = lastBlock + (((U32)bt_rle)<<1) + (U32)(srcSize << 3);
|
U32 const cBlockHeader = lastBlock + (((U32)bt_rle)<<1) + (U32)(srcSize << 3);
|
||||||
@@ -542,7 +593,7 @@ MEM_STATIC size_t ZSTD_minGain(size_t srcSize, ZSTD_strategy strat)
|
|||||||
{
|
{
|
||||||
U32 const minlog = (strat>=ZSTD_btultra) ? (U32)(strat) - 1 : 6;
|
U32 const minlog = (strat>=ZSTD_btultra) ? (U32)(strat) - 1 : 6;
|
||||||
ZSTD_STATIC_ASSERT(ZSTD_btultra == 8);
|
ZSTD_STATIC_ASSERT(ZSTD_btultra == 8);
|
||||||
assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, strat));
|
assert(ZSTD_cParam_withinBounds(ZSTD_c_strategy, (int)strat));
|
||||||
return (srcSize >> minlog) + 2;
|
return (srcSize >> minlog) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -578,29 +629,27 @@ ZSTD_safecopyLiterals(BYTE* op, BYTE const* ip, BYTE const* const iend, BYTE con
|
|||||||
while (ip < iend) *op++ = *ip++;
|
while (ip < iend) *op++ = *ip++;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ZSTD_REP_MOVE (ZSTD_REP_NUM-1)
|
|
||||||
#define STORE_REPCODE_1 STORE_REPCODE(1)
|
#define REPCODE1_TO_OFFBASE REPCODE_TO_OFFBASE(1)
|
||||||
#define STORE_REPCODE_2 STORE_REPCODE(2)
|
#define REPCODE2_TO_OFFBASE REPCODE_TO_OFFBASE(2)
|
||||||
#define STORE_REPCODE_3 STORE_REPCODE(3)
|
#define REPCODE3_TO_OFFBASE REPCODE_TO_OFFBASE(3)
|
||||||
#define STORE_REPCODE(r) (assert((r)>=1), assert((r)<=3), (r)-1)
|
#define REPCODE_TO_OFFBASE(r) (assert((r)>=1), assert((r)<=ZSTD_REP_NUM), (r)) /* accepts IDs 1,2,3 */
|
||||||
#define STORE_OFFSET(o) (assert((o)>0), o + ZSTD_REP_MOVE)
|
#define OFFSET_TO_OFFBASE(o) (assert((o)>0), o + ZSTD_REP_NUM)
|
||||||
#define STORED_IS_OFFSET(o) ((o) > ZSTD_REP_MOVE)
|
#define OFFBASE_IS_OFFSET(o) ((o) > ZSTD_REP_NUM)
|
||||||
#define STORED_IS_REPCODE(o) ((o) <= ZSTD_REP_MOVE)
|
#define OFFBASE_IS_REPCODE(o) ( 1 <= (o) && (o) <= ZSTD_REP_NUM)
|
||||||
#define STORED_OFFSET(o) (assert(STORED_IS_OFFSET(o)), (o)-ZSTD_REP_MOVE)
|
#define OFFBASE_TO_OFFSET(o) (assert(OFFBASE_IS_OFFSET(o)), (o) - ZSTD_REP_NUM)
|
||||||
#define STORED_REPCODE(o) (assert(STORED_IS_REPCODE(o)), (o)+1) /* returns ID 1,2,3 */
|
#define OFFBASE_TO_REPCODE(o) (assert(OFFBASE_IS_REPCODE(o)), (o)) /* returns ID 1,2,3 */
|
||||||
#define STORED_TO_OFFBASE(o) ((o)+1)
|
|
||||||
#define OFFBASE_TO_STORED(o) ((o)-1)
|
|
||||||
|
|
||||||
/*! ZSTD_storeSeq() :
|
/*! ZSTD_storeSeq() :
|
||||||
* Store a sequence (litlen, litPtr, offCode and matchLength) into seqStore_t.
|
* Store a sequence (litlen, litPtr, offBase and matchLength) into seqStore_t.
|
||||||
* @offBase_minus1 : Users should use employ macros STORE_REPCODE_X and STORE_OFFSET().
|
* @offBase : Users should employ macros REPCODE_TO_OFFBASE() and OFFSET_TO_OFFBASE().
|
||||||
* @matchLength : must be >= MINMATCH
|
* @matchLength : must be >= MINMATCH
|
||||||
* Allowed to overread literals up to litLimit.
|
* Allowed to over-read literals up to litLimit.
|
||||||
*/
|
*/
|
||||||
HINT_INLINE UNUSED_ATTR void
|
HINT_INLINE UNUSED_ATTR void
|
||||||
ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
||||||
size_t litLength, const BYTE* literals, const BYTE* litLimit,
|
size_t litLength, const BYTE* literals, const BYTE* litLimit,
|
||||||
U32 offBase_minus1,
|
U32 offBase,
|
||||||
size_t matchLength)
|
size_t matchLength)
|
||||||
{
|
{
|
||||||
BYTE const* const litLimit_w = litLimit - WILDCOPY_OVERLENGTH;
|
BYTE const* const litLimit_w = litLimit - WILDCOPY_OVERLENGTH;
|
||||||
@@ -609,8 +658,8 @@ ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
|||||||
static const BYTE* g_start = NULL;
|
static const BYTE* g_start = NULL;
|
||||||
if (g_start==NULL) g_start = (const BYTE*)literals; /* note : index only works for compression within a single segment */
|
if (g_start==NULL) g_start = (const BYTE*)literals; /* note : index only works for compression within a single segment */
|
||||||
{ U32 const pos = (U32)((const BYTE*)literals - g_start);
|
{ U32 const pos = (U32)((const BYTE*)literals - g_start);
|
||||||
DEBUGLOG(6, "Cpos%7u :%3u literals, match%4u bytes at offCode%7u",
|
DEBUGLOG(6, "Cpos%7u :%3u literals, match%4u bytes at offBase%7u",
|
||||||
pos, (U32)litLength, (U32)matchLength, (U32)offBase_minus1);
|
pos, (U32)litLength, (U32)matchLength, (U32)offBase);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
assert((size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart) < seqStorePtr->maxNbSeq);
|
assert((size_t)(seqStorePtr->sequences - seqStorePtr->sequencesStart) < seqStorePtr->maxNbSeq);
|
||||||
@@ -620,9 +669,9 @@ ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
|||||||
assert(literals + litLength <= litLimit);
|
assert(literals + litLength <= litLimit);
|
||||||
if (litEnd <= litLimit_w) {
|
if (litEnd <= litLimit_w) {
|
||||||
/* Common case we can use wildcopy.
|
/* Common case we can use wildcopy.
|
||||||
* First copy 16 bytes, because literals are likely short.
|
* First copy 16 bytes, because literals are likely short.
|
||||||
*/
|
*/
|
||||||
assert(WILDCOPY_OVERLENGTH >= 16);
|
ZSTD_STATIC_ASSERT(WILDCOPY_OVERLENGTH >= 16);
|
||||||
ZSTD_copy16(seqStorePtr->lit, literals);
|
ZSTD_copy16(seqStorePtr->lit, literals);
|
||||||
if (litLength > 16) {
|
if (litLength > 16) {
|
||||||
ZSTD_wildcopy(seqStorePtr->lit+16, literals+16, (ptrdiff_t)litLength-16, ZSTD_no_overlap);
|
ZSTD_wildcopy(seqStorePtr->lit+16, literals+16, (ptrdiff_t)litLength-16, ZSTD_no_overlap);
|
||||||
@@ -641,7 +690,7 @@ ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
|||||||
seqStorePtr->sequences[0].litLength = (U16)litLength;
|
seqStorePtr->sequences[0].litLength = (U16)litLength;
|
||||||
|
|
||||||
/* match offset */
|
/* match offset */
|
||||||
seqStorePtr->sequences[0].offBase = STORED_TO_OFFBASE(offBase_minus1);
|
seqStorePtr->sequences[0].offBase = offBase;
|
||||||
|
|
||||||
/* match Length */
|
/* match Length */
|
||||||
assert(matchLength >= MINMATCH);
|
assert(matchLength >= MINMATCH);
|
||||||
@@ -659,17 +708,17 @@ ZSTD_storeSeq(seqStore_t* seqStorePtr,
|
|||||||
|
|
||||||
/* ZSTD_updateRep() :
|
/* ZSTD_updateRep() :
|
||||||
* updates in-place @rep (array of repeat offsets)
|
* updates in-place @rep (array of repeat offsets)
|
||||||
* @offBase_minus1 : sum-type, with same numeric representation as ZSTD_storeSeq()
|
* @offBase : sum-type, using numeric representation of ZSTD_storeSeq()
|
||||||
*/
|
*/
|
||||||
MEM_STATIC void
|
MEM_STATIC void
|
||||||
ZSTD_updateRep(U32 rep[ZSTD_REP_NUM], U32 const offBase_minus1, U32 const ll0)
|
ZSTD_updateRep(U32 rep[ZSTD_REP_NUM], U32 const offBase, U32 const ll0)
|
||||||
{
|
{
|
||||||
if (STORED_IS_OFFSET(offBase_minus1)) { /* full offset */
|
if (OFFBASE_IS_OFFSET(offBase)) { /* full offset */
|
||||||
rep[2] = rep[1];
|
rep[2] = rep[1];
|
||||||
rep[1] = rep[0];
|
rep[1] = rep[0];
|
||||||
rep[0] = STORED_OFFSET(offBase_minus1);
|
rep[0] = OFFBASE_TO_OFFSET(offBase);
|
||||||
} else { /* repcode */
|
} else { /* repcode */
|
||||||
U32 const repCode = STORED_REPCODE(offBase_minus1) - 1 + ll0;
|
U32 const repCode = OFFBASE_TO_REPCODE(offBase) - 1 + ll0;
|
||||||
if (repCode > 0) { /* note : if repCode==0, no change */
|
if (repCode > 0) { /* note : if repCode==0, no change */
|
||||||
U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
|
U32 const currentOffset = (repCode==ZSTD_REP_NUM) ? (rep[0] - 1) : rep[repCode];
|
||||||
rep[2] = (repCode >= 2) ? rep[1] : rep[2];
|
rep[2] = (repCode >= 2) ? rep[1] : rep[2];
|
||||||
@@ -686,11 +735,11 @@ typedef struct repcodes_s {
|
|||||||
} repcodes_t;
|
} repcodes_t;
|
||||||
|
|
||||||
MEM_STATIC repcodes_t
|
MEM_STATIC repcodes_t
|
||||||
ZSTD_newRep(U32 const rep[ZSTD_REP_NUM], U32 const offBase_minus1, U32 const ll0)
|
ZSTD_newRep(U32 const rep[ZSTD_REP_NUM], U32 const offBase, U32 const ll0)
|
||||||
{
|
{
|
||||||
repcodes_t newReps;
|
repcodes_t newReps;
|
||||||
ZSTD_memcpy(&newReps, rep, sizeof(newReps));
|
ZSTD_memcpy(&newReps, rep, sizeof(newReps));
|
||||||
ZSTD_updateRep(newReps.rep, offBase_minus1, ll0);
|
ZSTD_updateRep(newReps.rep, offBase, ll0);
|
||||||
return newReps;
|
return newReps;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -698,103 +747,6 @@ ZSTD_newRep(U32 const rep[ZSTD_REP_NUM], U32 const offBase_minus1, U32 const ll0
|
|||||||
/*-*************************************
|
/*-*************************************
|
||||||
* Match length counter
|
* Match length counter
|
||||||
***************************************/
|
***************************************/
|
||||||
static unsigned ZSTD_NbCommonBytes (size_t val)
|
|
||||||
{
|
|
||||||
if (MEM_isLittleEndian()) {
|
|
||||||
if (MEM_64bits()) {
|
|
||||||
# if defined(_MSC_VER) && defined(_WIN64)
|
|
||||||
# if STATIC_BMI2
|
|
||||||
return _tzcnt_u64(val) >> 3;
|
|
||||||
# else
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward64(&r, (U64)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
|
||||||
return (__builtin_ctzll((U64)val) >> 3);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[64] = { 0, 0, 0, 0, 0, 1, 1, 2,
|
|
||||||
0, 3, 1, 3, 1, 4, 2, 7,
|
|
||||||
0, 2, 3, 6, 1, 5, 3, 5,
|
|
||||||
1, 3, 4, 4, 2, 5, 6, 7,
|
|
||||||
7, 0, 1, 2, 3, 3, 4, 6,
|
|
||||||
2, 6, 5, 5, 3, 4, 5, 6,
|
|
||||||
7, 1, 2, 4, 6, 4, 4, 5,
|
|
||||||
7, 2, 6, 5, 7, 6, 7, 7 };
|
|
||||||
return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
|
|
||||||
# endif
|
|
||||||
} else { /* 32 bits */
|
|
||||||
# if defined(_MSC_VER)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward(&r, (U32)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (__builtin_ctz((U32)val) >> 3);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[32] = { 0, 0, 3, 0, 3, 1, 3, 0,
|
|
||||||
3, 2, 2, 1, 3, 2, 0, 1,
|
|
||||||
3, 3, 1, 2, 2, 2, 2, 0,
|
|
||||||
3, 1, 2, 0, 1, 0, 1, 1 };
|
|
||||||
return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
} else { /* Big Endian CPU */
|
|
||||||
if (MEM_64bits()) {
|
|
||||||
# if defined(_MSC_VER) && defined(_WIN64)
|
|
||||||
# if STATIC_BMI2
|
|
||||||
return _lzcnt_u64(val) >> 3;
|
|
||||||
# else
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse64(&r, (U64)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
|
||||||
return (__builtin_clzll(val) >> 3);
|
|
||||||
# else
|
|
||||||
unsigned r;
|
|
||||||
const unsigned n32 = sizeof(size_t)*4; /* calculate this way due to compiler complaining in 32-bits mode */
|
|
||||||
if (!(val>>n32)) { r=4; } else { r=0; val>>=n32; }
|
|
||||||
if (!(val>>16)) { r+=2; val>>=8; } else { val>>=24; }
|
|
||||||
r += (!val);
|
|
||||||
return r;
|
|
||||||
# endif
|
|
||||||
} else { /* 32 bits */
|
|
||||||
# if defined(_MSC_VER)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse(&r, (unsigned long)val);
|
|
||||||
return (unsigned)(r >> 3);
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return (__builtin_clz((U32)val) >> 3);
|
|
||||||
# else
|
|
||||||
unsigned r;
|
|
||||||
if (!(val>>16)) { r=2; val>>=8; } else { r=0; val>>=24; }
|
|
||||||
r += (!val);
|
|
||||||
return r;
|
|
||||||
# endif
|
|
||||||
} }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit)
|
MEM_STATIC size_t ZSTD_count(const BYTE* pIn, const BYTE* pMatch, const BYTE* const pInLimit)
|
||||||
{
|
{
|
||||||
const BYTE* const pStart = pIn;
|
const BYTE* const pStart = pIn;
|
||||||
@@ -840,32 +792,43 @@ ZSTD_count_2segments(const BYTE* ip, const BYTE* match,
|
|||||||
* Hashes
|
* Hashes
|
||||||
***************************************/
|
***************************************/
|
||||||
static const U32 prime3bytes = 506832829U;
|
static const U32 prime3bytes = 506832829U;
|
||||||
static U32 ZSTD_hash3(U32 u, U32 h) { return ((u << (32-24)) * prime3bytes) >> (32-h) ; }
|
static U32 ZSTD_hash3(U32 u, U32 h, U32 s) { assert(h <= 32); return (((u << (32-24)) * prime3bytes) ^ s) >> (32-h) ; }
|
||||||
MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h); } /* only in zstd_opt.h */
|
MEM_STATIC size_t ZSTD_hash3Ptr(const void* ptr, U32 h) { return ZSTD_hash3(MEM_readLE32(ptr), h, 0); } /* only in zstd_opt.h */
|
||||||
|
MEM_STATIC size_t ZSTD_hash3PtrS(const void* ptr, U32 h, U32 s) { return ZSTD_hash3(MEM_readLE32(ptr), h, s); }
|
||||||
|
|
||||||
static const U32 prime4bytes = 2654435761U;
|
static const U32 prime4bytes = 2654435761U;
|
||||||
static U32 ZSTD_hash4(U32 u, U32 h) { return (u * prime4bytes) >> (32-h) ; }
|
static U32 ZSTD_hash4(U32 u, U32 h, U32 s) { assert(h <= 32); return ((u * prime4bytes) ^ s) >> (32-h) ; }
|
||||||
static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_read32(ptr), h); }
|
static size_t ZSTD_hash4Ptr(const void* ptr, U32 h) { return ZSTD_hash4(MEM_readLE32(ptr), h, 0); }
|
||||||
|
static size_t ZSTD_hash4PtrS(const void* ptr, U32 h, U32 s) { return ZSTD_hash4(MEM_readLE32(ptr), h, s); }
|
||||||
|
|
||||||
static const U64 prime5bytes = 889523592379ULL;
|
static const U64 prime5bytes = 889523592379ULL;
|
||||||
static size_t ZSTD_hash5(U64 u, U32 h) { return (size_t)(((u << (64-40)) * prime5bytes) >> (64-h)) ; }
|
static size_t ZSTD_hash5(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-40)) * prime5bytes) ^ s) >> (64-h)) ; }
|
||||||
static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h); }
|
static size_t ZSTD_hash5Ptr(const void* p, U32 h) { return ZSTD_hash5(MEM_readLE64(p), h, 0); }
|
||||||
|
static size_t ZSTD_hash5PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash5(MEM_readLE64(p), h, s); }
|
||||||
|
|
||||||
static const U64 prime6bytes = 227718039650203ULL;
|
static const U64 prime6bytes = 227718039650203ULL;
|
||||||
static size_t ZSTD_hash6(U64 u, U32 h) { return (size_t)(((u << (64-48)) * prime6bytes) >> (64-h)) ; }
|
static size_t ZSTD_hash6(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-48)) * prime6bytes) ^ s) >> (64-h)) ; }
|
||||||
static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h); }
|
static size_t ZSTD_hash6Ptr(const void* p, U32 h) { return ZSTD_hash6(MEM_readLE64(p), h, 0); }
|
||||||
|
static size_t ZSTD_hash6PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash6(MEM_readLE64(p), h, s); }
|
||||||
|
|
||||||
static const U64 prime7bytes = 58295818150454627ULL;
|
static const U64 prime7bytes = 58295818150454627ULL;
|
||||||
static size_t ZSTD_hash7(U64 u, U32 h) { return (size_t)(((u << (64-56)) * prime7bytes) >> (64-h)) ; }
|
static size_t ZSTD_hash7(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u << (64-56)) * prime7bytes) ^ s) >> (64-h)) ; }
|
||||||
static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h); }
|
static size_t ZSTD_hash7Ptr(const void* p, U32 h) { return ZSTD_hash7(MEM_readLE64(p), h, 0); }
|
||||||
|
static size_t ZSTD_hash7PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash7(MEM_readLE64(p), h, s); }
|
||||||
|
|
||||||
static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
|
static const U64 prime8bytes = 0xCF1BBCDCB7A56463ULL;
|
||||||
static size_t ZSTD_hash8(U64 u, U32 h) { return (size_t)(((u) * prime8bytes) >> (64-h)) ; }
|
static size_t ZSTD_hash8(U64 u, U32 h, U64 s) { assert(h <= 64); return (size_t)((((u) * prime8bytes) ^ s) >> (64-h)) ; }
|
||||||
static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h); }
|
static size_t ZSTD_hash8Ptr(const void* p, U32 h) { return ZSTD_hash8(MEM_readLE64(p), h, 0); }
|
||||||
|
static size_t ZSTD_hash8PtrS(const void* p, U32 h, U64 s) { return ZSTD_hash8(MEM_readLE64(p), h, s); }
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC FORCE_INLINE_ATTR
|
MEM_STATIC FORCE_INLINE_ATTR
|
||||||
size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
|
size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
|
||||||
{
|
{
|
||||||
|
/* Although some of these hashes do support hBits up to 64, some do not.
|
||||||
|
* To be on the safe side, always avoid hBits > 32. */
|
||||||
|
assert(hBits <= 32);
|
||||||
|
|
||||||
switch(mls)
|
switch(mls)
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
@@ -877,6 +840,24 @@ size_t ZSTD_hashPtr(const void* p, U32 hBits, U32 mls)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MEM_STATIC FORCE_INLINE_ATTR
|
||||||
|
size_t ZSTD_hashPtrSalted(const void* p, U32 hBits, U32 mls, const U64 hashSalt) {
|
||||||
|
/* Although some of these hashes do support hBits up to 64, some do not.
|
||||||
|
* To be on the safe side, always avoid hBits > 32. */
|
||||||
|
assert(hBits <= 32);
|
||||||
|
|
||||||
|
switch(mls)
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
case 4: return ZSTD_hash4PtrS(p, hBits, (U32)hashSalt);
|
||||||
|
case 5: return ZSTD_hash5PtrS(p, hBits, hashSalt);
|
||||||
|
case 6: return ZSTD_hash6PtrS(p, hBits, hashSalt);
|
||||||
|
case 7: return ZSTD_hash7PtrS(p, hBits, hashSalt);
|
||||||
|
case 8: return ZSTD_hash8PtrS(p, hBits, hashSalt);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/** ZSTD_ipow() :
|
/** ZSTD_ipow() :
|
||||||
* Return base^exponent.
|
* Return base^exponent.
|
||||||
*/
|
*/
|
||||||
@@ -1068,7 +1049,9 @@ MEM_STATIC U32 ZSTD_window_needOverflowCorrection(ZSTD_window_t const window,
|
|||||||
* The least significant cycleLog bits of the indices must remain the same,
|
* The least significant cycleLog bits of the indices must remain the same,
|
||||||
* which may be 0. Every index up to maxDist in the past must be valid.
|
* which may be 0. Every index up to maxDist in the past must be valid.
|
||||||
*/
|
*/
|
||||||
MEM_STATIC U32 ZSTD_window_correctOverflow(ZSTD_window_t* window, U32 cycleLog,
|
MEM_STATIC
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
U32 ZSTD_window_correctOverflow(ZSTD_window_t* window, U32 cycleLog,
|
||||||
U32 maxDist, void const* src)
|
U32 maxDist, void const* src)
|
||||||
{
|
{
|
||||||
/* preemptive overflow correction:
|
/* preemptive overflow correction:
|
||||||
@@ -1224,10 +1207,15 @@ ZSTD_checkDictValidity(const ZSTD_window_t* window,
|
|||||||
(unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
|
(unsigned)blockEndIdx, (unsigned)maxDist, (unsigned)loadedDictEnd);
|
||||||
assert(blockEndIdx >= loadedDictEnd);
|
assert(blockEndIdx >= loadedDictEnd);
|
||||||
|
|
||||||
if (blockEndIdx > loadedDictEnd + maxDist) {
|
if (blockEndIdx > loadedDictEnd + maxDist || loadedDictEnd != window->dictLimit) {
|
||||||
/* On reaching window size, dictionaries are invalidated.
|
/* On reaching window size, dictionaries are invalidated.
|
||||||
* For simplification, if window size is reached anywhere within next block,
|
* For simplification, if window size is reached anywhere within next block,
|
||||||
* the dictionary is invalidated for the full block.
|
* the dictionary is invalidated for the full block.
|
||||||
|
*
|
||||||
|
* We also have to invalidate the dictionary if ZSTD_window_update() has detected
|
||||||
|
* non-contiguous segments, which means that loadedDictEnd != window->dictLimit.
|
||||||
|
* loadedDictEnd may be 0, if forceWindow is true, but in that case we never use
|
||||||
|
* dictMatchState, so setting it to NULL is not a problem.
|
||||||
*/
|
*/
|
||||||
DEBUGLOG(6, "invalidating dictionary for current block (distance > windowSize)");
|
DEBUGLOG(6, "invalidating dictionary for current block (distance > windowSize)");
|
||||||
*loadedDictEndPtr = 0;
|
*loadedDictEndPtr = 0;
|
||||||
@@ -1256,7 +1244,9 @@ MEM_STATIC void ZSTD_window_init(ZSTD_window_t* window) {
|
|||||||
* forget about the extDict. Handles overlap of the prefix and extDict.
|
* forget about the extDict. Handles overlap of the prefix and extDict.
|
||||||
* Returns non-zero if the segment is contiguous.
|
* Returns non-zero if the segment is contiguous.
|
||||||
*/
|
*/
|
||||||
MEM_STATIC U32 ZSTD_window_update(ZSTD_window_t* window,
|
MEM_STATIC
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
U32 ZSTD_window_update(ZSTD_window_t* window,
|
||||||
void const* src, size_t srcSize,
|
void const* src, size_t srcSize,
|
||||||
int forceNonContiguous)
|
int forceNonContiguous)
|
||||||
{
|
{
|
||||||
@@ -1359,6 +1349,42 @@ MEM_STATIC void ZSTD_debugTable(const U32* table, U32 max)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Short Cache */
|
||||||
|
|
||||||
|
/* Normally, zstd matchfinders follow this flow:
|
||||||
|
* 1. Compute hash at ip
|
||||||
|
* 2. Load index from hashTable[hash]
|
||||||
|
* 3. Check if *ip == *(base + index)
|
||||||
|
* In dictionary compression, loading *(base + index) is often an L2 or even L3 miss.
|
||||||
|
*
|
||||||
|
* Short cache is an optimization which allows us to avoid step 3 most of the time
|
||||||
|
* when the data doesn't actually match. With short cache, the flow becomes:
|
||||||
|
* 1. Compute (hash, currentTag) at ip. currentTag is an 8-bit independent hash at ip.
|
||||||
|
* 2. Load (index, matchTag) from hashTable[hash]. See ZSTD_writeTaggedIndex to understand how this works.
|
||||||
|
* 3. Only if currentTag == matchTag, check *ip == *(base + index). Otherwise, continue.
|
||||||
|
*
|
||||||
|
* Currently, short cache is only implemented in CDict hashtables. Thus, its use is limited to
|
||||||
|
* dictMatchState matchfinders.
|
||||||
|
*/
|
||||||
|
#define ZSTD_SHORT_CACHE_TAG_BITS 8
|
||||||
|
#define ZSTD_SHORT_CACHE_TAG_MASK ((1u << ZSTD_SHORT_CACHE_TAG_BITS) - 1)
|
||||||
|
|
||||||
|
/* Helper function for ZSTD_fillHashTable and ZSTD_fillDoubleHashTable.
|
||||||
|
* Unpacks hashAndTag into (hash, tag), then packs (index, tag) into hashTable[hash]. */
|
||||||
|
MEM_STATIC void ZSTD_writeTaggedIndex(U32* const hashTable, size_t hashAndTag, U32 index) {
|
||||||
|
size_t const hash = hashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
U32 const tag = (U32)(hashAndTag & ZSTD_SHORT_CACHE_TAG_MASK);
|
||||||
|
assert(index >> (32 - ZSTD_SHORT_CACHE_TAG_BITS) == 0);
|
||||||
|
hashTable[hash] = (index << ZSTD_SHORT_CACHE_TAG_BITS) | tag;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Helper function for short cache matchfinders.
|
||||||
|
* Unpacks tag1 and tag2 from lower bits of packedTag1 and packedTag2, then checks if the tags match. */
|
||||||
|
MEM_STATIC int ZSTD_comparePackedTags(size_t packedTag1, size_t packedTag2) {
|
||||||
|
U32 const tag1 = packedTag1 & ZSTD_SHORT_CACHE_TAG_MASK;
|
||||||
|
U32 const tag2 = packedTag2 & ZSTD_SHORT_CACHE_TAG_MASK;
|
||||||
|
return tag1 == tag2;
|
||||||
|
}
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
@@ -1441,11 +1467,10 @@ size_t ZSTD_writeLastEmptyBlock(void* dst, size_t dstCapacity);
|
|||||||
* This cannot be used when long range matching is enabled.
|
* This cannot be used when long range matching is enabled.
|
||||||
* Zstd will use these sequences, and pass the literals to a secondary block
|
* Zstd will use these sequences, and pass the literals to a secondary block
|
||||||
* compressor.
|
* compressor.
|
||||||
* @return : An error code on failure.
|
|
||||||
* NOTE: seqs are not verified! Invalid sequences can cause out-of-bounds memory
|
* NOTE: seqs are not verified! Invalid sequences can cause out-of-bounds memory
|
||||||
* access and data corruption.
|
* access and data corruption.
|
||||||
*/
|
*/
|
||||||
size_t ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq);
|
void ZSTD_referenceExternalSequences(ZSTD_CCtx* cctx, rawSeq* seq, size_t nbSeq);
|
||||||
|
|
||||||
/** ZSTD_cycleLog() :
|
/** ZSTD_cycleLog() :
|
||||||
* condition for correct operation : hashLog > 1 */
|
* condition for correct operation : hashLog > 1 */
|
||||||
@@ -1456,6 +1481,57 @@ U32 ZSTD_cycleLog(U32 hashLog, ZSTD_strategy strat);
|
|||||||
*/
|
*/
|
||||||
void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize);
|
void ZSTD_CCtx_trace(ZSTD_CCtx* cctx, size_t extraCSize);
|
||||||
|
|
||||||
|
/* Returns 0 on success, and a ZSTD_error otherwise. This function scans through an array of
|
||||||
|
* ZSTD_Sequence, storing the sequences it finds, until it reaches a block delimiter.
|
||||||
|
* Note that the block delimiter must include the last literals of the block.
|
||||||
|
*/
|
||||||
|
size_t
|
||||||
|
ZSTD_copySequencesToSeqStoreExplicitBlockDelim(ZSTD_CCtx* cctx,
|
||||||
|
ZSTD_sequencePosition* seqPos,
|
||||||
|
const ZSTD_Sequence* const inSeqs, size_t inSeqsSize,
|
||||||
|
const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch);
|
||||||
|
|
||||||
|
/* Returns the number of bytes to move the current read position back by.
|
||||||
|
* Only non-zero if we ended up splitting a sequence.
|
||||||
|
* Otherwise, it may return a ZSTD error if something went wrong.
|
||||||
|
*
|
||||||
|
* This function will attempt to scan through blockSize bytes
|
||||||
|
* represented by the sequences in @inSeqs,
|
||||||
|
* storing any (partial) sequences.
|
||||||
|
*
|
||||||
|
* Occasionally, we may want to change the actual number of bytes we consumed from inSeqs to
|
||||||
|
* avoid splitting a match, or to avoid splitting a match such that it would produce a match
|
||||||
|
* smaller than MINMATCH. In this case, we return the number of bytes that we didn't read from this block.
|
||||||
|
*/
|
||||||
|
size_t
|
||||||
|
ZSTD_copySequencesToSeqStoreNoBlockDelim(ZSTD_CCtx* cctx, ZSTD_sequencePosition* seqPos,
|
||||||
|
const ZSTD_Sequence* const inSeqs, size_t inSeqsSize,
|
||||||
|
const void* src, size_t blockSize, ZSTD_paramSwitch_e externalRepSearch);
|
||||||
|
|
||||||
|
/* Returns 1 if an external sequence producer is registered, otherwise returns 0. */
|
||||||
|
MEM_STATIC int ZSTD_hasExtSeqProd(const ZSTD_CCtx_params* params) {
|
||||||
|
return params->extSeqProdFunc != NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ===============================================================
|
||||||
|
* Deprecated definitions that are still used internally to avoid
|
||||||
|
* deprecation warnings. These functions are exactly equivalent to
|
||||||
|
* their public variants, but avoid the deprecation warnings.
|
||||||
|
* =============================================================== */
|
||||||
|
|
||||||
|
size_t ZSTD_compressBegin_usingCDict_deprecated(ZSTD_CCtx* cctx, const ZSTD_CDict* cdict);
|
||||||
|
|
||||||
|
size_t ZSTD_compressContinue_public(ZSTD_CCtx* cctx,
|
||||||
|
void* dst, size_t dstCapacity,
|
||||||
|
const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
size_t ZSTD_compressEnd_public(ZSTD_CCtx* cctx,
|
||||||
|
void* dst, size_t dstCapacity,
|
||||||
|
const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
size_t ZSTD_compressBlock_deprecated(ZSTD_CCtx* cctx, void* dst, size_t dstCapacity, const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
|
||||||
#endif /* ZSTD_COMPRESS_H */
|
#endif /* ZSTD_COMPRESS_H */
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
154
vendor/github.com/DataDog/zstd/zstd_compress_literals.c
generated
vendored
154
vendor/github.com/DataDog/zstd/zstd_compress_literals.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -14,11 +14,36 @@
|
|||||||
***************************************/
|
***************************************/
|
||||||
#include "zstd_compress_literals.h"
|
#include "zstd_compress_literals.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* **************************************************************
|
||||||
|
* Debug Traces
|
||||||
|
****************************************************************/
|
||||||
|
#if DEBUGLEVEL >= 2
|
||||||
|
|
||||||
|
static size_t showHexa(const void* src, size_t srcSize)
|
||||||
|
{
|
||||||
|
const BYTE* const ip = (const BYTE*)src;
|
||||||
|
size_t u;
|
||||||
|
for (u=0; u<srcSize; u++) {
|
||||||
|
RAWLOG(5, " %02X", ip[u]); (void)ip;
|
||||||
|
}
|
||||||
|
RAWLOG(5, " \n");
|
||||||
|
return srcSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* **************************************************************
|
||||||
|
* Literals compression - special cases
|
||||||
|
****************************************************************/
|
||||||
size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
||||||
|
|
||||||
|
DEBUGLOG(5, "ZSTD_noCompressLiterals: srcSize=%zu, dstCapacity=%zu", srcSize, dstCapacity);
|
||||||
|
|
||||||
RETURN_ERROR_IF(srcSize + flSize > dstCapacity, dstSize_tooSmall, "");
|
RETURN_ERROR_IF(srcSize + flSize > dstCapacity, dstSize_tooSmall, "");
|
||||||
|
|
||||||
switch(flSize)
|
switch(flSize)
|
||||||
@@ -37,16 +62,30 @@ size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ZSTD_memcpy(ostart + flSize, src, srcSize);
|
ZSTD_memcpy(ostart + flSize, src, srcSize);
|
||||||
DEBUGLOG(5, "Raw literals: %u -> %u", (U32)srcSize, (U32)(srcSize + flSize));
|
DEBUGLOG(5, "Raw (uncompressed) literals: %u -> %u", (U32)srcSize, (U32)(srcSize + flSize));
|
||||||
return srcSize + flSize;
|
return srcSize + flSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int allBytesIdentical(const void* src, size_t srcSize)
|
||||||
|
{
|
||||||
|
assert(srcSize >= 1);
|
||||||
|
assert(src != NULL);
|
||||||
|
{ const BYTE b = ((const BYTE*)src)[0];
|
||||||
|
size_t p;
|
||||||
|
for (p=1; p<srcSize; p++) {
|
||||||
|
if (((const BYTE*)src)[p] != b) return 0;
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
U32 const flSize = 1 + (srcSize>31) + (srcSize>4095);
|
||||||
|
|
||||||
(void)dstCapacity; /* dstCapacity already guaranteed to be >=4, hence large enough */
|
assert(dstCapacity >= 4); (void)dstCapacity;
|
||||||
|
assert(allBytesIdentical(src, srcSize));
|
||||||
|
|
||||||
switch(flSize)
|
switch(flSize)
|
||||||
{
|
{
|
||||||
@@ -64,28 +103,51 @@ size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void*
|
|||||||
}
|
}
|
||||||
|
|
||||||
ostart[flSize] = *(const BYTE*)src;
|
ostart[flSize] = *(const BYTE*)src;
|
||||||
DEBUGLOG(5, "RLE literals: %u -> %u", (U32)srcSize, (U32)flSize + 1);
|
DEBUGLOG(5, "RLE : Repeated Literal (%02X: %u times) -> %u bytes encoded", ((const BYTE*)src)[0], (U32)srcSize, (U32)flSize + 1);
|
||||||
return flSize+1;
|
return flSize+1;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
|
/* ZSTD_minLiteralsToCompress() :
|
||||||
ZSTD_hufCTables_t* nextHuf,
|
* returns minimal amount of literals
|
||||||
ZSTD_strategy strategy, int disableLiteralCompression,
|
* for literal compression to even be attempted.
|
||||||
void* dst, size_t dstCapacity,
|
* Minimum is made tighter as compression strategy increases.
|
||||||
const void* src, size_t srcSize,
|
*/
|
||||||
void* entropyWorkspace, size_t entropyWorkspaceSize,
|
static size_t
|
||||||
const int bmi2,
|
ZSTD_minLiteralsToCompress(ZSTD_strategy strategy, HUF_repeat huf_repeat)
|
||||||
unsigned suspectUncompressible)
|
{
|
||||||
|
assert((int)strategy >= 0);
|
||||||
|
assert((int)strategy <= 9);
|
||||||
|
/* btultra2 : min 8 bytes;
|
||||||
|
* then 2x larger for each successive compression strategy
|
||||||
|
* max threshold 64 bytes */
|
||||||
|
{ int const shift = MIN(9-(int)strategy, 3);
|
||||||
|
size_t const mintc = (huf_repeat == HUF_repeat_valid) ? 6 : (size_t)8 << shift;
|
||||||
|
DEBUGLOG(7, "minLiteralsToCompress = %zu", mintc);
|
||||||
|
return mintc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t ZSTD_compressLiterals (
|
||||||
|
void* dst, size_t dstCapacity,
|
||||||
|
const void* src, size_t srcSize,
|
||||||
|
void* entropyWorkspace, size_t entropyWorkspaceSize,
|
||||||
|
const ZSTD_hufCTables_t* prevHuf,
|
||||||
|
ZSTD_hufCTables_t* nextHuf,
|
||||||
|
ZSTD_strategy strategy,
|
||||||
|
int disableLiteralCompression,
|
||||||
|
int suspectUncompressible,
|
||||||
|
int bmi2)
|
||||||
{
|
{
|
||||||
size_t const minGain = ZSTD_minGain(srcSize, strategy);
|
|
||||||
size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB);
|
size_t const lhSize = 3 + (srcSize >= 1 KB) + (srcSize >= 16 KB);
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
U32 singleStream = srcSize < 256;
|
U32 singleStream = srcSize < 256;
|
||||||
symbolEncodingType_e hType = set_compressed;
|
symbolEncodingType_e hType = set_compressed;
|
||||||
size_t cLitSize;
|
size_t cLitSize;
|
||||||
|
|
||||||
DEBUGLOG(5,"ZSTD_compressLiterals (disableLiteralCompression=%i srcSize=%u)",
|
DEBUGLOG(5,"ZSTD_compressLiterals (disableLiteralCompression=%i, srcSize=%u, dstCapacity=%zu)",
|
||||||
disableLiteralCompression, (U32)srcSize);
|
disableLiteralCompression, (U32)srcSize, dstCapacity);
|
||||||
|
|
||||||
|
DEBUGLOG(6, "Completed literals listing (%zu bytes)", showHexa(src, srcSize));
|
||||||
|
|
||||||
/* Prepare nextEntropy assuming reusing the existing table */
|
/* Prepare nextEntropy assuming reusing the existing table */
|
||||||
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
||||||
@@ -93,40 +155,51 @@ size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
|
|||||||
if (disableLiteralCompression)
|
if (disableLiteralCompression)
|
||||||
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
||||||
|
|
||||||
/* small ? don't even attempt compression (speed opt) */
|
/* if too small, don't even attempt compression (speed opt) */
|
||||||
# define COMPRESS_LITERALS_SIZE_MIN 63
|
if (srcSize < ZSTD_minLiteralsToCompress(strategy, prevHuf->repeatMode))
|
||||||
{ size_t const minLitSize = (prevHuf->repeatMode == HUF_repeat_valid) ? 6 : COMPRESS_LITERALS_SIZE_MIN;
|
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
||||||
if (srcSize <= minLitSize) return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
RETURN_ERROR_IF(dstCapacity < lhSize+1, dstSize_tooSmall, "not enough space for compression");
|
RETURN_ERROR_IF(dstCapacity < lhSize+1, dstSize_tooSmall, "not enough space for compression");
|
||||||
{ HUF_repeat repeat = prevHuf->repeatMode;
|
{ HUF_repeat repeat = prevHuf->repeatMode;
|
||||||
int const preferRepeat = strategy < ZSTD_lazy ? srcSize <= 1024 : 0;
|
int const flags = 0
|
||||||
|
| (bmi2 ? HUF_flags_bmi2 : 0)
|
||||||
|
| (strategy < ZSTD_lazy && srcSize <= 1024 ? HUF_flags_preferRepeat : 0)
|
||||||
|
| (strategy >= HUF_OPTIMAL_DEPTH_THRESHOLD ? HUF_flags_optimalDepth : 0)
|
||||||
|
| (suspectUncompressible ? HUF_flags_suspectUncompressible : 0);
|
||||||
|
|
||||||
|
typedef size_t (*huf_compress_f)(void*, size_t, const void*, size_t, unsigned, unsigned, void*, size_t, HUF_CElt*, HUF_repeat*, int);
|
||||||
|
huf_compress_f huf_compress;
|
||||||
if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1;
|
if (repeat == HUF_repeat_valid && lhSize == 3) singleStream = 1;
|
||||||
cLitSize = singleStream ?
|
huf_compress = singleStream ? HUF_compress1X_repeat : HUF_compress4X_repeat;
|
||||||
HUF_compress1X_repeat(
|
cLitSize = huf_compress(ostart+lhSize, dstCapacity-lhSize,
|
||||||
ostart+lhSize, dstCapacity-lhSize, src, srcSize,
|
src, srcSize,
|
||||||
HUF_SYMBOLVALUE_MAX, HUF_TABLELOG_DEFAULT, entropyWorkspace, entropyWorkspaceSize,
|
HUF_SYMBOLVALUE_MAX, LitHufLog,
|
||||||
(HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2, suspectUncompressible) :
|
entropyWorkspace, entropyWorkspaceSize,
|
||||||
HUF_compress4X_repeat(
|
(HUF_CElt*)nextHuf->CTable,
|
||||||
ostart+lhSize, dstCapacity-lhSize, src, srcSize,
|
&repeat, flags);
|
||||||
HUF_SYMBOLVALUE_MAX, HUF_TABLELOG_DEFAULT, entropyWorkspace, entropyWorkspaceSize,
|
DEBUGLOG(5, "%zu literals compressed into %zu bytes (before header)", srcSize, cLitSize);
|
||||||
(HUF_CElt*)nextHuf->CTable, &repeat, preferRepeat, bmi2, suspectUncompressible);
|
|
||||||
if (repeat != HUF_repeat_none) {
|
if (repeat != HUF_repeat_none) {
|
||||||
/* reused the existing table */
|
/* reused the existing table */
|
||||||
DEBUGLOG(5, "Reusing previous huffman table");
|
DEBUGLOG(5, "reusing statistics from previous huffman block");
|
||||||
hType = set_repeat;
|
hType = set_repeat;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((cLitSize==0) || (cLitSize >= srcSize - minGain) || ERR_isError(cLitSize)) {
|
{ size_t const minGain = ZSTD_minGain(srcSize, strategy);
|
||||||
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
if ((cLitSize==0) || (cLitSize >= srcSize - minGain) || ERR_isError(cLitSize)) {
|
||||||
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
||||||
}
|
return ZSTD_noCompressLiterals(dst, dstCapacity, src, srcSize);
|
||||||
|
} }
|
||||||
if (cLitSize==1) {
|
if (cLitSize==1) {
|
||||||
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
/* A return value of 1 signals that the alphabet consists of a single symbol.
|
||||||
return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize);
|
* However, in some rare circumstances, it could be the compressed size (a single byte).
|
||||||
}
|
* For that outcome to have a chance to happen, it's necessary that `srcSize < 8`.
|
||||||
|
* (it's also necessary to not generate statistics).
|
||||||
|
* Therefore, in such a case, actively check that all bytes are identical. */
|
||||||
|
if ((srcSize >= 8) || allBytesIdentical(src, srcSize)) {
|
||||||
|
ZSTD_memcpy(nextHuf, prevHuf, sizeof(*prevHuf));
|
||||||
|
return ZSTD_compressRleLiteralsBlock(dst, dstCapacity, src, srcSize);
|
||||||
|
} }
|
||||||
|
|
||||||
if (hType == set_compressed) {
|
if (hType == set_compressed) {
|
||||||
/* using a newly constructed table */
|
/* using a newly constructed table */
|
||||||
@@ -137,16 +210,19 @@ size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
|
|||||||
switch(lhSize)
|
switch(lhSize)
|
||||||
{
|
{
|
||||||
case 3: /* 2 - 2 - 10 - 10 */
|
case 3: /* 2 - 2 - 10 - 10 */
|
||||||
{ U32 const lhc = hType + ((!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14);
|
if (!singleStream) assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS);
|
||||||
|
{ U32 const lhc = hType + ((U32)(!singleStream) << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<14);
|
||||||
MEM_writeLE24(ostart, lhc);
|
MEM_writeLE24(ostart, lhc);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 4: /* 2 - 2 - 14 - 14 */
|
case 4: /* 2 - 2 - 14 - 14 */
|
||||||
|
assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS);
|
||||||
{ U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18);
|
{ U32 const lhc = hType + (2 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<18);
|
||||||
MEM_writeLE32(ostart, lhc);
|
MEM_writeLE32(ostart, lhc);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 5: /* 2 - 2 - 18 - 18 */
|
case 5: /* 2 - 2 - 18 - 18 */
|
||||||
|
assert(srcSize >= MIN_LITERALS_FOR_4_STREAMS);
|
||||||
{ U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22);
|
{ U32 const lhc = hType + (3 << 2) + ((U32)srcSize<<4) + ((U32)cLitSize<<22);
|
||||||
MEM_writeLE32(ostart, lhc);
|
MEM_writeLE32(ostart, lhc);
|
||||||
ostart[4] = (BYTE)(cLitSize >> 10);
|
ostart[4] = (BYTE)(cLitSize >> 10);
|
||||||
|
|||||||
24
vendor/github.com/DataDog/zstd/zstd_compress_literals.h
generated
vendored
24
vendor/github.com/DataDog/zstd/zstd_compress_literals.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -17,17 +17,25 @@
|
|||||||
|
|
||||||
size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
|
size_t ZSTD_noCompressLiterals (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
/* ZSTD_compressRleLiteralsBlock() :
|
||||||
|
* Conditions :
|
||||||
|
* - All bytes in @src are identical
|
||||||
|
* - dstCapacity >= 4 */
|
||||||
size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
|
size_t ZSTD_compressRleLiteralsBlock (void* dst, size_t dstCapacity, const void* src, size_t srcSize);
|
||||||
|
|
||||||
/* If suspectUncompressible then some sampling checks will be run to potentially skip huffman coding */
|
/* ZSTD_compressLiterals():
|
||||||
size_t ZSTD_compressLiterals (ZSTD_hufCTables_t const* prevHuf,
|
* @entropyWorkspace: must be aligned on 4-bytes boundaries
|
||||||
ZSTD_hufCTables_t* nextHuf,
|
* @entropyWorkspaceSize : must be >= HUF_WORKSPACE_SIZE
|
||||||
ZSTD_strategy strategy, int disableLiteralCompression,
|
* @suspectUncompressible: sampling checks, to potentially skip huffman coding
|
||||||
void* dst, size_t dstCapacity,
|
*/
|
||||||
|
size_t ZSTD_compressLiterals (void* dst, size_t dstCapacity,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
void* entropyWorkspace, size_t entropyWorkspaceSize,
|
void* entropyWorkspace, size_t entropyWorkspaceSize,
|
||||||
const int bmi2,
|
const ZSTD_hufCTables_t* prevHuf,
|
||||||
unsigned suspectUncompressible);
|
ZSTD_hufCTables_t* nextHuf,
|
||||||
|
ZSTD_strategy strategy, int disableLiteralCompression,
|
||||||
|
int suspectUncompressible,
|
||||||
|
int bmi2);
|
||||||
|
|
||||||
#endif /* ZSTD_COMPRESS_LITERALS_H */
|
#endif /* ZSTD_COMPRESS_LITERALS_H */
|
||||||
|
|
||||||
|
|||||||
6
vendor/github.com/DataDog/zstd/zstd_compress_sequences.c
generated
vendored
6
vendor/github.com/DataDog/zstd/zstd_compress_sequences.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -59,7 +59,7 @@ static unsigned ZSTD_useLowProbCount(size_t const nbSeq)
|
|||||||
{
|
{
|
||||||
/* Heuristic: This should cover most blocks <= 16K and
|
/* Heuristic: This should cover most blocks <= 16K and
|
||||||
* start to fade out after 16K to about 32K depending on
|
* start to fade out after 16K to about 32K depending on
|
||||||
* comprssibility.
|
* compressibility.
|
||||||
*/
|
*/
|
||||||
return nbSeq >= 2048;
|
return nbSeq >= 2048;
|
||||||
}
|
}
|
||||||
@@ -167,7 +167,7 @@ ZSTD_selectEncodingType(
|
|||||||
if (mostFrequent == nbSeq) {
|
if (mostFrequent == nbSeq) {
|
||||||
*repeatMode = FSE_repeat_none;
|
*repeatMode = FSE_repeat_none;
|
||||||
if (isDefaultAllowed && nbSeq <= 2) {
|
if (isDefaultAllowed && nbSeq <= 2) {
|
||||||
/* Prefer set_basic over set_rle when there are 2 or less symbols,
|
/* Prefer set_basic over set_rle when there are 2 or fewer symbols,
|
||||||
* since RLE uses 1 byte, but set_basic uses 5-6 bits per symbol.
|
* since RLE uses 1 byte, but set_basic uses 5-6 bits per symbol.
|
||||||
* If basic encoding isn't possible, always choose RLE.
|
* If basic encoding isn't possible, always choose RLE.
|
||||||
*/
|
*/
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_compress_sequences.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_compress_sequences.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
371
vendor/github.com/DataDog/zstd/zstd_compress_superblock.c
generated
vendored
371
vendor/github.com/DataDog/zstd/zstd_compress_superblock.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -37,13 +37,14 @@
|
|||||||
* If it is set_compressed, first sub-block's literals section will be Treeless_Literals_Block
|
* If it is set_compressed, first sub-block's literals section will be Treeless_Literals_Block
|
||||||
* and the following sub-blocks' literals sections will be Treeless_Literals_Block.
|
* and the following sub-blocks' literals sections will be Treeless_Literals_Block.
|
||||||
* @return : compressed size of literals section of a sub-block
|
* @return : compressed size of literals section of a sub-block
|
||||||
* Or 0 if it unable to compress.
|
* Or 0 if unable to compress.
|
||||||
* Or error code */
|
* Or error code */
|
||||||
static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
static size_t
|
||||||
const ZSTD_hufCTablesMetadata_t* hufMetadata,
|
ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
||||||
const BYTE* literals, size_t litSize,
|
const ZSTD_hufCTablesMetadata_t* hufMetadata,
|
||||||
void* dst, size_t dstSize,
|
const BYTE* literals, size_t litSize,
|
||||||
const int bmi2, int writeEntropy, int* entropyWritten)
|
void* dst, size_t dstSize,
|
||||||
|
const int bmi2, int writeEntropy, int* entropyWritten)
|
||||||
{
|
{
|
||||||
size_t const header = writeEntropy ? 200 : 0;
|
size_t const header = writeEntropy ? 200 : 0;
|
||||||
size_t const lhSize = 3 + (litSize >= (1 KB - header)) + (litSize >= (16 KB - header));
|
size_t const lhSize = 3 + (litSize >= (1 KB - header)) + (litSize >= (16 KB - header));
|
||||||
@@ -54,8 +55,6 @@ static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
|||||||
symbolEncodingType_e hType = writeEntropy ? hufMetadata->hType : set_repeat;
|
symbolEncodingType_e hType = writeEntropy ? hufMetadata->hType : set_repeat;
|
||||||
size_t cLitSize = 0;
|
size_t cLitSize = 0;
|
||||||
|
|
||||||
(void)bmi2; /* TODO bmi2... */
|
|
||||||
|
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_literal (litSize=%zu, lhSize=%zu, writeEntropy=%d)", litSize, lhSize, writeEntropy);
|
DEBUGLOG(5, "ZSTD_compressSubBlock_literal (litSize=%zu, lhSize=%zu, writeEntropy=%d)", litSize, lhSize, writeEntropy);
|
||||||
|
|
||||||
*entropyWritten = 0;
|
*entropyWritten = 0;
|
||||||
@@ -77,9 +76,9 @@ static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
|||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_literal (hSize=%zu)", hufMetadata->hufDesSize);
|
DEBUGLOG(5, "ZSTD_compressSubBlock_literal (hSize=%zu)", hufMetadata->hufDesSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* TODO bmi2 */
|
{ int const flags = bmi2 ? HUF_flags_bmi2 : 0;
|
||||||
{ const size_t cSize = singleStream ? HUF_compress1X_usingCTable(op, oend-op, literals, litSize, hufTable)
|
const size_t cSize = singleStream ? HUF_compress1X_usingCTable(op, (size_t)(oend-op), literals, litSize, hufTable, flags)
|
||||||
: HUF_compress4X_usingCTable(op, oend-op, literals, litSize, hufTable);
|
: HUF_compress4X_usingCTable(op, (size_t)(oend-op), literals, litSize, hufTable, flags);
|
||||||
op += cSize;
|
op += cSize;
|
||||||
cLitSize += cSize;
|
cLitSize += cSize;
|
||||||
if (cSize == 0 || ERR_isError(cSize)) {
|
if (cSize == 0 || ERR_isError(cSize)) {
|
||||||
@@ -104,7 +103,7 @@ static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
|||||||
switch(lhSize)
|
switch(lhSize)
|
||||||
{
|
{
|
||||||
case 3: /* 2 - 2 - 10 - 10 */
|
case 3: /* 2 - 2 - 10 - 10 */
|
||||||
{ U32 const lhc = hType + ((!singleStream) << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<14);
|
{ U32 const lhc = hType + ((U32)(!singleStream) << 2) + ((U32)litSize<<4) + ((U32)cLitSize<<14);
|
||||||
MEM_writeLE24(ostart, lhc);
|
MEM_writeLE24(ostart, lhc);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -124,26 +123,30 @@ static size_t ZSTD_compressSubBlock_literal(const HUF_CElt* hufTable,
|
|||||||
}
|
}
|
||||||
*entropyWritten = 1;
|
*entropyWritten = 1;
|
||||||
DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)litSize, (U32)(op-ostart));
|
DEBUGLOG(5, "Compressed literals: %u -> %u", (U32)litSize, (U32)(op-ostart));
|
||||||
return op-ostart;
|
return (size_t)(op-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t ZSTD_seqDecompressedSize(seqStore_t const* seqStore, const seqDef* sequences, size_t nbSeq, size_t litSize, int lastSequence) {
|
static size_t
|
||||||
const seqDef* const sstart = sequences;
|
ZSTD_seqDecompressedSize(seqStore_t const* seqStore,
|
||||||
const seqDef* const send = sequences + nbSeq;
|
const seqDef* sequences, size_t nbSeqs,
|
||||||
const seqDef* sp = sstart;
|
size_t litSize, int lastSubBlock)
|
||||||
|
{
|
||||||
size_t matchLengthSum = 0;
|
size_t matchLengthSum = 0;
|
||||||
size_t litLengthSum = 0;
|
size_t litLengthSum = 0;
|
||||||
(void)(litLengthSum); /* suppress unused variable warning on some environments */
|
size_t n;
|
||||||
while (send-sp > 0) {
|
for (n=0; n<nbSeqs; n++) {
|
||||||
ZSTD_sequenceLength const seqLen = ZSTD_getSequenceLength(seqStore, sp);
|
const ZSTD_sequenceLength seqLen = ZSTD_getSequenceLength(seqStore, sequences+n);
|
||||||
litLengthSum += seqLen.litLength;
|
litLengthSum += seqLen.litLength;
|
||||||
matchLengthSum += seqLen.matchLength;
|
matchLengthSum += seqLen.matchLength;
|
||||||
sp++;
|
|
||||||
}
|
}
|
||||||
assert(litLengthSum <= litSize);
|
DEBUGLOG(5, "ZSTD_seqDecompressedSize: %u sequences from %p: %u literals + %u matchlength",
|
||||||
if (!lastSequence) {
|
(unsigned)nbSeqs, (const void*)sequences,
|
||||||
|
(unsigned)litLengthSum, (unsigned)matchLengthSum);
|
||||||
|
if (!lastSubBlock)
|
||||||
assert(litLengthSum == litSize);
|
assert(litLengthSum == litSize);
|
||||||
}
|
else
|
||||||
|
assert(litLengthSum <= litSize);
|
||||||
|
(void)litLengthSum;
|
||||||
return matchLengthSum + litSize;
|
return matchLengthSum + litSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,13 +160,14 @@ static size_t ZSTD_seqDecompressedSize(seqStore_t const* seqStore, const seqDef*
|
|||||||
* @return : compressed size of sequences section of a sub-block
|
* @return : compressed size of sequences section of a sub-block
|
||||||
* Or 0 if it is unable to compress
|
* Or 0 if it is unable to compress
|
||||||
* Or error code. */
|
* Or error code. */
|
||||||
static size_t ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables,
|
static size_t
|
||||||
const ZSTD_fseCTablesMetadata_t* fseMetadata,
|
ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables,
|
||||||
const seqDef* sequences, size_t nbSeq,
|
const ZSTD_fseCTablesMetadata_t* fseMetadata,
|
||||||
const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode,
|
const seqDef* sequences, size_t nbSeq,
|
||||||
const ZSTD_CCtx_params* cctxParams,
|
const BYTE* llCode, const BYTE* mlCode, const BYTE* ofCode,
|
||||||
void* dst, size_t dstCapacity,
|
const ZSTD_CCtx_params* cctxParams,
|
||||||
const int bmi2, int writeEntropy, int* entropyWritten)
|
void* dst, size_t dstCapacity,
|
||||||
|
const int bmi2, int writeEntropy, int* entropyWritten)
|
||||||
{
|
{
|
||||||
const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN;
|
const int longOffsets = cctxParams->cParams.windowLog > STREAM_ACCUMULATOR_MIN;
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
@@ -177,14 +181,14 @@ static size_t ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables
|
|||||||
/* Sequences Header */
|
/* Sequences Header */
|
||||||
RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/,
|
RETURN_ERROR_IF((oend-op) < 3 /*max nbSeq Size*/ + 1 /*seqHead*/,
|
||||||
dstSize_tooSmall, "");
|
dstSize_tooSmall, "");
|
||||||
if (nbSeq < 0x7F)
|
if (nbSeq < 128)
|
||||||
*op++ = (BYTE)nbSeq;
|
*op++ = (BYTE)nbSeq;
|
||||||
else if (nbSeq < LONGNBSEQ)
|
else if (nbSeq < LONGNBSEQ)
|
||||||
op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2;
|
op[0] = (BYTE)((nbSeq>>8) + 0x80), op[1] = (BYTE)nbSeq, op+=2;
|
||||||
else
|
else
|
||||||
op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3;
|
op[0]=0xFF, MEM_writeLE16(op+1, (U16)(nbSeq - LONGNBSEQ)), op+=3;
|
||||||
if (nbSeq==0) {
|
if (nbSeq==0) {
|
||||||
return op - ostart;
|
return (size_t)(op - ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* seqHead : flags for FSE encoding type */
|
/* seqHead : flags for FSE encoding type */
|
||||||
@@ -206,7 +210,7 @@ static size_t ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables
|
|||||||
}
|
}
|
||||||
|
|
||||||
{ size_t const bitstreamSize = ZSTD_encodeSequences(
|
{ size_t const bitstreamSize = ZSTD_encodeSequences(
|
||||||
op, oend - op,
|
op, (size_t)(oend - op),
|
||||||
fseTables->matchlengthCTable, mlCode,
|
fseTables->matchlengthCTable, mlCode,
|
||||||
fseTables->offcodeCTable, ofCode,
|
fseTables->offcodeCTable, ofCode,
|
||||||
fseTables->litlengthCTable, llCode,
|
fseTables->litlengthCTable, llCode,
|
||||||
@@ -250,7 +254,7 @@ static size_t ZSTD_compressSubBlock_sequences(const ZSTD_fseCTables_t* fseTables
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
*entropyWritten = 1;
|
*entropyWritten = 1;
|
||||||
return op - ostart;
|
return (size_t)(op - ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ZSTD_compressSubBlock() :
|
/** ZSTD_compressSubBlock() :
|
||||||
@@ -276,7 +280,8 @@ static size_t ZSTD_compressSubBlock(const ZSTD_entropyCTables_t* entropy,
|
|||||||
litSize, nbSeq, writeLitEntropy, writeSeqEntropy, lastBlock);
|
litSize, nbSeq, writeLitEntropy, writeSeqEntropy, lastBlock);
|
||||||
{ size_t cLitSize = ZSTD_compressSubBlock_literal((const HUF_CElt*)entropy->huf.CTable,
|
{ size_t cLitSize = ZSTD_compressSubBlock_literal((const HUF_CElt*)entropy->huf.CTable,
|
||||||
&entropyMetadata->hufMetadata, literals, litSize,
|
&entropyMetadata->hufMetadata, literals, litSize,
|
||||||
op, oend-op, bmi2, writeLitEntropy, litEntropyWritten);
|
op, (size_t)(oend-op),
|
||||||
|
bmi2, writeLitEntropy, litEntropyWritten);
|
||||||
FORWARD_IF_ERROR(cLitSize, "ZSTD_compressSubBlock_literal failed");
|
FORWARD_IF_ERROR(cLitSize, "ZSTD_compressSubBlock_literal failed");
|
||||||
if (cLitSize == 0) return 0;
|
if (cLitSize == 0) return 0;
|
||||||
op += cLitSize;
|
op += cLitSize;
|
||||||
@@ -286,18 +291,18 @@ static size_t ZSTD_compressSubBlock(const ZSTD_entropyCTables_t* entropy,
|
|||||||
sequences, nbSeq,
|
sequences, nbSeq,
|
||||||
llCode, mlCode, ofCode,
|
llCode, mlCode, ofCode,
|
||||||
cctxParams,
|
cctxParams,
|
||||||
op, oend-op,
|
op, (size_t)(oend-op),
|
||||||
bmi2, writeSeqEntropy, seqEntropyWritten);
|
bmi2, writeSeqEntropy, seqEntropyWritten);
|
||||||
FORWARD_IF_ERROR(cSeqSize, "ZSTD_compressSubBlock_sequences failed");
|
FORWARD_IF_ERROR(cSeqSize, "ZSTD_compressSubBlock_sequences failed");
|
||||||
if (cSeqSize == 0) return 0;
|
if (cSeqSize == 0) return 0;
|
||||||
op += cSeqSize;
|
op += cSeqSize;
|
||||||
}
|
}
|
||||||
/* Write block header */
|
/* Write block header */
|
||||||
{ size_t cSize = (op-ostart)-ZSTD_blockHeaderSize;
|
{ size_t cSize = (size_t)(op-ostart) - ZSTD_blockHeaderSize;
|
||||||
U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
|
U32 const cBlockHeader24 = lastBlock + (((U32)bt_compressed)<<1) + (U32)(cSize << 3);
|
||||||
MEM_writeLE24(ostart, cBlockHeader24);
|
MEM_writeLE24(ostart, cBlockHeader24);
|
||||||
}
|
}
|
||||||
return op-ostart;
|
return (size_t)(op-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t ZSTD_estimateSubBlockSize_literal(const BYTE* literals, size_t litSize,
|
static size_t ZSTD_estimateSubBlockSize_literal(const BYTE* literals, size_t litSize,
|
||||||
@@ -386,7 +391,11 @@ static size_t ZSTD_estimateSubBlockSize_sequences(const BYTE* ofCodeTable,
|
|||||||
return cSeqSizeEstimate + sequencesSectionHeaderSize;
|
return cSeqSizeEstimate + sequencesSectionHeaderSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t ZSTD_estimateSubBlockSize(const BYTE* literals, size_t litSize,
|
typedef struct {
|
||||||
|
size_t estLitSize;
|
||||||
|
size_t estBlockSize;
|
||||||
|
} EstimatedBlockSize;
|
||||||
|
static EstimatedBlockSize ZSTD_estimateSubBlockSize(const BYTE* literals, size_t litSize,
|
||||||
const BYTE* ofCodeTable,
|
const BYTE* ofCodeTable,
|
||||||
const BYTE* llCodeTable,
|
const BYTE* llCodeTable,
|
||||||
const BYTE* mlCodeTable,
|
const BYTE* mlCodeTable,
|
||||||
@@ -394,15 +403,17 @@ static size_t ZSTD_estimateSubBlockSize(const BYTE* literals, size_t litSize,
|
|||||||
const ZSTD_entropyCTables_t* entropy,
|
const ZSTD_entropyCTables_t* entropy,
|
||||||
const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
|
const ZSTD_entropyCTablesMetadata_t* entropyMetadata,
|
||||||
void* workspace, size_t wkspSize,
|
void* workspace, size_t wkspSize,
|
||||||
int writeLitEntropy, int writeSeqEntropy) {
|
int writeLitEntropy, int writeSeqEntropy)
|
||||||
size_t cSizeEstimate = 0;
|
{
|
||||||
cSizeEstimate += ZSTD_estimateSubBlockSize_literal(literals, litSize,
|
EstimatedBlockSize ebs;
|
||||||
&entropy->huf, &entropyMetadata->hufMetadata,
|
ebs.estLitSize = ZSTD_estimateSubBlockSize_literal(literals, litSize,
|
||||||
workspace, wkspSize, writeLitEntropy);
|
&entropy->huf, &entropyMetadata->hufMetadata,
|
||||||
cSizeEstimate += ZSTD_estimateSubBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable,
|
workspace, wkspSize, writeLitEntropy);
|
||||||
|
ebs.estBlockSize = ZSTD_estimateSubBlockSize_sequences(ofCodeTable, llCodeTable, mlCodeTable,
|
||||||
nbSeq, &entropy->fse, &entropyMetadata->fseMetadata,
|
nbSeq, &entropy->fse, &entropyMetadata->fseMetadata,
|
||||||
workspace, wkspSize, writeSeqEntropy);
|
workspace, wkspSize, writeSeqEntropy);
|
||||||
return cSizeEstimate + ZSTD_blockHeaderSize;
|
ebs.estBlockSize += ebs.estLitSize + ZSTD_blockHeaderSize;
|
||||||
|
return ebs;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ZSTD_needSequenceEntropyTables(ZSTD_fseCTablesMetadata_t const* fseMetadata)
|
static int ZSTD_needSequenceEntropyTables(ZSTD_fseCTablesMetadata_t const* fseMetadata)
|
||||||
@@ -416,13 +427,56 @@ static int ZSTD_needSequenceEntropyTables(ZSTD_fseCTablesMetadata_t const* fseMe
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static size_t countLiterals(seqStore_t const* seqStore, const seqDef* sp, size_t seqCount)
|
||||||
|
{
|
||||||
|
size_t n, total = 0;
|
||||||
|
assert(sp != NULL);
|
||||||
|
for (n=0; n<seqCount; n++) {
|
||||||
|
total += ZSTD_getSequenceLength(seqStore, sp+n).litLength;
|
||||||
|
}
|
||||||
|
DEBUGLOG(6, "countLiterals for %zu sequences from %p => %zu bytes", seqCount, (const void*)sp, total);
|
||||||
|
return total;
|
||||||
|
}
|
||||||
|
|
||||||
|
#define BYTESCALE 256
|
||||||
|
|
||||||
|
static size_t sizeBlockSequences(const seqDef* sp, size_t nbSeqs,
|
||||||
|
size_t targetBudget, size_t avgLitCost, size_t avgSeqCost,
|
||||||
|
int firstSubBlock)
|
||||||
|
{
|
||||||
|
size_t n, budget = 0, inSize=0;
|
||||||
|
/* entropy headers */
|
||||||
|
size_t const headerSize = (size_t)firstSubBlock * 120 * BYTESCALE; /* generous estimate */
|
||||||
|
assert(firstSubBlock==0 || firstSubBlock==1);
|
||||||
|
budget += headerSize;
|
||||||
|
|
||||||
|
/* first sequence => at least one sequence*/
|
||||||
|
budget += sp[0].litLength * avgLitCost + avgSeqCost;
|
||||||
|
if (budget > targetBudget) return 1;
|
||||||
|
inSize = sp[0].litLength + (sp[0].mlBase+MINMATCH);
|
||||||
|
|
||||||
|
/* loop over sequences */
|
||||||
|
for (n=1; n<nbSeqs; n++) {
|
||||||
|
size_t currentCost = sp[n].litLength * avgLitCost + avgSeqCost;
|
||||||
|
budget += currentCost;
|
||||||
|
inSize += sp[n].litLength + (sp[n].mlBase+MINMATCH);
|
||||||
|
/* stop when sub-block budget is reached */
|
||||||
|
if ( (budget > targetBudget)
|
||||||
|
/* though continue to expand until the sub-block is deemed compressible */
|
||||||
|
&& (budget < inSize * BYTESCALE) )
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
|
||||||
/** ZSTD_compressSubBlock_multi() :
|
/** ZSTD_compressSubBlock_multi() :
|
||||||
* Breaks super-block into multiple sub-blocks and compresses them.
|
* Breaks super-block into multiple sub-blocks and compresses them.
|
||||||
* Entropy will be written to the first block.
|
* Entropy will be written into the first block.
|
||||||
* The following blocks will use repeat mode to compress.
|
* The following blocks use repeat_mode to compress.
|
||||||
* All sub-blocks are compressed blocks (no raw or rle blocks).
|
* Sub-blocks are all compressed, except the last one when beneficial.
|
||||||
* @return : compressed size of the super block (which is multiple ZSTD blocks)
|
* @return : compressed size of the super block (which features multiple ZSTD blocks)
|
||||||
* Or 0 if it failed to compress. */
|
* or 0 if it failed to compress. */
|
||||||
static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
|
static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
|
||||||
const ZSTD_compressedBlockState_t* prevCBlock,
|
const ZSTD_compressedBlockState_t* prevCBlock,
|
||||||
ZSTD_compressedBlockState_t* nextCBlock,
|
ZSTD_compressedBlockState_t* nextCBlock,
|
||||||
@@ -435,10 +489,12 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
|
|||||||
{
|
{
|
||||||
const seqDef* const sstart = seqStorePtr->sequencesStart;
|
const seqDef* const sstart = seqStorePtr->sequencesStart;
|
||||||
const seqDef* const send = seqStorePtr->sequences;
|
const seqDef* const send = seqStorePtr->sequences;
|
||||||
const seqDef* sp = sstart;
|
const seqDef* sp = sstart; /* tracks progresses within seqStorePtr->sequences */
|
||||||
|
size_t const nbSeqs = (size_t)(send - sstart);
|
||||||
const BYTE* const lstart = seqStorePtr->litStart;
|
const BYTE* const lstart = seqStorePtr->litStart;
|
||||||
const BYTE* const lend = seqStorePtr->lit;
|
const BYTE* const lend = seqStorePtr->lit;
|
||||||
const BYTE* lp = lstart;
|
const BYTE* lp = lstart;
|
||||||
|
size_t const nbLiterals = (size_t)(lend - lstart);
|
||||||
BYTE const* ip = (BYTE const*)src;
|
BYTE const* ip = (BYTE const*)src;
|
||||||
BYTE const* const iend = ip + srcSize;
|
BYTE const* const iend = ip + srcSize;
|
||||||
BYTE* const ostart = (BYTE*)dst;
|
BYTE* const ostart = (BYTE*)dst;
|
||||||
@@ -447,112 +503,171 @@ static size_t ZSTD_compressSubBlock_multi(const seqStore_t* seqStorePtr,
|
|||||||
const BYTE* llCodePtr = seqStorePtr->llCode;
|
const BYTE* llCodePtr = seqStorePtr->llCode;
|
||||||
const BYTE* mlCodePtr = seqStorePtr->mlCode;
|
const BYTE* mlCodePtr = seqStorePtr->mlCode;
|
||||||
const BYTE* ofCodePtr = seqStorePtr->ofCode;
|
const BYTE* ofCodePtr = seqStorePtr->ofCode;
|
||||||
size_t targetCBlockSize = cctxParams->targetCBlockSize;
|
size_t const minTarget = ZSTD_TARGETCBLOCKSIZE_MIN; /* enforce minimum size, to reduce undesirable side effects */
|
||||||
size_t litSize, seqCount;
|
size_t const targetCBlockSize = MAX(minTarget, cctxParams->targetCBlockSize);
|
||||||
int writeLitEntropy = entropyMetadata->hufMetadata.hType == set_compressed;
|
int writeLitEntropy = (entropyMetadata->hufMetadata.hType == set_compressed);
|
||||||
int writeSeqEntropy = 1;
|
int writeSeqEntropy = 1;
|
||||||
int lastSequence = 0;
|
|
||||||
|
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_multi (litSize=%u, nbSeq=%u)",
|
DEBUGLOG(5, "ZSTD_compressSubBlock_multi (srcSize=%u, litSize=%u, nbSeq=%u)",
|
||||||
(unsigned)(lend-lp), (unsigned)(send-sstart));
|
(unsigned)srcSize, (unsigned)(lend-lstart), (unsigned)(send-sstart));
|
||||||
|
|
||||||
litSize = 0;
|
/* let's start by a general estimation for the full block */
|
||||||
seqCount = 0;
|
if (nbSeqs > 0) {
|
||||||
do {
|
EstimatedBlockSize const ebs =
|
||||||
size_t cBlockSizeEstimate = 0;
|
ZSTD_estimateSubBlockSize(lp, nbLiterals,
|
||||||
if (sstart == send) {
|
ofCodePtr, llCodePtr, mlCodePtr, nbSeqs,
|
||||||
lastSequence = 1;
|
&nextCBlock->entropy, entropyMetadata,
|
||||||
} else {
|
workspace, wkspSize,
|
||||||
const seqDef* const sequence = sp + seqCount;
|
writeLitEntropy, writeSeqEntropy);
|
||||||
lastSequence = sequence == send - 1;
|
/* quick estimation */
|
||||||
litSize += ZSTD_getSequenceLength(seqStorePtr, sequence).litLength;
|
size_t const avgLitCost = nbLiterals ? (ebs.estLitSize * BYTESCALE) / nbLiterals : BYTESCALE;
|
||||||
seqCount++;
|
size_t const avgSeqCost = ((ebs.estBlockSize - ebs.estLitSize) * BYTESCALE) / nbSeqs;
|
||||||
|
const size_t nbSubBlocks = MAX((ebs.estBlockSize + (targetCBlockSize/2)) / targetCBlockSize, 1);
|
||||||
|
size_t n, avgBlockBudget, blockBudgetSupp=0;
|
||||||
|
avgBlockBudget = (ebs.estBlockSize * BYTESCALE) / nbSubBlocks;
|
||||||
|
DEBUGLOG(5, "estimated fullblock size=%u bytes ; avgLitCost=%.2f ; avgSeqCost=%.2f ; targetCBlockSize=%u, nbSubBlocks=%u ; avgBlockBudget=%.0f bytes",
|
||||||
|
(unsigned)ebs.estBlockSize, (double)avgLitCost/BYTESCALE, (double)avgSeqCost/BYTESCALE,
|
||||||
|
(unsigned)targetCBlockSize, (unsigned)nbSubBlocks, (double)avgBlockBudget/BYTESCALE);
|
||||||
|
/* simplification: if estimates states that the full superblock doesn't compress, just bail out immediately
|
||||||
|
* this will result in the production of a single uncompressed block covering @srcSize.*/
|
||||||
|
if (ebs.estBlockSize > srcSize) return 0;
|
||||||
|
|
||||||
|
/* compress and write sub-blocks */
|
||||||
|
assert(nbSubBlocks>0);
|
||||||
|
for (n=0; n < nbSubBlocks-1; n++) {
|
||||||
|
/* determine nb of sequences for current sub-block + nbLiterals from next sequence */
|
||||||
|
size_t const seqCount = sizeBlockSequences(sp, (size_t)(send-sp),
|
||||||
|
avgBlockBudget + blockBudgetSupp, avgLitCost, avgSeqCost, n==0);
|
||||||
|
/* if reached last sequence : break to last sub-block (simplification) */
|
||||||
|
assert(seqCount <= (size_t)(send-sp));
|
||||||
|
if (sp + seqCount == send) break;
|
||||||
|
assert(seqCount > 0);
|
||||||
|
/* compress sub-block */
|
||||||
|
{ int litEntropyWritten = 0;
|
||||||
|
int seqEntropyWritten = 0;
|
||||||
|
size_t litSize = countLiterals(seqStorePtr, sp, seqCount);
|
||||||
|
const size_t decompressedSize =
|
||||||
|
ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, 0);
|
||||||
|
size_t const cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata,
|
||||||
|
sp, seqCount,
|
||||||
|
lp, litSize,
|
||||||
|
llCodePtr, mlCodePtr, ofCodePtr,
|
||||||
|
cctxParams,
|
||||||
|
op, (size_t)(oend-op),
|
||||||
|
bmi2, writeLitEntropy, writeSeqEntropy,
|
||||||
|
&litEntropyWritten, &seqEntropyWritten,
|
||||||
|
0);
|
||||||
|
FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed");
|
||||||
|
|
||||||
|
/* check compressibility, update state components */
|
||||||
|
if (cSize > 0 && cSize < decompressedSize) {
|
||||||
|
DEBUGLOG(5, "Committed sub-block compressing %u bytes => %u bytes",
|
||||||
|
(unsigned)decompressedSize, (unsigned)cSize);
|
||||||
|
assert(ip + decompressedSize <= iend);
|
||||||
|
ip += decompressedSize;
|
||||||
|
lp += litSize;
|
||||||
|
op += cSize;
|
||||||
|
llCodePtr += seqCount;
|
||||||
|
mlCodePtr += seqCount;
|
||||||
|
ofCodePtr += seqCount;
|
||||||
|
/* Entropy only needs to be written once */
|
||||||
|
if (litEntropyWritten) {
|
||||||
|
writeLitEntropy = 0;
|
||||||
|
}
|
||||||
|
if (seqEntropyWritten) {
|
||||||
|
writeSeqEntropy = 0;
|
||||||
|
}
|
||||||
|
sp += seqCount;
|
||||||
|
blockBudgetSupp = 0;
|
||||||
|
} }
|
||||||
|
/* otherwise : do not compress yet, coalesce current sub-block with following one */
|
||||||
}
|
}
|
||||||
if (lastSequence) {
|
} /* if (nbSeqs > 0) */
|
||||||
assert(lp <= lend);
|
|
||||||
assert(litSize <= (size_t)(lend - lp));
|
/* write last block */
|
||||||
litSize = (size_t)(lend - lp);
|
DEBUGLOG(5, "Generate last sub-block: %u sequences remaining", (unsigned)(send - sp));
|
||||||
}
|
{ int litEntropyWritten = 0;
|
||||||
/* I think there is an optimization opportunity here.
|
int seqEntropyWritten = 0;
|
||||||
* Calling ZSTD_estimateSubBlockSize for every sequence can be wasteful
|
size_t litSize = (size_t)(lend - lp);
|
||||||
* since it recalculates estimate from scratch.
|
size_t seqCount = (size_t)(send - sp);
|
||||||
* For example, it would recount literal distribution and symbol codes every time.
|
const size_t decompressedSize =
|
||||||
*/
|
ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, 1);
|
||||||
cBlockSizeEstimate = ZSTD_estimateSubBlockSize(lp, litSize, ofCodePtr, llCodePtr, mlCodePtr, seqCount,
|
size_t const cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata,
|
||||||
&nextCBlock->entropy, entropyMetadata,
|
sp, seqCount,
|
||||||
workspace, wkspSize, writeLitEntropy, writeSeqEntropy);
|
lp, litSize,
|
||||||
if (cBlockSizeEstimate > targetCBlockSize || lastSequence) {
|
llCodePtr, mlCodePtr, ofCodePtr,
|
||||||
int litEntropyWritten = 0;
|
cctxParams,
|
||||||
int seqEntropyWritten = 0;
|
op, (size_t)(oend-op),
|
||||||
const size_t decompressedSize = ZSTD_seqDecompressedSize(seqStorePtr, sp, seqCount, litSize, lastSequence);
|
bmi2, writeLitEntropy, writeSeqEntropy,
|
||||||
const size_t cSize = ZSTD_compressSubBlock(&nextCBlock->entropy, entropyMetadata,
|
&litEntropyWritten, &seqEntropyWritten,
|
||||||
sp, seqCount,
|
lastBlock);
|
||||||
lp, litSize,
|
FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed");
|
||||||
llCodePtr, mlCodePtr, ofCodePtr,
|
|
||||||
cctxParams,
|
/* update pointers, the nb of literals borrowed from next sequence must be preserved */
|
||||||
op, oend-op,
|
if (cSize > 0 && cSize < decompressedSize) {
|
||||||
bmi2, writeLitEntropy, writeSeqEntropy,
|
DEBUGLOG(5, "Last sub-block compressed %u bytes => %u bytes",
|
||||||
&litEntropyWritten, &seqEntropyWritten,
|
(unsigned)decompressedSize, (unsigned)cSize);
|
||||||
lastBlock && lastSequence);
|
assert(ip + decompressedSize <= iend);
|
||||||
FORWARD_IF_ERROR(cSize, "ZSTD_compressSubBlock failed");
|
ip += decompressedSize;
|
||||||
if (cSize > 0 && cSize < decompressedSize) {
|
lp += litSize;
|
||||||
DEBUGLOG(5, "Committed the sub-block");
|
op += cSize;
|
||||||
assert(ip + decompressedSize <= iend);
|
llCodePtr += seqCount;
|
||||||
ip += decompressedSize;
|
mlCodePtr += seqCount;
|
||||||
sp += seqCount;
|
ofCodePtr += seqCount;
|
||||||
lp += litSize;
|
/* Entropy only needs to be written once */
|
||||||
op += cSize;
|
if (litEntropyWritten) {
|
||||||
llCodePtr += seqCount;
|
writeLitEntropy = 0;
|
||||||
mlCodePtr += seqCount;
|
|
||||||
ofCodePtr += seqCount;
|
|
||||||
litSize = 0;
|
|
||||||
seqCount = 0;
|
|
||||||
/* Entropy only needs to be written once */
|
|
||||||
if (litEntropyWritten) {
|
|
||||||
writeLitEntropy = 0;
|
|
||||||
}
|
|
||||||
if (seqEntropyWritten) {
|
|
||||||
writeSeqEntropy = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
if (seqEntropyWritten) {
|
||||||
|
writeSeqEntropy = 0;
|
||||||
|
}
|
||||||
|
sp += seqCount;
|
||||||
}
|
}
|
||||||
} while (!lastSequence);
|
}
|
||||||
|
|
||||||
|
|
||||||
if (writeLitEntropy) {
|
if (writeLitEntropy) {
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_multi has literal entropy tables unwritten");
|
DEBUGLOG(5, "Literal entropy tables were never written");
|
||||||
ZSTD_memcpy(&nextCBlock->entropy.huf, &prevCBlock->entropy.huf, sizeof(prevCBlock->entropy.huf));
|
ZSTD_memcpy(&nextCBlock->entropy.huf, &prevCBlock->entropy.huf, sizeof(prevCBlock->entropy.huf));
|
||||||
}
|
}
|
||||||
if (writeSeqEntropy && ZSTD_needSequenceEntropyTables(&entropyMetadata->fseMetadata)) {
|
if (writeSeqEntropy && ZSTD_needSequenceEntropyTables(&entropyMetadata->fseMetadata)) {
|
||||||
/* If we haven't written our entropy tables, then we've violated our contract and
|
/* If we haven't written our entropy tables, then we've violated our contract and
|
||||||
* must emit an uncompressed block.
|
* must emit an uncompressed block.
|
||||||
*/
|
*/
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_multi has sequence entropy tables unwritten");
|
DEBUGLOG(5, "Sequence entropy tables were never written => cancel, emit an uncompressed block");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ip < iend) {
|
if (ip < iend) {
|
||||||
size_t const cSize = ZSTD_noCompressBlock(op, oend - op, ip, iend - ip, lastBlock);
|
/* some data left : last part of the block sent uncompressed */
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_multi last sub-block uncompressed, %zu bytes", (size_t)(iend - ip));
|
size_t const rSize = (size_t)((iend - ip));
|
||||||
|
size_t const cSize = ZSTD_noCompressBlock(op, (size_t)(oend - op), ip, rSize, lastBlock);
|
||||||
|
DEBUGLOG(5, "Generate last uncompressed sub-block of %u bytes", (unsigned)(rSize));
|
||||||
FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
|
FORWARD_IF_ERROR(cSize, "ZSTD_noCompressBlock failed");
|
||||||
assert(cSize != 0);
|
assert(cSize != 0);
|
||||||
op += cSize;
|
op += cSize;
|
||||||
/* We have to regenerate the repcodes because we've skipped some sequences */
|
/* We have to regenerate the repcodes because we've skipped some sequences */
|
||||||
if (sp < send) {
|
if (sp < send) {
|
||||||
seqDef const* seq;
|
const seqDef* seq;
|
||||||
repcodes_t rep;
|
repcodes_t rep;
|
||||||
ZSTD_memcpy(&rep, prevCBlock->rep, sizeof(rep));
|
ZSTD_memcpy(&rep, prevCBlock->rep, sizeof(rep));
|
||||||
for (seq = sstart; seq < sp; ++seq) {
|
for (seq = sstart; seq < sp; ++seq) {
|
||||||
ZSTD_updateRep(rep.rep, seq->offBase - 1, ZSTD_getSequenceLength(seqStorePtr, seq).litLength == 0);
|
ZSTD_updateRep(rep.rep, seq->offBase, ZSTD_getSequenceLength(seqStorePtr, seq).litLength == 0);
|
||||||
}
|
}
|
||||||
ZSTD_memcpy(nextCBlock->rep, &rep, sizeof(rep));
|
ZSTD_memcpy(nextCBlock->rep, &rep, sizeof(rep));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
DEBUGLOG(5, "ZSTD_compressSubBlock_multi compressed");
|
|
||||||
return op-ostart;
|
DEBUGLOG(5, "ZSTD_compressSubBlock_multi compressed all subBlocks: total compressed size = %u",
|
||||||
|
(unsigned)(op-ostart));
|
||||||
|
return (size_t)(op-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc,
|
size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc,
|
||||||
void* dst, size_t dstCapacity,
|
void* dst, size_t dstCapacity,
|
||||||
void const* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
unsigned lastBlock) {
|
unsigned lastBlock)
|
||||||
|
{
|
||||||
ZSTD_entropyCTablesMetadata_t entropyMetadata;
|
ZSTD_entropyCTablesMetadata_t entropyMetadata;
|
||||||
|
|
||||||
FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore,
|
FORWARD_IF_ERROR(ZSTD_buildBlockEntropyStats(&zc->seqStore,
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_compress_superblock.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_compress_superblock.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
220
vendor/github.com/DataDog/zstd/zstd_cwksp.h
generated
vendored
220
vendor/github.com/DataDog/zstd/zstd_cwksp.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -15,7 +15,9 @@
|
|||||||
/*-*************************************
|
/*-*************************************
|
||||||
* Dependencies
|
* Dependencies
|
||||||
***************************************/
|
***************************************/
|
||||||
|
#include "allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */
|
||||||
#include "zstd_internal.h"
|
#include "zstd_internal.h"
|
||||||
|
#include "portability_macros.h"
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
extern "C" {
|
extern "C" {
|
||||||
@@ -45,8 +47,9 @@ extern "C" {
|
|||||||
***************************************/
|
***************************************/
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ZSTD_cwksp_alloc_objects,
|
ZSTD_cwksp_alloc_objects,
|
||||||
ZSTD_cwksp_alloc_buffers,
|
ZSTD_cwksp_alloc_aligned_init_once,
|
||||||
ZSTD_cwksp_alloc_aligned
|
ZSTD_cwksp_alloc_aligned,
|
||||||
|
ZSTD_cwksp_alloc_buffers
|
||||||
} ZSTD_cwksp_alloc_phase_e;
|
} ZSTD_cwksp_alloc_phase_e;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -99,8 +102,8 @@ typedef enum {
|
|||||||
*
|
*
|
||||||
* Workspace Layout:
|
* Workspace Layout:
|
||||||
*
|
*
|
||||||
* [ ... workspace ... ]
|
* [ ... workspace ... ]
|
||||||
* [objects][tables ... ->] free space [<- ... aligned][<- ... buffers]
|
* [objects][tables ->] free space [<- buffers][<- aligned][<- init once]
|
||||||
*
|
*
|
||||||
* The various objects that live in the workspace are divided into the
|
* The various objects that live in the workspace are divided into the
|
||||||
* following categories, and are allocated separately:
|
* following categories, and are allocated separately:
|
||||||
@@ -124,9 +127,18 @@ typedef enum {
|
|||||||
* uint32_t arrays, all of whose values are between 0 and (nextSrc - base).
|
* uint32_t arrays, all of whose values are between 0 and (nextSrc - base).
|
||||||
* Their sizes depend on the cparams. These tables are 64-byte aligned.
|
* Their sizes depend on the cparams. These tables are 64-byte aligned.
|
||||||
*
|
*
|
||||||
* - Aligned: these buffers are used for various purposes that require 4 byte
|
* - Init once: these buffers require to be initialized at least once before
|
||||||
* alignment, but don't require any initialization before they're used. These
|
* use. They should be used when we want to skip memory initialization
|
||||||
* buffers are each aligned to 64 bytes.
|
* while not triggering memory checkers (like Valgrind) when reading from
|
||||||
|
* from this memory without writing to it first.
|
||||||
|
* These buffers should be used carefully as they might contain data
|
||||||
|
* from previous compressions.
|
||||||
|
* Buffers are aligned to 64 bytes.
|
||||||
|
*
|
||||||
|
* - Aligned: these buffers don't require any initialization before they're
|
||||||
|
* used. The user of the buffer should make sure they write into a buffer
|
||||||
|
* location before reading from it.
|
||||||
|
* Buffers are aligned to 64 bytes.
|
||||||
*
|
*
|
||||||
* - Buffers: these buffers are used for various purposes that don't require
|
* - Buffers: these buffers are used for various purposes that don't require
|
||||||
* any alignment or initialization before they're used. This means they can
|
* any alignment or initialization before they're used. This means they can
|
||||||
@@ -138,8 +150,9 @@ typedef enum {
|
|||||||
* correctly packed into the workspace buffer. That order is:
|
* correctly packed into the workspace buffer. That order is:
|
||||||
*
|
*
|
||||||
* 1. Objects
|
* 1. Objects
|
||||||
* 2. Buffers
|
* 2. Init once / Tables
|
||||||
* 3. Aligned/Tables
|
* 3. Aligned / Tables
|
||||||
|
* 4. Buffers / Tables
|
||||||
*
|
*
|
||||||
* Attempts to reserve objects of different types out of order will fail.
|
* Attempts to reserve objects of different types out of order will fail.
|
||||||
*/
|
*/
|
||||||
@@ -151,6 +164,7 @@ typedef struct {
|
|||||||
void* tableEnd;
|
void* tableEnd;
|
||||||
void* tableValidEnd;
|
void* tableValidEnd;
|
||||||
void* allocStart;
|
void* allocStart;
|
||||||
|
void* initOnceStart;
|
||||||
|
|
||||||
BYTE allocFailed;
|
BYTE allocFailed;
|
||||||
int workspaceOversizedDuration;
|
int workspaceOversizedDuration;
|
||||||
@@ -163,6 +177,7 @@ typedef struct {
|
|||||||
***************************************/
|
***************************************/
|
||||||
|
|
||||||
MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws);
|
MEM_STATIC size_t ZSTD_cwksp_available_space(ZSTD_cwksp* ws);
|
||||||
|
MEM_STATIC void* ZSTD_cwksp_initialAllocStart(ZSTD_cwksp* ws);
|
||||||
|
|
||||||
MEM_STATIC void ZSTD_cwksp_assert_internal_consistency(ZSTD_cwksp* ws) {
|
MEM_STATIC void ZSTD_cwksp_assert_internal_consistency(ZSTD_cwksp* ws) {
|
||||||
(void)ws;
|
(void)ws;
|
||||||
@@ -172,6 +187,21 @@ MEM_STATIC void ZSTD_cwksp_assert_internal_consistency(ZSTD_cwksp* ws) {
|
|||||||
assert(ws->tableEnd <= ws->allocStart);
|
assert(ws->tableEnd <= ws->allocStart);
|
||||||
assert(ws->tableValidEnd <= ws->allocStart);
|
assert(ws->tableValidEnd <= ws->allocStart);
|
||||||
assert(ws->allocStart <= ws->workspaceEnd);
|
assert(ws->allocStart <= ws->workspaceEnd);
|
||||||
|
assert(ws->initOnceStart <= ZSTD_cwksp_initialAllocStart(ws));
|
||||||
|
assert(ws->workspace <= ws->initOnceStart);
|
||||||
|
#if ZSTD_MEMORY_SANITIZER
|
||||||
|
{
|
||||||
|
intptr_t const offset = __msan_test_shadow(ws->initOnceStart,
|
||||||
|
(U8*)ZSTD_cwksp_initialAllocStart(ws) - (U8*)ws->initOnceStart);
|
||||||
|
(void)offset;
|
||||||
|
#if defined(ZSTD_MSAN_PRINT)
|
||||||
|
if(offset!=-1) {
|
||||||
|
__msan_print_shadow((U8*)ws->initOnceStart + offset - 8, 32);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
assert(offset==-1);
|
||||||
|
};
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -218,14 +248,10 @@ MEM_STATIC size_t ZSTD_cwksp_aligned_alloc_size(size_t size) {
|
|||||||
* for internal purposes (currently only alignment).
|
* for internal purposes (currently only alignment).
|
||||||
*/
|
*/
|
||||||
MEM_STATIC size_t ZSTD_cwksp_slack_space_required(void) {
|
MEM_STATIC size_t ZSTD_cwksp_slack_space_required(void) {
|
||||||
/* For alignment, the wksp will always allocate an additional n_1=[1, 64] bytes
|
/* For alignment, the wksp will always allocate an additional 2*ZSTD_CWKSP_ALIGNMENT_BYTES
|
||||||
* to align the beginning of tables section, as well as another n_2=[0, 63] bytes
|
* bytes to align the beginning of tables section and end of buffers;
|
||||||
* to align the beginning of the aligned section.
|
|
||||||
*
|
|
||||||
* n_1 + n_2 == 64 bytes if the cwksp is freshly allocated, due to tables and
|
|
||||||
* aligneds being sized in multiples of 64 bytes.
|
|
||||||
*/
|
*/
|
||||||
size_t const slackSpace = ZSTD_CWKSP_ALIGNMENT_BYTES;
|
size_t const slackSpace = ZSTD_CWKSP_ALIGNMENT_BYTES * 2;
|
||||||
return slackSpace;
|
return slackSpace;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -238,10 +264,18 @@ MEM_STATIC size_t ZSTD_cwksp_bytes_to_align_ptr(void* ptr, const size_t alignByt
|
|||||||
size_t const alignBytesMask = alignBytes - 1;
|
size_t const alignBytesMask = alignBytes - 1;
|
||||||
size_t const bytes = (alignBytes - ((size_t)ptr & (alignBytesMask))) & alignBytesMask;
|
size_t const bytes = (alignBytes - ((size_t)ptr & (alignBytesMask))) & alignBytesMask;
|
||||||
assert((alignBytes & alignBytesMask) == 0);
|
assert((alignBytes & alignBytesMask) == 0);
|
||||||
assert(bytes != ZSTD_CWKSP_ALIGNMENT_BYTES);
|
assert(bytes < alignBytes);
|
||||||
return bytes;
|
return bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the initial value for allocStart which is used to determine the position from
|
||||||
|
* which we can allocate from the end of the workspace.
|
||||||
|
*/
|
||||||
|
MEM_STATIC void* ZSTD_cwksp_initialAllocStart(ZSTD_cwksp* ws) {
|
||||||
|
return (void*)((size_t)ws->workspaceEnd & ~(ZSTD_CWKSP_ALIGNMENT_BYTES-1));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Internal function. Do not use directly.
|
* Internal function. Do not use directly.
|
||||||
* Reserves the given number of bytes within the aligned/buffer segment of the wksp,
|
* Reserves the given number of bytes within the aligned/buffer segment of the wksp,
|
||||||
@@ -282,27 +316,16 @@ ZSTD_cwksp_internal_advance_phase(ZSTD_cwksp* ws, ZSTD_cwksp_alloc_phase_e phase
|
|||||||
{
|
{
|
||||||
assert(phase >= ws->phase);
|
assert(phase >= ws->phase);
|
||||||
if (phase > ws->phase) {
|
if (phase > ws->phase) {
|
||||||
/* Going from allocating objects to allocating buffers */
|
/* Going from allocating objects to allocating initOnce / tables */
|
||||||
if (ws->phase < ZSTD_cwksp_alloc_buffers &&
|
if (ws->phase < ZSTD_cwksp_alloc_aligned_init_once &&
|
||||||
phase >= ZSTD_cwksp_alloc_buffers) {
|
phase >= ZSTD_cwksp_alloc_aligned_init_once) {
|
||||||
ws->tableValidEnd = ws->objectEnd;
|
ws->tableValidEnd = ws->objectEnd;
|
||||||
}
|
ws->initOnceStart = ZSTD_cwksp_initialAllocStart(ws);
|
||||||
|
|
||||||
/* Going from allocating buffers to allocating aligneds/tables */
|
|
||||||
if (ws->phase < ZSTD_cwksp_alloc_aligned &&
|
|
||||||
phase >= ZSTD_cwksp_alloc_aligned) {
|
|
||||||
{ /* Align the start of the "aligned" to 64 bytes. Use [1, 64] bytes. */
|
|
||||||
size_t const bytesToAlign =
|
|
||||||
ZSTD_CWKSP_ALIGNMENT_BYTES - ZSTD_cwksp_bytes_to_align_ptr(ws->allocStart, ZSTD_CWKSP_ALIGNMENT_BYTES);
|
|
||||||
DEBUGLOG(5, "reserving aligned alignment addtl space: %zu", bytesToAlign);
|
|
||||||
ZSTD_STATIC_ASSERT((ZSTD_CWKSP_ALIGNMENT_BYTES & (ZSTD_CWKSP_ALIGNMENT_BYTES - 1)) == 0); /* power of 2 */
|
|
||||||
RETURN_ERROR_IF(!ZSTD_cwksp_reserve_internal_buffer_space(ws, bytesToAlign),
|
|
||||||
memory_allocation, "aligned phase - alignment initial allocation failed!");
|
|
||||||
}
|
|
||||||
{ /* Align the start of the tables to 64 bytes. Use [0, 63] bytes */
|
{ /* Align the start of the tables to 64 bytes. Use [0, 63] bytes */
|
||||||
void* const alloc = ws->objectEnd;
|
void *const alloc = ws->objectEnd;
|
||||||
size_t const bytesToAlign = ZSTD_cwksp_bytes_to_align_ptr(alloc, ZSTD_CWKSP_ALIGNMENT_BYTES);
|
size_t const bytesToAlign = ZSTD_cwksp_bytes_to_align_ptr(alloc, ZSTD_CWKSP_ALIGNMENT_BYTES);
|
||||||
void* const objectEnd = (BYTE*)alloc + bytesToAlign;
|
void *const objectEnd = (BYTE *) alloc + bytesToAlign;
|
||||||
DEBUGLOG(5, "reserving table alignment addtl space: %zu", bytesToAlign);
|
DEBUGLOG(5, "reserving table alignment addtl space: %zu", bytesToAlign);
|
||||||
RETURN_ERROR_IF(objectEnd > ws->workspaceEnd, memory_allocation,
|
RETURN_ERROR_IF(objectEnd > ws->workspaceEnd, memory_allocation,
|
||||||
"table phase - alignment initial allocation failed!");
|
"table phase - alignment initial allocation failed!");
|
||||||
@@ -310,7 +333,9 @@ ZSTD_cwksp_internal_advance_phase(ZSTD_cwksp* ws, ZSTD_cwksp_alloc_phase_e phase
|
|||||||
ws->tableEnd = objectEnd; /* table area starts being empty */
|
ws->tableEnd = objectEnd; /* table area starts being empty */
|
||||||
if (ws->tableValidEnd < ws->tableEnd) {
|
if (ws->tableValidEnd < ws->tableEnd) {
|
||||||
ws->tableValidEnd = ws->tableEnd;
|
ws->tableValidEnd = ws->tableEnd;
|
||||||
} } }
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
ws->phase = phase;
|
ws->phase = phase;
|
||||||
ZSTD_cwksp_assert_internal_consistency(ws);
|
ZSTD_cwksp_assert_internal_consistency(ws);
|
||||||
}
|
}
|
||||||
@@ -322,7 +347,7 @@ ZSTD_cwksp_internal_advance_phase(ZSTD_cwksp* ws, ZSTD_cwksp_alloc_phase_e phase
|
|||||||
*/
|
*/
|
||||||
MEM_STATIC int ZSTD_cwksp_owns_buffer(const ZSTD_cwksp* ws, const void* ptr)
|
MEM_STATIC int ZSTD_cwksp_owns_buffer(const ZSTD_cwksp* ws, const void* ptr)
|
||||||
{
|
{
|
||||||
return (ptr != NULL) && (ws->workspace <= ptr) && (ptr <= ws->workspaceEnd);
|
return (ptr != NULL) && (ws->workspace <= ptr) && (ptr < ws->workspaceEnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -349,7 +374,9 @@ ZSTD_cwksp_reserve_internal(ZSTD_cwksp* ws, size_t bytes, ZSTD_cwksp_alloc_phase
|
|||||||
if (alloc) {
|
if (alloc) {
|
||||||
alloc = (BYTE *)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE;
|
alloc = (BYTE *)alloc + ZSTD_CWKSP_ASAN_REDZONE_SIZE;
|
||||||
if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
|
if (ws->isStatic == ZSTD_cwksp_dynamic_alloc) {
|
||||||
__asan_unpoison_memory_region(alloc, bytes);
|
/* We need to keep the redzone poisoned while unpoisoning the bytes that
|
||||||
|
* are actually allocated. */
|
||||||
|
__asan_unpoison_memory_region(alloc, bytes - 2 * ZSTD_CWKSP_ASAN_REDZONE_SIZE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -365,6 +392,36 @@ MEM_STATIC BYTE* ZSTD_cwksp_reserve_buffer(ZSTD_cwksp* ws, size_t bytes)
|
|||||||
return (BYTE*)ZSTD_cwksp_reserve_internal(ws, bytes, ZSTD_cwksp_alloc_buffers);
|
return (BYTE*)ZSTD_cwksp_reserve_internal(ws, bytes, ZSTD_cwksp_alloc_buffers);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes).
|
||||||
|
* This memory has been initialized at least once in the past.
|
||||||
|
* This doesn't mean it has been initialized this time, and it might contain data from previous
|
||||||
|
* operations.
|
||||||
|
* The main usage is for algorithms that might need read access into uninitialized memory.
|
||||||
|
* The algorithm must maintain safety under these conditions and must make sure it doesn't
|
||||||
|
* leak any of the past data (directly or in side channels).
|
||||||
|
*/
|
||||||
|
MEM_STATIC void* ZSTD_cwksp_reserve_aligned_init_once(ZSTD_cwksp* ws, size_t bytes)
|
||||||
|
{
|
||||||
|
size_t const alignedBytes = ZSTD_cwksp_align(bytes, ZSTD_CWKSP_ALIGNMENT_BYTES);
|
||||||
|
void* ptr = ZSTD_cwksp_reserve_internal(ws, alignedBytes, ZSTD_cwksp_alloc_aligned_init_once);
|
||||||
|
assert(((size_t)ptr & (ZSTD_CWKSP_ALIGNMENT_BYTES-1))== 0);
|
||||||
|
if(ptr && ptr < ws->initOnceStart) {
|
||||||
|
/* We assume the memory following the current allocation is either:
|
||||||
|
* 1. Not usable as initOnce memory (end of workspace)
|
||||||
|
* 2. Another initOnce buffer that has been allocated before (and so was previously memset)
|
||||||
|
* 3. An ASAN redzone, in which case we don't want to write on it
|
||||||
|
* For these reasons it should be fine to not explicitly zero every byte up to ws->initOnceStart.
|
||||||
|
* Note that we assume here that MSAN and ASAN cannot run in the same time. */
|
||||||
|
ZSTD_memset(ptr, 0, MIN((size_t)((U8*)ws->initOnceStart - (U8*)ptr), alignedBytes));
|
||||||
|
ws->initOnceStart = ptr;
|
||||||
|
}
|
||||||
|
#if ZSTD_MEMORY_SANITIZER
|
||||||
|
assert(__msan_test_shadow(ptr, bytes) == -1);
|
||||||
|
#endif
|
||||||
|
return ptr;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes).
|
* Reserves and returns memory sized on and aligned on ZSTD_CWKSP_ALIGNMENT_BYTES (64 bytes).
|
||||||
*/
|
*/
|
||||||
@@ -378,18 +435,22 @@ MEM_STATIC void* ZSTD_cwksp_reserve_aligned(ZSTD_cwksp* ws, size_t bytes)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Aligned on 64 bytes. These buffers have the special property that
|
* Aligned on 64 bytes. These buffers have the special property that
|
||||||
* their values remain constrained, allowing us to re-use them without
|
* their values remain constrained, allowing us to reuse them without
|
||||||
* memset()-ing them.
|
* memset()-ing them.
|
||||||
*/
|
*/
|
||||||
MEM_STATIC void* ZSTD_cwksp_reserve_table(ZSTD_cwksp* ws, size_t bytes)
|
MEM_STATIC void* ZSTD_cwksp_reserve_table(ZSTD_cwksp* ws, size_t bytes)
|
||||||
{
|
{
|
||||||
const ZSTD_cwksp_alloc_phase_e phase = ZSTD_cwksp_alloc_aligned;
|
const ZSTD_cwksp_alloc_phase_e phase = ZSTD_cwksp_alloc_aligned_init_once;
|
||||||
void* alloc;
|
void* alloc;
|
||||||
void* end;
|
void* end;
|
||||||
void* top;
|
void* top;
|
||||||
|
|
||||||
if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase))) {
|
/* We can only start allocating tables after we are done reserving space for objects at the
|
||||||
return NULL;
|
* start of the workspace */
|
||||||
|
if(ws->phase < phase) {
|
||||||
|
if (ZSTD_isError(ZSTD_cwksp_internal_advance_phase(ws, phase))) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
alloc = ws->tableEnd;
|
alloc = ws->tableEnd;
|
||||||
end = (BYTE *)alloc + bytes;
|
end = (BYTE *)alloc + bytes;
|
||||||
@@ -466,13 +527,21 @@ MEM_STATIC void ZSTD_cwksp_mark_tables_dirty(ZSTD_cwksp* ws)
|
|||||||
DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_dirty");
|
DEBUGLOG(4, "cwksp: ZSTD_cwksp_mark_tables_dirty");
|
||||||
|
|
||||||
#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
||||||
/* To validate that the table re-use logic is sound, and that we don't
|
/* To validate that the table reuse logic is sound, and that we don't
|
||||||
* access table space that we haven't cleaned, we re-"poison" the table
|
* access table space that we haven't cleaned, we re-"poison" the table
|
||||||
* space every time we mark it dirty. */
|
* space every time we mark it dirty.
|
||||||
|
* Since tableValidEnd space and initOnce space may overlap we don't poison
|
||||||
|
* the initOnce portion as it break its promise. This means that this poisoning
|
||||||
|
* check isn't always applied fully. */
|
||||||
{
|
{
|
||||||
size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd;
|
size_t size = (BYTE*)ws->tableValidEnd - (BYTE*)ws->objectEnd;
|
||||||
assert(__msan_test_shadow(ws->objectEnd, size) == -1);
|
assert(__msan_test_shadow(ws->objectEnd, size) == -1);
|
||||||
__msan_poison(ws->objectEnd, size);
|
if((BYTE*)ws->tableValidEnd < (BYTE*)ws->initOnceStart) {
|
||||||
|
__msan_poison(ws->objectEnd, size);
|
||||||
|
} else {
|
||||||
|
assert(ws->initOnceStart >= ws->objectEnd);
|
||||||
|
__msan_poison(ws->objectEnd, (BYTE*)ws->initOnceStart - (BYTE*)ws->objectEnd);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -500,7 +569,7 @@ MEM_STATIC void ZSTD_cwksp_clean_tables(ZSTD_cwksp* ws) {
|
|||||||
assert(ws->tableValidEnd >= ws->objectEnd);
|
assert(ws->tableValidEnd >= ws->objectEnd);
|
||||||
assert(ws->tableValidEnd <= ws->allocStart);
|
assert(ws->tableValidEnd <= ws->allocStart);
|
||||||
if (ws->tableValidEnd < ws->tableEnd) {
|
if (ws->tableValidEnd < ws->tableEnd) {
|
||||||
ZSTD_memset(ws->tableValidEnd, 0, (BYTE*)ws->tableEnd - (BYTE*)ws->tableValidEnd);
|
ZSTD_memset(ws->tableValidEnd, 0, (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->tableValidEnd));
|
||||||
}
|
}
|
||||||
ZSTD_cwksp_mark_tables_clean(ws);
|
ZSTD_cwksp_mark_tables_clean(ws);
|
||||||
}
|
}
|
||||||
@@ -535,13 +604,16 @@ MEM_STATIC void ZSTD_cwksp_clear(ZSTD_cwksp* ws) {
|
|||||||
DEBUGLOG(4, "cwksp: clearing!");
|
DEBUGLOG(4, "cwksp: clearing!");
|
||||||
|
|
||||||
#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
#if ZSTD_MEMORY_SANITIZER && !defined (ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
||||||
/* To validate that the context re-use logic is sound, and that we don't
|
/* To validate that the context reuse logic is sound, and that we don't
|
||||||
* access stuff that this compression hasn't initialized, we re-"poison"
|
* access stuff that this compression hasn't initialized, we re-"poison"
|
||||||
* the workspace (or at least the non-static, non-table parts of it)
|
* the workspace except for the areas in which we expect memory reuse
|
||||||
* every time we start a new compression. */
|
* without initialization (objects, valid tables area and init once
|
||||||
|
* memory). */
|
||||||
{
|
{
|
||||||
size_t size = (BYTE*)ws->workspaceEnd - (BYTE*)ws->tableValidEnd;
|
if((BYTE*)ws->tableValidEnd < (BYTE*)ws->initOnceStart) {
|
||||||
__msan_poison(ws->tableValidEnd, size);
|
size_t size = (BYTE*)ws->initOnceStart - (BYTE*)ws->tableValidEnd;
|
||||||
|
__msan_poison(ws->tableValidEnd, size);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -557,14 +629,23 @@ MEM_STATIC void ZSTD_cwksp_clear(ZSTD_cwksp* ws) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
ws->tableEnd = ws->objectEnd;
|
ws->tableEnd = ws->objectEnd;
|
||||||
ws->allocStart = ws->workspaceEnd;
|
ws->allocStart = ZSTD_cwksp_initialAllocStart(ws);
|
||||||
ws->allocFailed = 0;
|
ws->allocFailed = 0;
|
||||||
if (ws->phase > ZSTD_cwksp_alloc_buffers) {
|
if (ws->phase > ZSTD_cwksp_alloc_aligned_init_once) {
|
||||||
ws->phase = ZSTD_cwksp_alloc_buffers;
|
ws->phase = ZSTD_cwksp_alloc_aligned_init_once;
|
||||||
}
|
}
|
||||||
ZSTD_cwksp_assert_internal_consistency(ws);
|
ZSTD_cwksp_assert_internal_consistency(ws);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MEM_STATIC size_t ZSTD_cwksp_sizeof(const ZSTD_cwksp* ws) {
|
||||||
|
return (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->workspace);
|
||||||
|
}
|
||||||
|
|
||||||
|
MEM_STATIC size_t ZSTD_cwksp_used(const ZSTD_cwksp* ws) {
|
||||||
|
return (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->workspace)
|
||||||
|
+ (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->allocStart);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The provided workspace takes ownership of the buffer [start, start+size).
|
* The provided workspace takes ownership of the buffer [start, start+size).
|
||||||
* Any existing values in the workspace are ignored (the previously managed
|
* Any existing values in the workspace are ignored (the previously managed
|
||||||
@@ -577,6 +658,7 @@ MEM_STATIC void ZSTD_cwksp_init(ZSTD_cwksp* ws, void* start, size_t size, ZSTD_c
|
|||||||
ws->workspaceEnd = (BYTE*)start + size;
|
ws->workspaceEnd = (BYTE*)start + size;
|
||||||
ws->objectEnd = ws->workspace;
|
ws->objectEnd = ws->workspace;
|
||||||
ws->tableValidEnd = ws->objectEnd;
|
ws->tableValidEnd = ws->objectEnd;
|
||||||
|
ws->initOnceStart = ZSTD_cwksp_initialAllocStart(ws);
|
||||||
ws->phase = ZSTD_cwksp_alloc_objects;
|
ws->phase = ZSTD_cwksp_alloc_objects;
|
||||||
ws->isStatic = isStatic;
|
ws->isStatic = isStatic;
|
||||||
ZSTD_cwksp_clear(ws);
|
ZSTD_cwksp_clear(ws);
|
||||||
@@ -595,6 +677,11 @@ MEM_STATIC size_t ZSTD_cwksp_create(ZSTD_cwksp* ws, size_t size, ZSTD_customMem
|
|||||||
MEM_STATIC void ZSTD_cwksp_free(ZSTD_cwksp* ws, ZSTD_customMem customMem) {
|
MEM_STATIC void ZSTD_cwksp_free(ZSTD_cwksp* ws, ZSTD_customMem customMem) {
|
||||||
void *ptr = ws->workspace;
|
void *ptr = ws->workspace;
|
||||||
DEBUGLOG(4, "cwksp: freeing workspace");
|
DEBUGLOG(4, "cwksp: freeing workspace");
|
||||||
|
#if ZSTD_MEMORY_SANITIZER && !defined(ZSTD_MSAN_DONT_POISON_WORKSPACE)
|
||||||
|
if (ptr != NULL && customMem.customFree != NULL) {
|
||||||
|
__msan_unpoison(ptr, ZSTD_cwksp_sizeof(ws));
|
||||||
|
}
|
||||||
|
#endif
|
||||||
ZSTD_memset(ws, 0, sizeof(ZSTD_cwksp));
|
ZSTD_memset(ws, 0, sizeof(ZSTD_cwksp));
|
||||||
ZSTD_customFree(ptr, customMem);
|
ZSTD_customFree(ptr, customMem);
|
||||||
}
|
}
|
||||||
@@ -608,15 +695,6 @@ MEM_STATIC void ZSTD_cwksp_move(ZSTD_cwksp* dst, ZSTD_cwksp* src) {
|
|||||||
ZSTD_memset(src, 0, sizeof(ZSTD_cwksp));
|
ZSTD_memset(src, 0, sizeof(ZSTD_cwksp));
|
||||||
}
|
}
|
||||||
|
|
||||||
MEM_STATIC size_t ZSTD_cwksp_sizeof(const ZSTD_cwksp* ws) {
|
|
||||||
return (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->workspace);
|
|
||||||
}
|
|
||||||
|
|
||||||
MEM_STATIC size_t ZSTD_cwksp_used(const ZSTD_cwksp* ws) {
|
|
||||||
return (size_t)((BYTE*)ws->tableEnd - (BYTE*)ws->workspace)
|
|
||||||
+ (size_t)((BYTE*)ws->workspaceEnd - (BYTE*)ws->allocStart);
|
|
||||||
}
|
|
||||||
|
|
||||||
MEM_STATIC int ZSTD_cwksp_reserve_failed(const ZSTD_cwksp* ws) {
|
MEM_STATIC int ZSTD_cwksp_reserve_failed(const ZSTD_cwksp* ws) {
|
||||||
return ws->allocFailed;
|
return ws->allocFailed;
|
||||||
}
|
}
|
||||||
@@ -629,17 +707,11 @@ MEM_STATIC int ZSTD_cwksp_reserve_failed(const ZSTD_cwksp* ws) {
|
|||||||
* Returns if the estimated space needed for a wksp is within an acceptable limit of the
|
* Returns if the estimated space needed for a wksp is within an acceptable limit of the
|
||||||
* actual amount of space used.
|
* actual amount of space used.
|
||||||
*/
|
*/
|
||||||
MEM_STATIC int ZSTD_cwksp_estimated_space_within_bounds(const ZSTD_cwksp* const ws,
|
MEM_STATIC int ZSTD_cwksp_estimated_space_within_bounds(const ZSTD_cwksp *const ws, size_t const estimatedSpace) {
|
||||||
size_t const estimatedSpace, int resizedWorkspace) {
|
/* We have an alignment space between objects and tables between tables and buffers, so we can have up to twice
|
||||||
if (resizedWorkspace) {
|
* the alignment bytes difference between estimation and actual usage */
|
||||||
/* Resized/newly allocated wksp should have exact bounds */
|
return (estimatedSpace - ZSTD_cwksp_slack_space_required()) <= ZSTD_cwksp_used(ws) &&
|
||||||
return ZSTD_cwksp_used(ws) == estimatedSpace;
|
ZSTD_cwksp_used(ws) <= estimatedSpace;
|
||||||
} else {
|
|
||||||
/* Due to alignment, when reusing a workspace, we can actually consume 63 fewer or more bytes
|
|
||||||
* than estimatedSpace. See the comments in zstd_cwksp.h for details.
|
|
||||||
*/
|
|
||||||
return (ZSTD_cwksp_used(ws) >= estimatedSpace - 63) && (ZSTD_cwksp_used(ws) <= estimatedSpace + 63);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
8
vendor/github.com/DataDog/zstd/zstd_ddict.c
generated
vendored
8
vendor/github.com/DataDog/zstd/zstd_ddict.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -15,12 +15,12 @@
|
|||||||
/*-*******************************************************
|
/*-*******************************************************
|
||||||
* Dependencies
|
* Dependencies
|
||||||
*********************************************************/
|
*********************************************************/
|
||||||
|
#include "allocations.h" /* ZSTD_customMalloc, ZSTD_customFree */
|
||||||
#include "zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
|
#include "zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
|
||||||
#include "cpu.h" /* bmi2 */
|
#include "cpu.h" /* bmi2 */
|
||||||
#include "mem.h" /* low level memory routines */
|
#include "mem.h" /* low level memory routines */
|
||||||
#define FSE_STATIC_LINKING_ONLY
|
#define FSE_STATIC_LINKING_ONLY
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
#define HUF_STATIC_LINKING_ONLY
|
|
||||||
#include "huf.h"
|
#include "huf.h"
|
||||||
#include "zstd_decompress_internal.h"
|
#include "zstd_decompress_internal.h"
|
||||||
#include "zstd_ddict.h"
|
#include "zstd_ddict.h"
|
||||||
@@ -135,7 +135,7 @@ static size_t ZSTD_initDDict_internal(ZSTD_DDict* ddict,
|
|||||||
ZSTD_memcpy(internalBuffer, dict, dictSize);
|
ZSTD_memcpy(internalBuffer, dict, dictSize);
|
||||||
}
|
}
|
||||||
ddict->dictSize = dictSize;
|
ddict->dictSize = dictSize;
|
||||||
ddict->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */
|
ddict->entropy.hufTable[0] = (HUF_DTable)((ZSTD_HUFFDTABLE_CAPACITY_LOG)*0x1000001); /* cover both little and big endian */
|
||||||
|
|
||||||
/* parse dictionary content */
|
/* parse dictionary content */
|
||||||
FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) , "");
|
FORWARD_IF_ERROR( ZSTD_loadEntropy_intoDDict(ddict, dictContentType) , "");
|
||||||
@@ -241,7 +241,7 @@ size_t ZSTD_sizeof_DDict(const ZSTD_DDict* ddict)
|
|||||||
unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict)
|
unsigned ZSTD_getDictID_fromDDict(const ZSTD_DDict* ddict)
|
||||||
{
|
{
|
||||||
if (ddict==NULL) return 0;
|
if (ddict==NULL) return 0;
|
||||||
return ZSTD_getDictID_fromDict(ddict->dictContent, ddict->dictSize);
|
return ddict->dictID;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_ddict.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_ddict.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
389
vendor/github.com/DataDog/zstd/zstd_decompress.c
generated
vendored
389
vendor/github.com/DataDog/zstd/zstd_decompress.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -57,13 +57,15 @@
|
|||||||
* Dependencies
|
* Dependencies
|
||||||
*********************************************************/
|
*********************************************************/
|
||||||
#include "zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
|
#include "zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_memset */
|
||||||
|
#include "allocations.h" /* ZSTD_customMalloc, ZSTD_customCalloc, ZSTD_customFree */
|
||||||
|
#include "error_private.h"
|
||||||
|
#include "zstd_internal.h" /* blockProperties_t */
|
||||||
#include "mem.h" /* low level memory routines */
|
#include "mem.h" /* low level memory routines */
|
||||||
|
#include "bits.h" /* ZSTD_highbit32 */
|
||||||
#define FSE_STATIC_LINKING_ONLY
|
#define FSE_STATIC_LINKING_ONLY
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
#define HUF_STATIC_LINKING_ONLY
|
|
||||||
#include "huf.h"
|
#include "huf.h"
|
||||||
#include "xxhash.h" /* XXH64_reset, XXH64_update, XXH64_digest, XXH64 */
|
#include "xxhash.h" /* XXH64_reset, XXH64_update, XXH64_digest, XXH64 */
|
||||||
#include "zstd_internal.h" /* blockProperties_t */
|
|
||||||
#include "zstd_decompress_internal.h" /* ZSTD_DCtx */
|
#include "zstd_decompress_internal.h" /* ZSTD_DCtx */
|
||||||
#include "zstd_ddict.h" /* ZSTD_DDictDictContent */
|
#include "zstd_ddict.h" /* ZSTD_DDictDictContent */
|
||||||
#include "zstd_decompress_block.h" /* ZSTD_decompressBlock_internal */
|
#include "zstd_decompress_block.h" /* ZSTD_decompressBlock_internal */
|
||||||
@@ -79,11 +81,11 @@
|
|||||||
*************************************/
|
*************************************/
|
||||||
|
|
||||||
#define DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT 4
|
#define DDICT_HASHSET_MAX_LOAD_FACTOR_COUNT_MULT 4
|
||||||
#define DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT 3 /* These two constants represent SIZE_MULT/COUNT_MULT load factor without using a float.
|
#define DDICT_HASHSET_MAX_LOAD_FACTOR_SIZE_MULT 3 /* These two constants represent SIZE_MULT/COUNT_MULT load factor without using a float.
|
||||||
* Currently, that means a 0.75 load factor.
|
* Currently, that means a 0.75 load factor.
|
||||||
* So, if count * COUNT_MULT / size * SIZE_MULT != 0, then we've exceeded
|
* So, if count * COUNT_MULT / size * SIZE_MULT != 0, then we've exceeded
|
||||||
* the load factor of the ddict hash set.
|
* the load factor of the ddict hash set.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define DDICT_HASHSET_TABLE_BASE_SIZE 64
|
#define DDICT_HASHSET_TABLE_BASE_SIZE 64
|
||||||
#define DDICT_HASHSET_RESIZE_FACTOR 2
|
#define DDICT_HASHSET_RESIZE_FACTOR 2
|
||||||
@@ -244,6 +246,8 @@ static void ZSTD_DCtx_resetParameters(ZSTD_DCtx* dctx)
|
|||||||
dctx->outBufferMode = ZSTD_bm_buffered;
|
dctx->outBufferMode = ZSTD_bm_buffered;
|
||||||
dctx->forceIgnoreChecksum = ZSTD_d_validateChecksum;
|
dctx->forceIgnoreChecksum = ZSTD_d_validateChecksum;
|
||||||
dctx->refMultipleDDicts = ZSTD_rmd_refSingleDDict;
|
dctx->refMultipleDDicts = ZSTD_rmd_refSingleDDict;
|
||||||
|
dctx->disableHufAsm = 0;
|
||||||
|
dctx->maxBlockSizeParam = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx)
|
static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx)
|
||||||
@@ -264,6 +268,7 @@ static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx)
|
|||||||
#endif
|
#endif
|
||||||
dctx->noForwardProgress = 0;
|
dctx->noForwardProgress = 0;
|
||||||
dctx->oversizedDuration = 0;
|
dctx->oversizedDuration = 0;
|
||||||
|
dctx->isFrameDecompression = 1;
|
||||||
#if DYNAMIC_BMI2
|
#if DYNAMIC_BMI2
|
||||||
dctx->bmi2 = ZSTD_cpuSupportsBmi2();
|
dctx->bmi2 = ZSTD_cpuSupportsBmi2();
|
||||||
#endif
|
#endif
|
||||||
@@ -439,16 +444,40 @@ size_t ZSTD_frameHeaderSize(const void* src, size_t srcSize)
|
|||||||
* note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless
|
* note : only works for formats ZSTD_f_zstd1 and ZSTD_f_zstd1_magicless
|
||||||
* @return : 0, `zfhPtr` is correctly filled,
|
* @return : 0, `zfhPtr` is correctly filled,
|
||||||
* >0, `srcSize` is too small, value is wanted `srcSize` amount,
|
* >0, `srcSize` is too small, value is wanted `srcSize` amount,
|
||||||
* or an error code, which can be tested using ZSTD_isError() */
|
** or an error code, which can be tested using ZSTD_isError() */
|
||||||
size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format)
|
size_t ZSTD_getFrameHeader_advanced(ZSTD_frameHeader* zfhPtr, const void* src, size_t srcSize, ZSTD_format_e format)
|
||||||
{
|
{
|
||||||
const BYTE* ip = (const BYTE*)src;
|
const BYTE* ip = (const BYTE*)src;
|
||||||
size_t const minInputSize = ZSTD_startingInputLength(format);
|
size_t const minInputSize = ZSTD_startingInputLength(format);
|
||||||
|
|
||||||
ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr)); /* not strictly necessary, but static analyzer do not understand that zfhPtr is only going to be read only if return value is zero, since they are 2 different signals */
|
DEBUGLOG(5, "ZSTD_getFrameHeader_advanced: minInputSize = %zu, srcSize = %zu", minInputSize, srcSize);
|
||||||
if (srcSize < minInputSize) return minInputSize;
|
|
||||||
RETURN_ERROR_IF(src==NULL, GENERIC, "invalid parameter");
|
|
||||||
|
|
||||||
|
if (srcSize > 0) {
|
||||||
|
/* note : technically could be considered an assert(), since it's an invalid entry */
|
||||||
|
RETURN_ERROR_IF(src==NULL, GENERIC, "invalid parameter : src==NULL, but srcSize>0");
|
||||||
|
}
|
||||||
|
if (srcSize < minInputSize) {
|
||||||
|
if (srcSize > 0 && format != ZSTD_f_zstd1_magicless) {
|
||||||
|
/* when receiving less than @minInputSize bytes,
|
||||||
|
* control these bytes at least correspond to a supported magic number
|
||||||
|
* in order to error out early if they don't.
|
||||||
|
**/
|
||||||
|
size_t const toCopy = MIN(4, srcSize);
|
||||||
|
unsigned char hbuf[4]; MEM_writeLE32(hbuf, ZSTD_MAGICNUMBER);
|
||||||
|
assert(src != NULL);
|
||||||
|
ZSTD_memcpy(hbuf, src, toCopy);
|
||||||
|
if ( MEM_readLE32(hbuf) != ZSTD_MAGICNUMBER ) {
|
||||||
|
/* not a zstd frame : let's check if it's a skippable frame */
|
||||||
|
MEM_writeLE32(hbuf, ZSTD_MAGIC_SKIPPABLE_START);
|
||||||
|
ZSTD_memcpy(hbuf, src, toCopy);
|
||||||
|
if ((MEM_readLE32(hbuf) & ZSTD_MAGIC_SKIPPABLE_MASK) != ZSTD_MAGIC_SKIPPABLE_START) {
|
||||||
|
RETURN_ERROR(prefix_unknown,
|
||||||
|
"first bytes don't correspond to any supported magic number");
|
||||||
|
} } }
|
||||||
|
return minInputSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
ZSTD_memset(zfhPtr, 0, sizeof(*zfhPtr)); /* not strictly necessary, but static analyzers may not understand that zfhPtr will be read only if return value is zero, since they are 2 different signals */
|
||||||
if ( (format != ZSTD_f_zstd1_magicless)
|
if ( (format != ZSTD_f_zstd1_magicless)
|
||||||
&& (MEM_readLE32(src) != ZSTD_MAGICNUMBER) ) {
|
&& (MEM_readLE32(src) != ZSTD_MAGICNUMBER) ) {
|
||||||
if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
if ((MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
||||||
@@ -564,49 +593,52 @@ static size_t readSkippableFrameSize(void const* src, size_t srcSize)
|
|||||||
sizeU32 = MEM_readLE32((BYTE const*)src + ZSTD_FRAMEIDSIZE);
|
sizeU32 = MEM_readLE32((BYTE const*)src + ZSTD_FRAMEIDSIZE);
|
||||||
RETURN_ERROR_IF((U32)(sizeU32 + ZSTD_SKIPPABLEHEADERSIZE) < sizeU32,
|
RETURN_ERROR_IF((U32)(sizeU32 + ZSTD_SKIPPABLEHEADERSIZE) < sizeU32,
|
||||||
frameParameter_unsupported, "");
|
frameParameter_unsupported, "");
|
||||||
{
|
{ size_t const skippableSize = skippableHeaderSize + sizeU32;
|
||||||
size_t const skippableSize = skippableHeaderSize + sizeU32;
|
|
||||||
RETURN_ERROR_IF(skippableSize > srcSize, srcSize_wrong, "");
|
RETURN_ERROR_IF(skippableSize > srcSize, srcSize_wrong, "");
|
||||||
return skippableSize;
|
return skippableSize;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*! ZSTD_readSkippableFrame() :
|
/*! ZSTD_readSkippableFrame() :
|
||||||
* Retrieves a zstd skippable frame containing data given by src, and writes it to dst buffer.
|
* Retrieves content of a skippable frame, and writes it to dst buffer.
|
||||||
*
|
*
|
||||||
* The parameter magicVariant will receive the magicVariant that was supplied when the frame was written,
|
* The parameter magicVariant will receive the magicVariant that was supplied when the frame was written,
|
||||||
* i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START. This can be NULL if the caller is not interested
|
* i.e. magicNumber - ZSTD_MAGIC_SKIPPABLE_START. This can be NULL if the caller is not interested
|
||||||
* in the magicVariant.
|
* in the magicVariant.
|
||||||
*
|
*
|
||||||
* Returns an error if destination buffer is not large enough, or if the frame is not skippable.
|
* Returns an error if destination buffer is not large enough, or if this is not a valid skippable frame.
|
||||||
*
|
*
|
||||||
* @return : number of bytes written or a ZSTD error.
|
* @return : number of bytes written or a ZSTD error.
|
||||||
*/
|
*/
|
||||||
ZSTDLIB_API size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity, unsigned* magicVariant,
|
size_t ZSTD_readSkippableFrame(void* dst, size_t dstCapacity,
|
||||||
const void* src, size_t srcSize)
|
unsigned* magicVariant, /* optional, can be NULL */
|
||||||
|
const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
U32 const magicNumber = MEM_readLE32(src);
|
RETURN_ERROR_IF(srcSize < ZSTD_SKIPPABLEHEADERSIZE, srcSize_wrong, "");
|
||||||
size_t skippableFrameSize = readSkippableFrameSize(src, srcSize);
|
|
||||||
size_t skippableContentSize = skippableFrameSize - ZSTD_SKIPPABLEHEADERSIZE;
|
|
||||||
|
|
||||||
/* check input validity */
|
{ U32 const magicNumber = MEM_readLE32(src);
|
||||||
RETURN_ERROR_IF(!ZSTD_isSkippableFrame(src, srcSize), frameParameter_unsupported, "");
|
size_t skippableFrameSize = readSkippableFrameSize(src, srcSize);
|
||||||
RETURN_ERROR_IF(skippableFrameSize < ZSTD_SKIPPABLEHEADERSIZE || skippableFrameSize > srcSize, srcSize_wrong, "");
|
size_t skippableContentSize = skippableFrameSize - ZSTD_SKIPPABLEHEADERSIZE;
|
||||||
RETURN_ERROR_IF(skippableContentSize > dstCapacity, dstSize_tooSmall, "");
|
|
||||||
|
|
||||||
/* deliver payload */
|
/* check input validity */
|
||||||
if (skippableContentSize > 0 && dst != NULL)
|
RETURN_ERROR_IF(!ZSTD_isSkippableFrame(src, srcSize), frameParameter_unsupported, "");
|
||||||
ZSTD_memcpy(dst, (const BYTE *)src + ZSTD_SKIPPABLEHEADERSIZE, skippableContentSize);
|
RETURN_ERROR_IF(skippableFrameSize < ZSTD_SKIPPABLEHEADERSIZE || skippableFrameSize > srcSize, srcSize_wrong, "");
|
||||||
if (magicVariant != NULL)
|
RETURN_ERROR_IF(skippableContentSize > dstCapacity, dstSize_tooSmall, "");
|
||||||
*magicVariant = magicNumber - ZSTD_MAGIC_SKIPPABLE_START;
|
|
||||||
return skippableContentSize;
|
/* deliver payload */
|
||||||
|
if (skippableContentSize > 0 && dst != NULL)
|
||||||
|
ZSTD_memcpy(dst, (const BYTE *)src + ZSTD_SKIPPABLEHEADERSIZE, skippableContentSize);
|
||||||
|
if (magicVariant != NULL)
|
||||||
|
*magicVariant = magicNumber - ZSTD_MAGIC_SKIPPABLE_START;
|
||||||
|
return skippableContentSize;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ZSTD_findDecompressedSize() :
|
/** ZSTD_findDecompressedSize() :
|
||||||
* compatible with legacy mode
|
|
||||||
* `srcSize` must be the exact length of some number of ZSTD compressed and/or
|
* `srcSize` must be the exact length of some number of ZSTD compressed and/or
|
||||||
* skippable frames
|
* skippable frames
|
||||||
* @return : decompressed size of the frames contained */
|
* note: compatible with legacy mode
|
||||||
|
* @return : decompressed size of the frames contained */
|
||||||
unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
|
unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
unsigned long long totalDstSize = 0;
|
unsigned long long totalDstSize = 0;
|
||||||
@@ -616,9 +648,7 @@ unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
|
|||||||
|
|
||||||
if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
||||||
size_t const skippableSize = readSkippableFrameSize(src, srcSize);
|
size_t const skippableSize = readSkippableFrameSize(src, srcSize);
|
||||||
if (ZSTD_isError(skippableSize)) {
|
if (ZSTD_isError(skippableSize)) return ZSTD_CONTENTSIZE_ERROR;
|
||||||
return ZSTD_CONTENTSIZE_ERROR;
|
|
||||||
}
|
|
||||||
assert(skippableSize <= srcSize);
|
assert(skippableSize <= srcSize);
|
||||||
|
|
||||||
src = (const BYTE *)src + skippableSize;
|
src = (const BYTE *)src + skippableSize;
|
||||||
@@ -626,17 +656,17 @@ unsigned long long ZSTD_findDecompressedSize(const void* src, size_t srcSize)
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
{ unsigned long long const ret = ZSTD_getFrameContentSize(src, srcSize);
|
{ unsigned long long const fcs = ZSTD_getFrameContentSize(src, srcSize);
|
||||||
if (ret >= ZSTD_CONTENTSIZE_ERROR) return ret;
|
if (fcs >= ZSTD_CONTENTSIZE_ERROR) return fcs;
|
||||||
|
|
||||||
/* check for overflow */
|
if (totalDstSize + fcs < totalDstSize)
|
||||||
if (totalDstSize + ret < totalDstSize) return ZSTD_CONTENTSIZE_ERROR;
|
return ZSTD_CONTENTSIZE_ERROR; /* check for overflow */
|
||||||
totalDstSize += ret;
|
totalDstSize += fcs;
|
||||||
}
|
}
|
||||||
|
/* skip to next frame */
|
||||||
{ size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize);
|
{ size_t const frameSrcSize = ZSTD_findFrameCompressedSize(src, srcSize);
|
||||||
if (ZSTD_isError(frameSrcSize)) {
|
if (ZSTD_isError(frameSrcSize)) return ZSTD_CONTENTSIZE_ERROR;
|
||||||
return ZSTD_CONTENTSIZE_ERROR;
|
assert(frameSrcSize <= srcSize);
|
||||||
}
|
|
||||||
|
|
||||||
src = (const BYTE *)src + frameSrcSize;
|
src = (const BYTE *)src + frameSrcSize;
|
||||||
srcSize -= frameSrcSize;
|
srcSize -= frameSrcSize;
|
||||||
@@ -700,17 +730,17 @@ static ZSTD_frameSizeInfo ZSTD_errorFrameSizeInfo(size_t ret)
|
|||||||
return frameSizeInfo;
|
return frameSizeInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize)
|
static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize, ZSTD_format_e format)
|
||||||
{
|
{
|
||||||
ZSTD_frameSizeInfo frameSizeInfo;
|
ZSTD_frameSizeInfo frameSizeInfo;
|
||||||
ZSTD_memset(&frameSizeInfo, 0, sizeof(ZSTD_frameSizeInfo));
|
ZSTD_memset(&frameSizeInfo, 0, sizeof(ZSTD_frameSizeInfo));
|
||||||
|
|
||||||
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
|
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
|
||||||
if (ZSTD_isLegacy(src, srcSize))
|
if (format == ZSTD_f_zstd1 && ZSTD_isLegacy(src, srcSize))
|
||||||
return ZSTD_findFrameSizeInfoLegacy(src, srcSize);
|
return ZSTD_findFrameSizeInfoLegacy(src, srcSize);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((srcSize >= ZSTD_SKIPPABLEHEADERSIZE)
|
if (format == ZSTD_f_zstd1 && (srcSize >= ZSTD_SKIPPABLEHEADERSIZE)
|
||||||
&& (MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
&& (MEM_readLE32(src) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
||||||
frameSizeInfo.compressedSize = readSkippableFrameSize(src, srcSize);
|
frameSizeInfo.compressedSize = readSkippableFrameSize(src, srcSize);
|
||||||
assert(ZSTD_isError(frameSizeInfo.compressedSize) ||
|
assert(ZSTD_isError(frameSizeInfo.compressedSize) ||
|
||||||
@@ -724,7 +754,7 @@ static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize
|
|||||||
ZSTD_frameHeader zfh;
|
ZSTD_frameHeader zfh;
|
||||||
|
|
||||||
/* Extract Frame Header */
|
/* Extract Frame Header */
|
||||||
{ size_t const ret = ZSTD_getFrameHeader(&zfh, src, srcSize);
|
{ size_t const ret = ZSTD_getFrameHeader_advanced(&zfh, src, srcSize, format);
|
||||||
if (ZSTD_isError(ret))
|
if (ZSTD_isError(ret))
|
||||||
return ZSTD_errorFrameSizeInfo(ret);
|
return ZSTD_errorFrameSizeInfo(ret);
|
||||||
if (ret > 0)
|
if (ret > 0)
|
||||||
@@ -758,23 +788,26 @@ static ZSTD_frameSizeInfo ZSTD_findFrameSizeInfo(const void* src, size_t srcSize
|
|||||||
ip += 4;
|
ip += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
frameSizeInfo.nbBlocks = nbBlocks;
|
||||||
frameSizeInfo.compressedSize = (size_t)(ip - ipstart);
|
frameSizeInfo.compressedSize = (size_t)(ip - ipstart);
|
||||||
frameSizeInfo.decompressedBound = (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN)
|
frameSizeInfo.decompressedBound = (zfh.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN)
|
||||||
? zfh.frameContentSize
|
? zfh.frameContentSize
|
||||||
: nbBlocks * zfh.blockSizeMax;
|
: (unsigned long long)nbBlocks * zfh.blockSizeMax;
|
||||||
return frameSizeInfo;
|
return frameSizeInfo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static size_t ZSTD_findFrameCompressedSize_advanced(const void *src, size_t srcSize, ZSTD_format_e format) {
|
||||||
|
ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, format);
|
||||||
|
return frameSizeInfo.compressedSize;
|
||||||
|
}
|
||||||
|
|
||||||
/** ZSTD_findFrameCompressedSize() :
|
/** ZSTD_findFrameCompressedSize() :
|
||||||
* compatible with legacy mode
|
* See docs in zstd.h
|
||||||
* `src` must point to the start of a ZSTD frame, ZSTD legacy frame, or skippable frame
|
* Note: compatible with legacy mode */
|
||||||
* `srcSize` must be at least as large as the frame contained
|
|
||||||
* @return : the compressed size of the frame starting at `src` */
|
|
||||||
size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize)
|
size_t ZSTD_findFrameCompressedSize(const void *src, size_t srcSize)
|
||||||
{
|
{
|
||||||
ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
|
return ZSTD_findFrameCompressedSize_advanced(src, srcSize, ZSTD_f_zstd1);
|
||||||
return frameSizeInfo.compressedSize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ZSTD_decompressBound() :
|
/** ZSTD_decompressBound() :
|
||||||
@@ -788,7 +821,7 @@ unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize)
|
|||||||
unsigned long long bound = 0;
|
unsigned long long bound = 0;
|
||||||
/* Iterate over each frame */
|
/* Iterate over each frame */
|
||||||
while (srcSize > 0) {
|
while (srcSize > 0) {
|
||||||
ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize);
|
ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, ZSTD_f_zstd1);
|
||||||
size_t const compressedSize = frameSizeInfo.compressedSize;
|
size_t const compressedSize = frameSizeInfo.compressedSize;
|
||||||
unsigned long long const decompressedBound = frameSizeInfo.decompressedBound;
|
unsigned long long const decompressedBound = frameSizeInfo.decompressedBound;
|
||||||
if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR)
|
if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR)
|
||||||
@@ -801,6 +834,48 @@ unsigned long long ZSTD_decompressBound(const void* src, size_t srcSize)
|
|||||||
return bound;
|
return bound;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t ZSTD_decompressionMargin(void const* src, size_t srcSize)
|
||||||
|
{
|
||||||
|
size_t margin = 0;
|
||||||
|
unsigned maxBlockSize = 0;
|
||||||
|
|
||||||
|
/* Iterate over each frame */
|
||||||
|
while (srcSize > 0) {
|
||||||
|
ZSTD_frameSizeInfo const frameSizeInfo = ZSTD_findFrameSizeInfo(src, srcSize, ZSTD_f_zstd1);
|
||||||
|
size_t const compressedSize = frameSizeInfo.compressedSize;
|
||||||
|
unsigned long long const decompressedBound = frameSizeInfo.decompressedBound;
|
||||||
|
ZSTD_frameHeader zfh;
|
||||||
|
|
||||||
|
FORWARD_IF_ERROR(ZSTD_getFrameHeader(&zfh, src, srcSize), "");
|
||||||
|
if (ZSTD_isError(compressedSize) || decompressedBound == ZSTD_CONTENTSIZE_ERROR)
|
||||||
|
return ERROR(corruption_detected);
|
||||||
|
|
||||||
|
if (zfh.frameType == ZSTD_frame) {
|
||||||
|
/* Add the frame header to our margin */
|
||||||
|
margin += zfh.headerSize;
|
||||||
|
/* Add the checksum to our margin */
|
||||||
|
margin += zfh.checksumFlag ? 4 : 0;
|
||||||
|
/* Add 3 bytes per block */
|
||||||
|
margin += 3 * frameSizeInfo.nbBlocks;
|
||||||
|
|
||||||
|
/* Compute the max block size */
|
||||||
|
maxBlockSize = MAX(maxBlockSize, zfh.blockSizeMax);
|
||||||
|
} else {
|
||||||
|
assert(zfh.frameType == ZSTD_skippableFrame);
|
||||||
|
/* Add the entire skippable frame size to our margin. */
|
||||||
|
margin += compressedSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
assert(srcSize >= compressedSize);
|
||||||
|
src = (const BYTE*)src + compressedSize;
|
||||||
|
srcSize -= compressedSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Add the max block size back to the margin. */
|
||||||
|
margin += maxBlockSize;
|
||||||
|
|
||||||
|
return margin;
|
||||||
|
}
|
||||||
|
|
||||||
/*-*************************************************************
|
/*-*************************************************************
|
||||||
* Frame decoding
|
* Frame decoding
|
||||||
@@ -826,7 +901,7 @@ static size_t ZSTD_copyRawBlock(void* dst, size_t dstCapacity,
|
|||||||
if (srcSize == 0) return 0;
|
if (srcSize == 0) return 0;
|
||||||
RETURN_ERROR(dstBuffer_null, "");
|
RETURN_ERROR(dstBuffer_null, "");
|
||||||
}
|
}
|
||||||
ZSTD_memcpy(dst, src, srcSize);
|
ZSTD_memmove(dst, src, srcSize);
|
||||||
return srcSize;
|
return srcSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -902,8 +977,13 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
|
|||||||
ip += frameHeaderSize; remainingSrcSize -= frameHeaderSize;
|
ip += frameHeaderSize; remainingSrcSize -= frameHeaderSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Shrink the blockSizeMax if enabled */
|
||||||
|
if (dctx->maxBlockSizeParam != 0)
|
||||||
|
dctx->fParams.blockSizeMax = MIN(dctx->fParams.blockSizeMax, (unsigned)dctx->maxBlockSizeParam);
|
||||||
|
|
||||||
/* Loop on each block */
|
/* Loop on each block */
|
||||||
while (1) {
|
while (1) {
|
||||||
|
BYTE* oBlockEnd = oend;
|
||||||
size_t decodedSize;
|
size_t decodedSize;
|
||||||
blockProperties_t blockProperties;
|
blockProperties_t blockProperties;
|
||||||
size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties);
|
size_t const cBlockSize = ZSTD_getcBlockSize(ip, remainingSrcSize, &blockProperties);
|
||||||
@@ -913,27 +993,48 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
|
|||||||
remainingSrcSize -= ZSTD_blockHeaderSize;
|
remainingSrcSize -= ZSTD_blockHeaderSize;
|
||||||
RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong, "");
|
RETURN_ERROR_IF(cBlockSize > remainingSrcSize, srcSize_wrong, "");
|
||||||
|
|
||||||
|
if (ip >= op && ip < oBlockEnd) {
|
||||||
|
/* We are decompressing in-place. Limit the output pointer so that we
|
||||||
|
* don't overwrite the block that we are currently reading. This will
|
||||||
|
* fail decompression if the input & output pointers aren't spaced
|
||||||
|
* far enough apart.
|
||||||
|
*
|
||||||
|
* This is important to set, even when the pointers are far enough
|
||||||
|
* apart, because ZSTD_decompressBlock_internal() can decide to store
|
||||||
|
* literals in the output buffer, after the block it is decompressing.
|
||||||
|
* Since we don't want anything to overwrite our input, we have to tell
|
||||||
|
* ZSTD_decompressBlock_internal to never write past ip.
|
||||||
|
*
|
||||||
|
* See ZSTD_allocateLiteralsBuffer() for reference.
|
||||||
|
*/
|
||||||
|
oBlockEnd = op + (ip - op);
|
||||||
|
}
|
||||||
|
|
||||||
switch(blockProperties.blockType)
|
switch(blockProperties.blockType)
|
||||||
{
|
{
|
||||||
case bt_compressed:
|
case bt_compressed:
|
||||||
decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oend-op), ip, cBlockSize, /* frame */ 1, not_streaming);
|
assert(dctx->isFrameDecompression == 1);
|
||||||
|
decodedSize = ZSTD_decompressBlock_internal(dctx, op, (size_t)(oBlockEnd-op), ip, cBlockSize, not_streaming);
|
||||||
break;
|
break;
|
||||||
case bt_raw :
|
case bt_raw :
|
||||||
|
/* Use oend instead of oBlockEnd because this function is safe to overlap. It uses memmove. */
|
||||||
decodedSize = ZSTD_copyRawBlock(op, (size_t)(oend-op), ip, cBlockSize);
|
decodedSize = ZSTD_copyRawBlock(op, (size_t)(oend-op), ip, cBlockSize);
|
||||||
break;
|
break;
|
||||||
case bt_rle :
|
case bt_rle :
|
||||||
decodedSize = ZSTD_setRleBlock(op, (size_t)(oend-op), *ip, blockProperties.origSize);
|
decodedSize = ZSTD_setRleBlock(op, (size_t)(oBlockEnd-op), *ip, blockProperties.origSize);
|
||||||
break;
|
break;
|
||||||
case bt_reserved :
|
case bt_reserved :
|
||||||
default:
|
default:
|
||||||
RETURN_ERROR(corruption_detected, "invalid block type");
|
RETURN_ERROR(corruption_detected, "invalid block type");
|
||||||
}
|
}
|
||||||
|
FORWARD_IF_ERROR(decodedSize, "Block decompression failure");
|
||||||
if (ZSTD_isError(decodedSize)) return decodedSize;
|
DEBUGLOG(5, "Decompressed block of dSize = %u", (unsigned)decodedSize);
|
||||||
if (dctx->validateChecksum)
|
if (dctx->validateChecksum) {
|
||||||
XXH64_update(&dctx->xxhState, op, decodedSize);
|
XXH64_update(&dctx->xxhState, op, decodedSize);
|
||||||
if (decodedSize != 0)
|
}
|
||||||
|
if (decodedSize) /* support dst = NULL,0 */ {
|
||||||
op += decodedSize;
|
op += decodedSize;
|
||||||
|
}
|
||||||
assert(ip != NULL);
|
assert(ip != NULL);
|
||||||
ip += cBlockSize;
|
ip += cBlockSize;
|
||||||
remainingSrcSize -= cBlockSize;
|
remainingSrcSize -= cBlockSize;
|
||||||
@@ -957,12 +1058,15 @@ static size_t ZSTD_decompressFrame(ZSTD_DCtx* dctx,
|
|||||||
}
|
}
|
||||||
ZSTD_DCtx_trace_end(dctx, (U64)(op-ostart), (U64)(ip-istart), /* streaming */ 0);
|
ZSTD_DCtx_trace_end(dctx, (U64)(op-ostart), (U64)(ip-istart), /* streaming */ 0);
|
||||||
/* Allow caller to get size read */
|
/* Allow caller to get size read */
|
||||||
|
DEBUGLOG(4, "ZSTD_decompressFrame: decompressed frame of size %zi, consuming %zi bytes of input", op-ostart, ip - (const BYTE*)*srcPtr);
|
||||||
*srcPtr = ip;
|
*srcPtr = ip;
|
||||||
*srcSizePtr = remainingSrcSize;
|
*srcSizePtr = remainingSrcSize;
|
||||||
return (size_t)(op-ostart);
|
return (size_t)(op-ostart);
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
||||||
void* dst, size_t dstCapacity,
|
void* dst, size_t dstCapacity,
|
||||||
const void* src, size_t srcSize,
|
const void* src, size_t srcSize,
|
||||||
const void* dict, size_t dictSize,
|
const void* dict, size_t dictSize,
|
||||||
@@ -982,7 +1086,7 @@ static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
|||||||
while (srcSize >= ZSTD_startingInputLength(dctx->format)) {
|
while (srcSize >= ZSTD_startingInputLength(dctx->format)) {
|
||||||
|
|
||||||
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
|
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT >= 1)
|
||||||
if (ZSTD_isLegacy(src, srcSize)) {
|
if (dctx->format == ZSTD_f_zstd1 && ZSTD_isLegacy(src, srcSize)) {
|
||||||
size_t decodedSize;
|
size_t decodedSize;
|
||||||
size_t const frameSize = ZSTD_findFrameCompressedSizeLegacy(src, srcSize);
|
size_t const frameSize = ZSTD_findFrameCompressedSizeLegacy(src, srcSize);
|
||||||
if (ZSTD_isError(frameSize)) return frameSize;
|
if (ZSTD_isError(frameSize)) return frameSize;
|
||||||
@@ -992,6 +1096,15 @@ static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
|||||||
decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize);
|
decodedSize = ZSTD_decompressLegacy(dst, dstCapacity, src, frameSize, dict, dictSize);
|
||||||
if (ZSTD_isError(decodedSize)) return decodedSize;
|
if (ZSTD_isError(decodedSize)) return decodedSize;
|
||||||
|
|
||||||
|
{
|
||||||
|
unsigned long long const expectedSize = ZSTD_getFrameContentSize(src, srcSize);
|
||||||
|
RETURN_ERROR_IF(expectedSize == ZSTD_CONTENTSIZE_ERROR, corruption_detected, "Corrupted frame header!");
|
||||||
|
if (expectedSize != ZSTD_CONTENTSIZE_UNKNOWN) {
|
||||||
|
RETURN_ERROR_IF(expectedSize != decodedSize, corruption_detected,
|
||||||
|
"Frame header size does not match decoded size!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
assert(decodedSize <= dstCapacity);
|
assert(decodedSize <= dstCapacity);
|
||||||
dst = (BYTE*)dst + decodedSize;
|
dst = (BYTE*)dst + decodedSize;
|
||||||
dstCapacity -= decodedSize;
|
dstCapacity -= decodedSize;
|
||||||
@@ -1003,17 +1116,18 @@ static size_t ZSTD_decompressMultiFrame(ZSTD_DCtx* dctx,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
{ U32 const magicNumber = MEM_readLE32(src);
|
if (dctx->format == ZSTD_f_zstd1 && srcSize >= 4) {
|
||||||
DEBUGLOG(4, "reading magic number %08X (expecting %08X)",
|
U32 const magicNumber = MEM_readLE32(src);
|
||||||
(unsigned)magicNumber, ZSTD_MAGICNUMBER);
|
DEBUGLOG(5, "reading magic number %08X", (unsigned)magicNumber);
|
||||||
if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
if ((magicNumber & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) {
|
||||||
|
/* skippable frame detected : skip it */
|
||||||
size_t const skippableSize = readSkippableFrameSize(src, srcSize);
|
size_t const skippableSize = readSkippableFrameSize(src, srcSize);
|
||||||
FORWARD_IF_ERROR(skippableSize, "readSkippableFrameSize failed");
|
FORWARD_IF_ERROR(skippableSize, "invalid skippable frame");
|
||||||
assert(skippableSize <= srcSize);
|
assert(skippableSize <= srcSize);
|
||||||
|
|
||||||
src = (const BYTE *)src + skippableSize;
|
src = (const BYTE *)src + skippableSize;
|
||||||
srcSize -= skippableSize;
|
srcSize -= skippableSize;
|
||||||
continue;
|
continue; /* check next frame */
|
||||||
} }
|
} }
|
||||||
|
|
||||||
if (ddict) {
|
if (ddict) {
|
||||||
@@ -1109,8 +1223,8 @@ size_t ZSTD_decompress(void* dst, size_t dstCapacity, const void* src, size_t sr
|
|||||||
size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx) { return dctx->expected; }
|
size_t ZSTD_nextSrcSizeToDecompress(ZSTD_DCtx* dctx) { return dctx->expected; }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Similar to ZSTD_nextSrcSizeToDecompress(), but when when a block input can be streamed,
|
* Similar to ZSTD_nextSrcSizeToDecompress(), but when a block input can be streamed, we
|
||||||
* we allow taking a partial block as the input. Currently only raw uncompressed blocks can
|
* allow taking a partial block as the input. Currently only raw uncompressed blocks can
|
||||||
* be streamed.
|
* be streamed.
|
||||||
*
|
*
|
||||||
* For blocks that can be streamed, this allows us to reduce the latency until we produce
|
* For blocks that can be streamed, this allows us to reduce the latency until we produce
|
||||||
@@ -1229,7 +1343,8 @@ size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, c
|
|||||||
{
|
{
|
||||||
case bt_compressed:
|
case bt_compressed:
|
||||||
DEBUGLOG(5, "ZSTD_decompressContinue: case bt_compressed");
|
DEBUGLOG(5, "ZSTD_decompressContinue: case bt_compressed");
|
||||||
rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, /* frame */ 1, is_streaming);
|
assert(dctx->isFrameDecompression == 1);
|
||||||
|
rSize = ZSTD_decompressBlock_internal(dctx, dst, dstCapacity, src, srcSize, is_streaming);
|
||||||
dctx->expected = 0; /* Streaming not supported */
|
dctx->expected = 0; /* Streaming not supported */
|
||||||
break;
|
break;
|
||||||
case bt_raw :
|
case bt_raw :
|
||||||
@@ -1298,6 +1413,7 @@ size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, c
|
|||||||
case ZSTDds_decodeSkippableHeader:
|
case ZSTDds_decodeSkippableHeader:
|
||||||
assert(src != NULL);
|
assert(src != NULL);
|
||||||
assert(srcSize <= ZSTD_SKIPPABLEHEADERSIZE);
|
assert(srcSize <= ZSTD_SKIPPABLEHEADERSIZE);
|
||||||
|
assert(dctx->format != ZSTD_f_zstd1_magicless);
|
||||||
ZSTD_memcpy(dctx->headerBuffer + (ZSTD_SKIPPABLEHEADERSIZE - srcSize), src, srcSize); /* complete skippable header */
|
ZSTD_memcpy(dctx->headerBuffer + (ZSTD_SKIPPABLEHEADERSIZE - srcSize), src, srcSize); /* complete skippable header */
|
||||||
dctx->expected = MEM_readLE32(dctx->headerBuffer + ZSTD_FRAMEIDSIZE); /* note : dctx->expected can grow seriously large, beyond local buffer size */
|
dctx->expected = MEM_readLE32(dctx->headerBuffer + ZSTD_FRAMEIDSIZE); /* note : dctx->expected can grow seriously large, beyond local buffer size */
|
||||||
dctx->stage = ZSTDds_skipFrame;
|
dctx->stage = ZSTDds_skipFrame;
|
||||||
@@ -1310,7 +1426,7 @@ size_t ZSTD_decompressContinue(ZSTD_DCtx* dctx, void* dst, size_t dstCapacity, c
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
assert(0); /* impossible */
|
assert(0); /* impossible */
|
||||||
RETURN_ERROR(GENERIC, "impossible to reach"); /* some compiler require default to do something */
|
RETURN_ERROR(GENERIC, "impossible to reach"); /* some compilers require default to do something */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1351,11 +1467,11 @@ ZSTD_loadDEntropy(ZSTD_entropyDTables_t* entropy,
|
|||||||
/* in minimal huffman, we always use X1 variants */
|
/* in minimal huffman, we always use X1 variants */
|
||||||
size_t const hSize = HUF_readDTableX1_wksp(entropy->hufTable,
|
size_t const hSize = HUF_readDTableX1_wksp(entropy->hufTable,
|
||||||
dictPtr, dictEnd - dictPtr,
|
dictPtr, dictEnd - dictPtr,
|
||||||
workspace, workspaceSize);
|
workspace, workspaceSize, /* flags */ 0);
|
||||||
#else
|
#else
|
||||||
size_t const hSize = HUF_readDTableX2_wksp(entropy->hufTable,
|
size_t const hSize = HUF_readDTableX2_wksp(entropy->hufTable,
|
||||||
dictPtr, (size_t)(dictEnd - dictPtr),
|
dictPtr, (size_t)(dictEnd - dictPtr),
|
||||||
workspace, workspaceSize);
|
workspace, workspaceSize, /* flags */ 0);
|
||||||
#endif
|
#endif
|
||||||
RETURN_ERROR_IF(HUF_isError(hSize), dictionary_corrupted, "");
|
RETURN_ERROR_IF(HUF_isError(hSize), dictionary_corrupted, "");
|
||||||
dictPtr += hSize;
|
dictPtr += hSize;
|
||||||
@@ -1454,10 +1570,11 @@ size_t ZSTD_decompressBegin(ZSTD_DCtx* dctx)
|
|||||||
dctx->prefixStart = NULL;
|
dctx->prefixStart = NULL;
|
||||||
dctx->virtualStart = NULL;
|
dctx->virtualStart = NULL;
|
||||||
dctx->dictEnd = NULL;
|
dctx->dictEnd = NULL;
|
||||||
dctx->entropy.hufTable[0] = (HUF_DTable)((HufLog)*0x1000001); /* cover both little and big endian */
|
dctx->entropy.hufTable[0] = (HUF_DTable)((ZSTD_HUFFDTABLE_CAPACITY_LOG)*0x1000001); /* cover both little and big endian */
|
||||||
dctx->litEntropy = dctx->fseEntropy = 0;
|
dctx->litEntropy = dctx->fseEntropy = 0;
|
||||||
dctx->dictID = 0;
|
dctx->dictID = 0;
|
||||||
dctx->bType = bt_reserved;
|
dctx->bType = bt_reserved;
|
||||||
|
dctx->isFrameDecompression = 1;
|
||||||
ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue));
|
ZSTD_STATIC_ASSERT(sizeof(dctx->entropy.rep) == sizeof(repStartValue));
|
||||||
ZSTD_memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue)); /* initial repcodes */
|
ZSTD_memcpy(dctx->entropy.rep, repStartValue, sizeof(repStartValue)); /* initial repcodes */
|
||||||
dctx->LLTptr = dctx->entropy.LLTable;
|
dctx->LLTptr = dctx->entropy.LLTable;
|
||||||
@@ -1516,7 +1633,7 @@ unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize)
|
|||||||
* This could for one of the following reasons :
|
* This could for one of the following reasons :
|
||||||
* - The frame does not require a dictionary (most common case).
|
* - The frame does not require a dictionary (most common case).
|
||||||
* - The frame was built with dictID intentionally removed.
|
* - The frame was built with dictID intentionally removed.
|
||||||
* Needed dictionary is a hidden information.
|
* Needed dictionary is a hidden piece of information.
|
||||||
* Note : this use case also happens when using a non-conformant dictionary.
|
* Note : this use case also happens when using a non-conformant dictionary.
|
||||||
* - `srcSize` is too small, and as a result, frame header could not be decoded.
|
* - `srcSize` is too small, and as a result, frame header could not be decoded.
|
||||||
* Note : possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`.
|
* Note : possible if `srcSize < ZSTD_FRAMEHEADERSIZE_MAX`.
|
||||||
@@ -1525,7 +1642,7 @@ unsigned ZSTD_getDictID_fromDict(const void* dict, size_t dictSize)
|
|||||||
* ZSTD_getFrameHeader(), which will provide a more precise error code. */
|
* ZSTD_getFrameHeader(), which will provide a more precise error code. */
|
||||||
unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize)
|
unsigned ZSTD_getDictID_fromFrame(const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0 };
|
ZSTD_frameHeader zfp = { 0, 0, 0, ZSTD_frame, 0, 0, 0, 0, 0 };
|
||||||
size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize);
|
size_t const hError = ZSTD_getFrameHeader(&zfp, src, srcSize);
|
||||||
if (ZSTD_isError(hError)) return 0;
|
if (ZSTD_isError(hError)) return 0;
|
||||||
return zfp.dictID;
|
return zfp.dictID;
|
||||||
@@ -1632,7 +1749,9 @@ size_t ZSTD_initDStream_usingDict(ZSTD_DStream* zds, const void* dict, size_t di
|
|||||||
size_t ZSTD_initDStream(ZSTD_DStream* zds)
|
size_t ZSTD_initDStream(ZSTD_DStream* zds)
|
||||||
{
|
{
|
||||||
DEBUGLOG(4, "ZSTD_initDStream");
|
DEBUGLOG(4, "ZSTD_initDStream");
|
||||||
return ZSTD_initDStream_usingDDict(zds, NULL);
|
FORWARD_IF_ERROR(ZSTD_DCtx_reset(zds, ZSTD_reset_session_only), "");
|
||||||
|
FORWARD_IF_ERROR(ZSTD_DCtx_refDDict(zds, NULL), "");
|
||||||
|
return ZSTD_startingInputLength(zds->format);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ZSTD_initDStream_usingDDict() :
|
/* ZSTD_initDStream_usingDDict() :
|
||||||
@@ -1640,6 +1759,7 @@ size_t ZSTD_initDStream(ZSTD_DStream* zds)
|
|||||||
* this function cannot fail */
|
* this function cannot fail */
|
||||||
size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict)
|
size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict)
|
||||||
{
|
{
|
||||||
|
DEBUGLOG(4, "ZSTD_initDStream_usingDDict");
|
||||||
FORWARD_IF_ERROR( ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only) , "");
|
FORWARD_IF_ERROR( ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only) , "");
|
||||||
FORWARD_IF_ERROR( ZSTD_DCtx_refDDict(dctx, ddict) , "");
|
FORWARD_IF_ERROR( ZSTD_DCtx_refDDict(dctx, ddict) , "");
|
||||||
return ZSTD_startingInputLength(dctx->format);
|
return ZSTD_startingInputLength(dctx->format);
|
||||||
@@ -1650,6 +1770,7 @@ size_t ZSTD_initDStream_usingDDict(ZSTD_DStream* dctx, const ZSTD_DDict* ddict)
|
|||||||
* this function cannot fail */
|
* this function cannot fail */
|
||||||
size_t ZSTD_resetDStream(ZSTD_DStream* dctx)
|
size_t ZSTD_resetDStream(ZSTD_DStream* dctx)
|
||||||
{
|
{
|
||||||
|
DEBUGLOG(4, "ZSTD_resetDStream");
|
||||||
FORWARD_IF_ERROR(ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only), "");
|
FORWARD_IF_ERROR(ZSTD_DCtx_reset(dctx, ZSTD_reset_session_only), "");
|
||||||
return ZSTD_startingInputLength(dctx->format);
|
return ZSTD_startingInputLength(dctx->format);
|
||||||
}
|
}
|
||||||
@@ -1721,6 +1842,15 @@ ZSTD_bounds ZSTD_dParam_getBounds(ZSTD_dParameter dParam)
|
|||||||
bounds.lowerBound = (int)ZSTD_rmd_refSingleDDict;
|
bounds.lowerBound = (int)ZSTD_rmd_refSingleDDict;
|
||||||
bounds.upperBound = (int)ZSTD_rmd_refMultipleDDicts;
|
bounds.upperBound = (int)ZSTD_rmd_refMultipleDDicts;
|
||||||
return bounds;
|
return bounds;
|
||||||
|
case ZSTD_d_disableHuffmanAssembly:
|
||||||
|
bounds.lowerBound = 0;
|
||||||
|
bounds.upperBound = 1;
|
||||||
|
return bounds;
|
||||||
|
case ZSTD_d_maxBlockSize:
|
||||||
|
bounds.lowerBound = ZSTD_BLOCKSIZE_MAX_MIN;
|
||||||
|
bounds.upperBound = ZSTD_BLOCKSIZE_MAX;
|
||||||
|
return bounds;
|
||||||
|
|
||||||
default:;
|
default:;
|
||||||
}
|
}
|
||||||
bounds.error = ERROR(parameter_unsupported);
|
bounds.error = ERROR(parameter_unsupported);
|
||||||
@@ -1761,6 +1891,12 @@ size_t ZSTD_DCtx_getParameter(ZSTD_DCtx* dctx, ZSTD_dParameter param, int* value
|
|||||||
case ZSTD_d_refMultipleDDicts:
|
case ZSTD_d_refMultipleDDicts:
|
||||||
*value = (int)dctx->refMultipleDDicts;
|
*value = (int)dctx->refMultipleDDicts;
|
||||||
return 0;
|
return 0;
|
||||||
|
case ZSTD_d_disableHuffmanAssembly:
|
||||||
|
*value = (int)dctx->disableHufAsm;
|
||||||
|
return 0;
|
||||||
|
case ZSTD_d_maxBlockSize:
|
||||||
|
*value = dctx->maxBlockSizeParam;
|
||||||
|
return 0;
|
||||||
default:;
|
default:;
|
||||||
}
|
}
|
||||||
RETURN_ERROR(parameter_unsupported, "");
|
RETURN_ERROR(parameter_unsupported, "");
|
||||||
@@ -1794,6 +1930,14 @@ size_t ZSTD_DCtx_setParameter(ZSTD_DCtx* dctx, ZSTD_dParameter dParam, int value
|
|||||||
}
|
}
|
||||||
dctx->refMultipleDDicts = (ZSTD_refMultipleDDicts_e)value;
|
dctx->refMultipleDDicts = (ZSTD_refMultipleDDicts_e)value;
|
||||||
return 0;
|
return 0;
|
||||||
|
case ZSTD_d_disableHuffmanAssembly:
|
||||||
|
CHECK_DBOUNDS(ZSTD_d_disableHuffmanAssembly, value);
|
||||||
|
dctx->disableHufAsm = value != 0;
|
||||||
|
return 0;
|
||||||
|
case ZSTD_d_maxBlockSize:
|
||||||
|
if (value != 0) CHECK_DBOUNDS(ZSTD_d_maxBlockSize, value);
|
||||||
|
dctx->maxBlockSizeParam = value;
|
||||||
|
return 0;
|
||||||
default:;
|
default:;
|
||||||
}
|
}
|
||||||
RETURN_ERROR(parameter_unsupported, "");
|
RETURN_ERROR(parameter_unsupported, "");
|
||||||
@@ -1805,6 +1949,7 @@ size_t ZSTD_DCtx_reset(ZSTD_DCtx* dctx, ZSTD_ResetDirective reset)
|
|||||||
|| (reset == ZSTD_reset_session_and_parameters) ) {
|
|| (reset == ZSTD_reset_session_and_parameters) ) {
|
||||||
dctx->streamStage = zdss_init;
|
dctx->streamStage = zdss_init;
|
||||||
dctx->noForwardProgress = 0;
|
dctx->noForwardProgress = 0;
|
||||||
|
dctx->isFrameDecompression = 1;
|
||||||
}
|
}
|
||||||
if ( (reset == ZSTD_reset_parameters)
|
if ( (reset == ZSTD_reset_parameters)
|
||||||
|| (reset == ZSTD_reset_session_and_parameters) ) {
|
|| (reset == ZSTD_reset_session_and_parameters) ) {
|
||||||
@@ -1821,11 +1966,17 @@ size_t ZSTD_sizeof_DStream(const ZSTD_DStream* dctx)
|
|||||||
return ZSTD_sizeof_DCtx(dctx);
|
return ZSTD_sizeof_DCtx(dctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize)
|
static size_t ZSTD_decodingBufferSize_internal(unsigned long long windowSize, unsigned long long frameContentSize, size_t blockSizeMax)
|
||||||
{
|
{
|
||||||
size_t const blockSize = (size_t) MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
|
size_t const blockSize = MIN((size_t)MIN(windowSize, ZSTD_BLOCKSIZE_MAX), blockSizeMax);
|
||||||
/* space is needed to store the litbuffer after the output of a given block without stomping the extDict of a previous run, as well as to cover both windows against wildcopy*/
|
/* We need blockSize + WILDCOPY_OVERLENGTH worth of buffer so that if a block
|
||||||
unsigned long long const neededRBSize = windowSize + blockSize + ZSTD_BLOCKSIZE_MAX + (WILDCOPY_OVERLENGTH * 2);
|
* ends at windowSize + WILDCOPY_OVERLENGTH + 1 bytes, we can start writing
|
||||||
|
* the block at the beginning of the output buffer, and maintain a full window.
|
||||||
|
*
|
||||||
|
* We need another blockSize worth of buffer so that we can store split
|
||||||
|
* literals at the end of the block without overwriting the extDict window.
|
||||||
|
*/
|
||||||
|
unsigned long long const neededRBSize = windowSize + (blockSize * 2) + (WILDCOPY_OVERLENGTH * 2);
|
||||||
unsigned long long const neededSize = MIN(frameContentSize, neededRBSize);
|
unsigned long long const neededSize = MIN(frameContentSize, neededRBSize);
|
||||||
size_t const minRBSize = (size_t) neededSize;
|
size_t const minRBSize = (size_t) neededSize;
|
||||||
RETURN_ERROR_IF((unsigned long long)minRBSize != neededSize,
|
RETURN_ERROR_IF((unsigned long long)minRBSize != neededSize,
|
||||||
@@ -1833,6 +1984,11 @@ size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long
|
|||||||
return minRBSize;
|
return minRBSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t ZSTD_decodingBufferSize_min(unsigned long long windowSize, unsigned long long frameContentSize)
|
||||||
|
{
|
||||||
|
return ZSTD_decodingBufferSize_internal(windowSize, frameContentSize, ZSTD_BLOCKSIZE_MAX);
|
||||||
|
}
|
||||||
|
|
||||||
size_t ZSTD_estimateDStreamSize(size_t windowSize)
|
size_t ZSTD_estimateDStreamSize(size_t windowSize)
|
||||||
{
|
{
|
||||||
size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
|
size_t const blockSize = MIN(windowSize, ZSTD_BLOCKSIZE_MAX);
|
||||||
@@ -1981,7 +2137,6 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
if (zds->refMultipleDDicts && zds->ddictSet) {
|
if (zds->refMultipleDDicts && zds->ddictSet) {
|
||||||
ZSTD_DCtx_selectFrameDDict(zds);
|
ZSTD_DCtx_selectFrameDDict(zds);
|
||||||
}
|
}
|
||||||
DEBUGLOG(5, "header size : %u", (U32)hSize);
|
|
||||||
if (ZSTD_isError(hSize)) {
|
if (ZSTD_isError(hSize)) {
|
||||||
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
|
#if defined(ZSTD_LEGACY_SUPPORT) && (ZSTD_LEGACY_SUPPORT>=1)
|
||||||
U32 const legacyVersion = ZSTD_isLegacy(istart, iend-istart);
|
U32 const legacyVersion = ZSTD_isLegacy(istart, iend-istart);
|
||||||
@@ -2013,6 +2168,11 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
zds->lhSize += remainingInput;
|
zds->lhSize += remainingInput;
|
||||||
}
|
}
|
||||||
input->pos = input->size;
|
input->pos = input->size;
|
||||||
|
/* check first few bytes */
|
||||||
|
FORWARD_IF_ERROR(
|
||||||
|
ZSTD_getFrameHeader_advanced(&zds->fParams, zds->headerBuffer, zds->lhSize, zds->format),
|
||||||
|
"First few bytes detected incorrect" );
|
||||||
|
/* return hint input size */
|
||||||
return (MAX((size_t)ZSTD_FRAMEHEADERSIZE_MIN(zds->format), hSize) - zds->lhSize) + ZSTD_blockHeaderSize; /* remaining header bytes + next block header */
|
return (MAX((size_t)ZSTD_FRAMEHEADERSIZE_MIN(zds->format), hSize) - zds->lhSize) + ZSTD_blockHeaderSize; /* remaining header bytes + next block header */
|
||||||
}
|
}
|
||||||
assert(ip != NULL);
|
assert(ip != NULL);
|
||||||
@@ -2024,14 +2184,15 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
if (zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
|
if (zds->fParams.frameContentSize != ZSTD_CONTENTSIZE_UNKNOWN
|
||||||
&& zds->fParams.frameType != ZSTD_skippableFrame
|
&& zds->fParams.frameType != ZSTD_skippableFrame
|
||||||
&& (U64)(size_t)(oend-op) >= zds->fParams.frameContentSize) {
|
&& (U64)(size_t)(oend-op) >= zds->fParams.frameContentSize) {
|
||||||
size_t const cSize = ZSTD_findFrameCompressedSize(istart, (size_t)(iend-istart));
|
size_t const cSize = ZSTD_findFrameCompressedSize_advanced(istart, (size_t)(iend-istart), zds->format);
|
||||||
if (cSize <= (size_t)(iend-istart)) {
|
if (cSize <= (size_t)(iend-istart)) {
|
||||||
/* shortcut : using single-pass mode */
|
/* shortcut : using single-pass mode */
|
||||||
size_t const decompressedSize = ZSTD_decompress_usingDDict(zds, op, (size_t)(oend-op), istart, cSize, ZSTD_getDDict(zds));
|
size_t const decompressedSize = ZSTD_decompress_usingDDict(zds, op, (size_t)(oend-op), istart, cSize, ZSTD_getDDict(zds));
|
||||||
if (ZSTD_isError(decompressedSize)) return decompressedSize;
|
if (ZSTD_isError(decompressedSize)) return decompressedSize;
|
||||||
DEBUGLOG(4, "shortcut to single-pass ZSTD_decompress_usingDDict()")
|
DEBUGLOG(4, "shortcut to single-pass ZSTD_decompress_usingDDict()");
|
||||||
|
assert(istart != NULL);
|
||||||
ip = istart + cSize;
|
ip = istart + cSize;
|
||||||
op += decompressedSize;
|
op = op ? op + decompressedSize : op; /* can occur if frameContentSize = 0 (empty frame) */
|
||||||
zds->expected = 0;
|
zds->expected = 0;
|
||||||
zds->streamStage = zdss_init;
|
zds->streamStage = zdss_init;
|
||||||
someMoreWork = 0;
|
someMoreWork = 0;
|
||||||
@@ -2050,7 +2211,8 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
DEBUGLOG(4, "Consume header");
|
DEBUGLOG(4, "Consume header");
|
||||||
FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(zds, ZSTD_getDDict(zds)), "");
|
FORWARD_IF_ERROR(ZSTD_decompressBegin_usingDDict(zds, ZSTD_getDDict(zds)), "");
|
||||||
|
|
||||||
if ((MEM_readLE32(zds->headerBuffer) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */
|
if (zds->format == ZSTD_f_zstd1
|
||||||
|
&& (MEM_readLE32(zds->headerBuffer) & ZSTD_MAGIC_SKIPPABLE_MASK) == ZSTD_MAGIC_SKIPPABLE_START) { /* skippable frame */
|
||||||
zds->expected = MEM_readLE32(zds->headerBuffer + ZSTD_FRAMEIDSIZE);
|
zds->expected = MEM_readLE32(zds->headerBuffer + ZSTD_FRAMEIDSIZE);
|
||||||
zds->stage = ZSTDds_skipFrame;
|
zds->stage = ZSTDds_skipFrame;
|
||||||
} else {
|
} else {
|
||||||
@@ -2066,11 +2228,13 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
zds->fParams.windowSize = MAX(zds->fParams.windowSize, 1U << ZSTD_WINDOWLOG_ABSOLUTEMIN);
|
zds->fParams.windowSize = MAX(zds->fParams.windowSize, 1U << ZSTD_WINDOWLOG_ABSOLUTEMIN);
|
||||||
RETURN_ERROR_IF(zds->fParams.windowSize > zds->maxWindowSize,
|
RETURN_ERROR_IF(zds->fParams.windowSize > zds->maxWindowSize,
|
||||||
frameParameter_windowTooLarge, "");
|
frameParameter_windowTooLarge, "");
|
||||||
|
if (zds->maxBlockSizeParam != 0)
|
||||||
|
zds->fParams.blockSizeMax = MIN(zds->fParams.blockSizeMax, (unsigned)zds->maxBlockSizeParam);
|
||||||
|
|
||||||
/* Adapt buffer sizes to frame header instructions */
|
/* Adapt buffer sizes to frame header instructions */
|
||||||
{ size_t const neededInBuffSize = MAX(zds->fParams.blockSizeMax, 4 /* frame checksum */);
|
{ size_t const neededInBuffSize = MAX(zds->fParams.blockSizeMax, 4 /* frame checksum */);
|
||||||
size_t const neededOutBuffSize = zds->outBufferMode == ZSTD_bm_buffered
|
size_t const neededOutBuffSize = zds->outBufferMode == ZSTD_bm_buffered
|
||||||
? ZSTD_decodingBufferSize_min(zds->fParams.windowSize, zds->fParams.frameContentSize)
|
? ZSTD_decodingBufferSize_internal(zds->fParams.windowSize, zds->fParams.frameContentSize, zds->fParams.blockSizeMax)
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
ZSTD_DCtx_updateOversizedDuration(zds, neededInBuffSize, neededOutBuffSize);
|
ZSTD_DCtx_updateOversizedDuration(zds, neededInBuffSize, neededOutBuffSize);
|
||||||
@@ -2115,6 +2279,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
}
|
}
|
||||||
if ((size_t)(iend-ip) >= neededInSize) { /* decode directly from src */
|
if ((size_t)(iend-ip) >= neededInSize) { /* decode directly from src */
|
||||||
FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, ip, neededInSize), "");
|
FORWARD_IF_ERROR(ZSTD_decompressContinueStream(zds, &op, oend, ip, neededInSize), "");
|
||||||
|
assert(ip != NULL);
|
||||||
ip += neededInSize;
|
ip += neededInSize;
|
||||||
/* Function modifies the stage so we must break */
|
/* Function modifies the stage so we must break */
|
||||||
break;
|
break;
|
||||||
@@ -2129,7 +2294,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
int const isSkipFrame = ZSTD_isSkipFrame(zds);
|
int const isSkipFrame = ZSTD_isSkipFrame(zds);
|
||||||
size_t loadedSize;
|
size_t loadedSize;
|
||||||
/* At this point we shouldn't be decompressing a block that we can stream. */
|
/* At this point we shouldn't be decompressing a block that we can stream. */
|
||||||
assert(neededInSize == ZSTD_nextSrcSizeToDecompressWithInputSize(zds, iend - ip));
|
assert(neededInSize == ZSTD_nextSrcSizeToDecompressWithInputSize(zds, (size_t)(iend - ip)));
|
||||||
if (isSkipFrame) {
|
if (isSkipFrame) {
|
||||||
loadedSize = MIN(toLoad, (size_t)(iend-ip));
|
loadedSize = MIN(toLoad, (size_t)(iend-ip));
|
||||||
} else {
|
} else {
|
||||||
@@ -2138,8 +2303,11 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
"should never happen");
|
"should never happen");
|
||||||
loadedSize = ZSTD_limitCopy(zds->inBuff + zds->inPos, toLoad, ip, (size_t)(iend-ip));
|
loadedSize = ZSTD_limitCopy(zds->inBuff + zds->inPos, toLoad, ip, (size_t)(iend-ip));
|
||||||
}
|
}
|
||||||
ip += loadedSize;
|
if (loadedSize != 0) {
|
||||||
zds->inPos += loadedSize;
|
/* ip may be NULL */
|
||||||
|
ip += loadedSize;
|
||||||
|
zds->inPos += loadedSize;
|
||||||
|
}
|
||||||
if (loadedSize < toLoad) { someMoreWork = 0; break; } /* not enough input, wait for more */
|
if (loadedSize < toLoad) { someMoreWork = 0; break; } /* not enough input, wait for more */
|
||||||
|
|
||||||
/* decode loaded input */
|
/* decode loaded input */
|
||||||
@@ -2149,14 +2317,17 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case zdss_flush:
|
case zdss_flush:
|
||||||
{ size_t const toFlushSize = zds->outEnd - zds->outStart;
|
{
|
||||||
|
size_t const toFlushSize = zds->outEnd - zds->outStart;
|
||||||
size_t const flushedSize = ZSTD_limitCopy(op, (size_t)(oend-op), zds->outBuff + zds->outStart, toFlushSize);
|
size_t const flushedSize = ZSTD_limitCopy(op, (size_t)(oend-op), zds->outBuff + zds->outStart, toFlushSize);
|
||||||
op += flushedSize;
|
|
||||||
|
op = op ? op + flushedSize : op;
|
||||||
|
|
||||||
zds->outStart += flushedSize;
|
zds->outStart += flushedSize;
|
||||||
if (flushedSize == toFlushSize) { /* flush completed */
|
if (flushedSize == toFlushSize) { /* flush completed */
|
||||||
zds->streamStage = zdss_read;
|
zds->streamStage = zdss_read;
|
||||||
if ( (zds->outBuffSize < zds->fParams.frameContentSize)
|
if ( (zds->outBuffSize < zds->fParams.frameContentSize)
|
||||||
&& (zds->outStart + zds->fParams.blockSizeMax > zds->outBuffSize) ) {
|
&& (zds->outStart + zds->fParams.blockSizeMax > zds->outBuffSize) ) {
|
||||||
DEBUGLOG(5, "restart filling outBuff from beginning (left:%i, needed:%u)",
|
DEBUGLOG(5, "restart filling outBuff from beginning (left:%i, needed:%u)",
|
||||||
(int)(zds->outBuffSize - zds->outStart),
|
(int)(zds->outBuffSize - zds->outStart),
|
||||||
(U32)zds->fParams.blockSizeMax);
|
(U32)zds->fParams.blockSizeMax);
|
||||||
@@ -2170,7 +2341,7 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
|
|
||||||
default:
|
default:
|
||||||
assert(0); /* impossible */
|
assert(0); /* impossible */
|
||||||
RETURN_ERROR(GENERIC, "impossible to reach"); /* some compiler require default to do something */
|
RETURN_ERROR(GENERIC, "impossible to reach"); /* some compilers require default to do something */
|
||||||
} }
|
} }
|
||||||
|
|
||||||
/* result */
|
/* result */
|
||||||
@@ -2183,8 +2354,8 @@ size_t ZSTD_decompressStream(ZSTD_DStream* zds, ZSTD_outBuffer* output, ZSTD_inB
|
|||||||
if ((ip==istart) && (op==ostart)) { /* no forward progress */
|
if ((ip==istart) && (op==ostart)) { /* no forward progress */
|
||||||
zds->noForwardProgress ++;
|
zds->noForwardProgress ++;
|
||||||
if (zds->noForwardProgress >= ZSTD_NO_FORWARD_PROGRESS_MAX) {
|
if (zds->noForwardProgress >= ZSTD_NO_FORWARD_PROGRESS_MAX) {
|
||||||
RETURN_ERROR_IF(op==oend, dstSize_tooSmall, "");
|
RETURN_ERROR_IF(op==oend, noForwardProgress_destFull, "");
|
||||||
RETURN_ERROR_IF(ip==iend, srcSize_wrong, "");
|
RETURN_ERROR_IF(ip==iend, noForwardProgress_inputEmpty, "");
|
||||||
assert(0);
|
assert(0);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -2221,13 +2392,19 @@ size_t ZSTD_decompressStream_simpleArgs (
|
|||||||
void* dst, size_t dstCapacity, size_t* dstPos,
|
void* dst, size_t dstCapacity, size_t* dstPos,
|
||||||
const void* src, size_t srcSize, size_t* srcPos)
|
const void* src, size_t srcSize, size_t* srcPos)
|
||||||
{
|
{
|
||||||
ZSTD_outBuffer output = { dst, dstCapacity, *dstPos };
|
ZSTD_outBuffer output;
|
||||||
ZSTD_inBuffer input = { src, srcSize, *srcPos };
|
ZSTD_inBuffer input;
|
||||||
/* ZSTD_compress_generic() will check validity of dstPos and srcPos */
|
output.dst = dst;
|
||||||
size_t const cErr = ZSTD_decompressStream(dctx, &output, &input);
|
output.size = dstCapacity;
|
||||||
*dstPos = output.pos;
|
output.pos = *dstPos;
|
||||||
*srcPos = input.pos;
|
input.src = src;
|
||||||
return cErr;
|
input.size = srcSize;
|
||||||
|
input.pos = *srcPos;
|
||||||
|
{ size_t const cErr = ZSTD_decompressStream(dctx, &output, &input);
|
||||||
|
*dstPos = output.pos;
|
||||||
|
*srcPos = input.pos;
|
||||||
|
return cErr;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
705
vendor/github.com/DataDog/zstd/zstd_decompress_block.c
generated
vendored
705
vendor/github.com/DataDog/zstd/zstd_decompress_block.c
generated
vendored
File diff suppressed because it is too large
Load Diff
9
vendor/github.com/DataDog/zstd/zstd_decompress_block.h
generated
vendored
9
vendor/github.com/DataDog/zstd/zstd_decompress_block.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -48,7 +48,7 @@ typedef enum {
|
|||||||
*/
|
*/
|
||||||
size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
|
size_t ZSTD_decompressBlock_internal(ZSTD_DCtx* dctx,
|
||||||
void* dst, size_t dstCapacity,
|
void* dst, size_t dstCapacity,
|
||||||
const void* src, size_t srcSize, const int frame, const streaming_operation streaming);
|
const void* src, size_t srcSize, const streaming_operation streaming);
|
||||||
|
|
||||||
/* ZSTD_buildFSETable() :
|
/* ZSTD_buildFSETable() :
|
||||||
* generate FSE decoding table for one symbol (ll, ml or off)
|
* generate FSE decoding table for one symbol (ll, ml or off)
|
||||||
@@ -65,6 +65,11 @@ void ZSTD_buildFSETable(ZSTD_seqSymbol* dt,
|
|||||||
unsigned tableLog, void* wksp, size_t wkspSize,
|
unsigned tableLog, void* wksp, size_t wkspSize,
|
||||||
int bmi2);
|
int bmi2);
|
||||||
|
|
||||||
|
/* Internal definition of ZSTD_decompressBlock() to avoid deprecation warnings. */
|
||||||
|
size_t ZSTD_decompressBlock_deprecated(ZSTD_DCtx* dctx,
|
||||||
|
void* dst, size_t dstCapacity,
|
||||||
|
const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
|
||||||
#endif /* ZSTD_DEC_BLOCK_H */
|
#endif /* ZSTD_DEC_BLOCK_H */
|
||||||
|
|
||||||
|
|||||||
8
vendor/github.com/DataDog/zstd/zstd_decompress_internal.h
generated
vendored
8
vendor/github.com/DataDog/zstd/zstd_decompress_internal.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -76,12 +76,13 @@ static UNUSED_ATTR const U32 ML_base[MaxML+1] = {
|
|||||||
|
|
||||||
#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE (sizeof(S16) * (MaxSeq + 1) + (1u << MaxFSELog) + sizeof(U64))
|
#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE (sizeof(S16) * (MaxSeq + 1) + (1u << MaxFSELog) + sizeof(U64))
|
||||||
#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32 ((ZSTD_BUILD_FSE_TABLE_WKSP_SIZE + sizeof(U32) - 1) / sizeof(U32))
|
#define ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32 ((ZSTD_BUILD_FSE_TABLE_WKSP_SIZE + sizeof(U32) - 1) / sizeof(U32))
|
||||||
|
#define ZSTD_HUFFDTABLE_CAPACITY_LOG 12
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
ZSTD_seqSymbol LLTable[SEQSYMBOL_TABLE_SIZE(LLFSELog)]; /* Note : Space reserved for FSE Tables */
|
ZSTD_seqSymbol LLTable[SEQSYMBOL_TABLE_SIZE(LLFSELog)]; /* Note : Space reserved for FSE Tables */
|
||||||
ZSTD_seqSymbol OFTable[SEQSYMBOL_TABLE_SIZE(OffFSELog)]; /* is also used as temporary workspace while building hufTable during DDict creation */
|
ZSTD_seqSymbol OFTable[SEQSYMBOL_TABLE_SIZE(OffFSELog)]; /* is also used as temporary workspace while building hufTable during DDict creation */
|
||||||
ZSTD_seqSymbol MLTable[SEQSYMBOL_TABLE_SIZE(MLFSELog)]; /* and therefore must be at least HUF_DECOMPRESS_WORKSPACE_SIZE large */
|
ZSTD_seqSymbol MLTable[SEQSYMBOL_TABLE_SIZE(MLFSELog)]; /* and therefore must be at least HUF_DECOMPRESS_WORKSPACE_SIZE large */
|
||||||
HUF_DTable hufTable[HUF_DTABLE_SIZE(HufLog)]; /* can accommodate HUF_decompress4X */
|
HUF_DTable hufTable[HUF_DTABLE_SIZE(ZSTD_HUFFDTABLE_CAPACITY_LOG)]; /* can accommodate HUF_decompress4X */
|
||||||
U32 rep[ZSTD_REP_NUM];
|
U32 rep[ZSTD_REP_NUM];
|
||||||
U32 workspace[ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32];
|
U32 workspace[ZSTD_BUILD_FSE_TABLE_WKSP_SIZE_U32];
|
||||||
} ZSTD_entropyDTables_t;
|
} ZSTD_entropyDTables_t;
|
||||||
@@ -153,6 +154,7 @@ struct ZSTD_DCtx_s
|
|||||||
size_t litSize;
|
size_t litSize;
|
||||||
size_t rleSize;
|
size_t rleSize;
|
||||||
size_t staticSize;
|
size_t staticSize;
|
||||||
|
int isFrameDecompression;
|
||||||
#if DYNAMIC_BMI2 != 0
|
#if DYNAMIC_BMI2 != 0
|
||||||
int bmi2; /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
|
int bmi2; /* == 1 if the CPU supports BMI2 and 0 otherwise. CPU support is determined dynamically once per context lifetime. */
|
||||||
#endif
|
#endif
|
||||||
@@ -165,6 +167,8 @@ struct ZSTD_DCtx_s
|
|||||||
ZSTD_dictUses_e dictUses;
|
ZSTD_dictUses_e dictUses;
|
||||||
ZSTD_DDictHashSet* ddictSet; /* Hash set for multiple ddicts */
|
ZSTD_DDictHashSet* ddictSet; /* Hash set for multiple ddicts */
|
||||||
ZSTD_refMultipleDDicts_e refMultipleDDicts; /* User specified: if == 1, will allow references to multiple DDicts. Default == 0 (disabled) */
|
ZSTD_refMultipleDDicts_e refMultipleDDicts; /* User specified: if == 1, will allow references to multiple DDicts. Default == 0 (disabled) */
|
||||||
|
int disableHufAsm;
|
||||||
|
int maxBlockSizeParam;
|
||||||
|
|
||||||
/* streaming */
|
/* streaming */
|
||||||
ZSTD_dStreamStage streamStage;
|
ZSTD_dStreamStage streamStage;
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_deps.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_deps.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
142
vendor/github.com/DataDog/zstd/zstd_double_fast.c
generated
vendored
142
vendor/github.com/DataDog/zstd/zstd_double_fast.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -12,8 +12,49 @@
|
|||||||
#include "zstd_compress_internal.h"
|
#include "zstd_compress_internal.h"
|
||||||
#include "zstd_double_fast.h"
|
#include "zstd_double_fast.h"
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR
|
||||||
|
|
||||||
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
void ZSTD_fillDoubleHashTableForCDict(ZSTD_matchState_t* ms,
|
||||||
|
void const* end, ZSTD_dictTableLoadMethod_e dtlm)
|
||||||
|
{
|
||||||
|
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
||||||
|
U32* const hashLarge = ms->hashTable;
|
||||||
|
U32 const hBitsL = cParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
U32 const mls = cParams->minMatch;
|
||||||
|
U32* const hashSmall = ms->chainTable;
|
||||||
|
U32 const hBitsS = cParams->chainLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
const BYTE* const base = ms->window.base;
|
||||||
|
const BYTE* ip = base + ms->nextToUpdate;
|
||||||
|
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
||||||
|
const U32 fastHashFillStep = 3;
|
||||||
|
|
||||||
|
/* Always insert every fastHashFillStep position into the hash tables.
|
||||||
|
* Insert the other positions into the large hash table if their entry
|
||||||
|
* is empty.
|
||||||
|
*/
|
||||||
|
for (; ip + fastHashFillStep - 1 <= iend; ip += fastHashFillStep) {
|
||||||
|
U32 const curr = (U32)(ip - base);
|
||||||
|
U32 i;
|
||||||
|
for (i = 0; i < fastHashFillStep; ++i) {
|
||||||
|
size_t const smHashAndTag = ZSTD_hashPtr(ip + i, hBitsS, mls);
|
||||||
|
size_t const lgHashAndTag = ZSTD_hashPtr(ip + i, hBitsL, 8);
|
||||||
|
if (i == 0) {
|
||||||
|
ZSTD_writeTaggedIndex(hashSmall, smHashAndTag, curr + i);
|
||||||
|
}
|
||||||
|
if (i == 0 || hashLarge[lgHashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS] == 0) {
|
||||||
|
ZSTD_writeTaggedIndex(hashLarge, lgHashAndTag, curr + i);
|
||||||
|
}
|
||||||
|
/* Only load extra positions for ZSTD_dtlm_full */
|
||||||
|
if (dtlm == ZSTD_dtlm_fast)
|
||||||
|
break;
|
||||||
|
} }
|
||||||
|
}
|
||||||
|
|
||||||
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
void ZSTD_fillDoubleHashTableForCCtx(ZSTD_matchState_t* ms,
|
||||||
void const* end, ZSTD_dictTableLoadMethod_e dtlm)
|
void const* end, ZSTD_dictTableLoadMethod_e dtlm)
|
||||||
{
|
{
|
||||||
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
||||||
@@ -44,11 +85,24 @@ void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
|
|||||||
/* Only load extra positions for ZSTD_dtlm_full */
|
/* Only load extra positions for ZSTD_dtlm_full */
|
||||||
if (dtlm == ZSTD_dtlm_fast)
|
if (dtlm == ZSTD_dtlm_fast)
|
||||||
break;
|
break;
|
||||||
} }
|
} }
|
||||||
|
}
|
||||||
|
|
||||||
|
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
|
||||||
|
const void* const end,
|
||||||
|
ZSTD_dictTableLoadMethod_e dtlm,
|
||||||
|
ZSTD_tableFillPurpose_e tfp)
|
||||||
|
{
|
||||||
|
if (tfp == ZSTD_tfp_forCDict) {
|
||||||
|
ZSTD_fillDoubleHashTableForCDict(ms, end, dtlm);
|
||||||
|
} else {
|
||||||
|
ZSTD_fillDoubleHashTableForCCtx(ms, end, dtlm);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize, U32 const mls /* template */)
|
void const* src, size_t srcSize, U32 const mls /* template */)
|
||||||
@@ -68,7 +122,7 @@ size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
|||||||
const BYTE* const iend = istart + srcSize;
|
const BYTE* const iend = istart + srcSize;
|
||||||
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
||||||
U32 offset_1=rep[0], offset_2=rep[1];
|
U32 offset_1=rep[0], offset_2=rep[1];
|
||||||
U32 offsetSaved = 0;
|
U32 offsetSaved1 = 0, offsetSaved2 = 0;
|
||||||
|
|
||||||
size_t mLength;
|
size_t mLength;
|
||||||
U32 offset;
|
U32 offset;
|
||||||
@@ -101,8 +155,8 @@ size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
|||||||
U32 const current = (U32)(ip - base);
|
U32 const current = (U32)(ip - base);
|
||||||
U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, current, cParams->windowLog);
|
U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, current, cParams->windowLog);
|
||||||
U32 const maxRep = current - windowLow;
|
U32 const maxRep = current - windowLow;
|
||||||
if (offset_2 > maxRep) offsetSaved = offset_2, offset_2 = 0;
|
if (offset_2 > maxRep) offsetSaved2 = offset_2, offset_2 = 0;
|
||||||
if (offset_1 > maxRep) offsetSaved = offset_1, offset_1 = 0;
|
if (offset_1 > maxRep) offsetSaved1 = offset_1, offset_1 = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Outer Loop: one iteration per match found and stored */
|
/* Outer Loop: one iteration per match found and stored */
|
||||||
@@ -132,7 +186,7 @@ size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
|||||||
if ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1))) {
|
if ((offset_1 > 0) & (MEM_read32(ip+1-offset_1) == MEM_read32(ip+1))) {
|
||||||
mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
|
mLength = ZSTD_count(ip+1+4, ip+1+4-offset_1, iend) + 4;
|
||||||
ip++;
|
ip++;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_REPCODE_1, mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength);
|
||||||
goto _match_stored;
|
goto _match_stored;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,9 +230,13 @@ size_t ZSTD_compressBlock_doubleFast_noDict_generic(
|
|||||||
} while (ip1 <= ilimit);
|
} while (ip1 <= ilimit);
|
||||||
|
|
||||||
_cleanup:
|
_cleanup:
|
||||||
|
/* If offset_1 started invalid (offsetSaved1 != 0) and became valid (offset_1 != 0),
|
||||||
|
* rotate saved offsets. See comment in ZSTD_compressBlock_fast_noDict for more context. */
|
||||||
|
offsetSaved2 = ((offsetSaved1 != 0) && (offset_1 != 0)) ? offsetSaved1 : offsetSaved2;
|
||||||
|
|
||||||
/* save reps for next block */
|
/* save reps for next block */
|
||||||
rep[0] = offset_1 ? offset_1 : offsetSaved;
|
rep[0] = offset_1 ? offset_1 : offsetSaved1;
|
||||||
rep[1] = offset_2 ? offset_2 : offsetSaved;
|
rep[1] = offset_2 ? offset_2 : offsetSaved2;
|
||||||
|
|
||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
@@ -218,7 +276,7 @@ _match_found: /* requires ip, offset, mLength */
|
|||||||
hashLong[hl1] = (U32)(ip1 - base);
|
hashLong[hl1] = (U32)(ip1 - base);
|
||||||
}
|
}
|
||||||
|
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
|
||||||
_match_stored:
|
_match_stored:
|
||||||
/* match found */
|
/* match found */
|
||||||
@@ -244,7 +302,7 @@ _match_stored:
|
|||||||
U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; /* swap offset_2 <=> offset_1 */
|
U32 const tmpOff = offset_2; offset_2 = offset_1; offset_1 = tmpOff; /* swap offset_2 <=> offset_1 */
|
||||||
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = (U32)(ip-base);
|
||||||
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
|
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = (U32)(ip-base);
|
||||||
ZSTD_storeSeq(seqStore, 0, anchor, iend, STORE_REPCODE_1, rLength);
|
ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, rLength);
|
||||||
ip += rLength;
|
ip += rLength;
|
||||||
anchor = ip;
|
anchor = ip;
|
||||||
continue; /* faster when present ... (?) */
|
continue; /* faster when present ... (?) */
|
||||||
@@ -255,6 +313,7 @@ _match_stored:
|
|||||||
|
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize,
|
void const* src, size_t srcSize,
|
||||||
@@ -276,7 +335,6 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
const BYTE* const iend = istart + srcSize;
|
const BYTE* const iend = istart + srcSize;
|
||||||
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
||||||
U32 offset_1=rep[0], offset_2=rep[1];
|
U32 offset_1=rep[0], offset_2=rep[1];
|
||||||
U32 offsetSaved = 0;
|
|
||||||
|
|
||||||
const ZSTD_matchState_t* const dms = ms->dictMatchState;
|
const ZSTD_matchState_t* const dms = ms->dictMatchState;
|
||||||
const ZSTD_compressionParameters* const dictCParams = &dms->cParams;
|
const ZSTD_compressionParameters* const dictCParams = &dms->cParams;
|
||||||
@@ -287,8 +345,8 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
const BYTE* const dictStart = dictBase + dictStartIndex;
|
const BYTE* const dictStart = dictBase + dictStartIndex;
|
||||||
const BYTE* const dictEnd = dms->window.nextSrc;
|
const BYTE* const dictEnd = dms->window.nextSrc;
|
||||||
const U32 dictIndexDelta = prefixLowestIndex - (U32)(dictEnd - dictBase);
|
const U32 dictIndexDelta = prefixLowestIndex - (U32)(dictEnd - dictBase);
|
||||||
const U32 dictHBitsL = dictCParams->hashLog;
|
const U32 dictHBitsL = dictCParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
const U32 dictHBitsS = dictCParams->chainLog;
|
const U32 dictHBitsS = dictCParams->chainLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
const U32 dictAndPrefixLength = (U32)((ip - prefixLowest) + (dictEnd - dictStart));
|
const U32 dictAndPrefixLength = (U32)((ip - prefixLowest) + (dictEnd - dictStart));
|
||||||
|
|
||||||
DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_dictMatchState_generic");
|
DEBUGLOG(5, "ZSTD_compressBlock_doubleFast_dictMatchState_generic");
|
||||||
@@ -296,6 +354,13 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
/* if a dictionary is attached, it must be within window range */
|
/* if a dictionary is attached, it must be within window range */
|
||||||
assert(ms->window.dictLimit + (1U << cParams->windowLog) >= endIndex);
|
assert(ms->window.dictLimit + (1U << cParams->windowLog) >= endIndex);
|
||||||
|
|
||||||
|
if (ms->prefetchCDictTables) {
|
||||||
|
size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32);
|
||||||
|
size_t const chainTableBytes = (((size_t)1) << dictCParams->chainLog) * sizeof(U32);
|
||||||
|
PREFETCH_AREA(dictHashLong, hashTableBytes);
|
||||||
|
PREFETCH_AREA(dictHashSmall, chainTableBytes);
|
||||||
|
}
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
ip += (dictAndPrefixLength == 0);
|
ip += (dictAndPrefixLength == 0);
|
||||||
|
|
||||||
@@ -310,8 +375,12 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
U32 offset;
|
U32 offset;
|
||||||
size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
|
size_t const h2 = ZSTD_hashPtr(ip, hBitsL, 8);
|
||||||
size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
|
size_t const h = ZSTD_hashPtr(ip, hBitsS, mls);
|
||||||
size_t const dictHL = ZSTD_hashPtr(ip, dictHBitsL, 8);
|
size_t const dictHashAndTagL = ZSTD_hashPtr(ip, dictHBitsL, 8);
|
||||||
size_t const dictHS = ZSTD_hashPtr(ip, dictHBitsS, mls);
|
size_t const dictHashAndTagS = ZSTD_hashPtr(ip, dictHBitsS, mls);
|
||||||
|
U32 const dictMatchIndexAndTagL = dictHashLong[dictHashAndTagL >> ZSTD_SHORT_CACHE_TAG_BITS];
|
||||||
|
U32 const dictMatchIndexAndTagS = dictHashSmall[dictHashAndTagS >> ZSTD_SHORT_CACHE_TAG_BITS];
|
||||||
|
int const dictTagsMatchL = ZSTD_comparePackedTags(dictMatchIndexAndTagL, dictHashAndTagL);
|
||||||
|
int const dictTagsMatchS = ZSTD_comparePackedTags(dictMatchIndexAndTagS, dictHashAndTagS);
|
||||||
U32 const curr = (U32)(ip-base);
|
U32 const curr = (U32)(ip-base);
|
||||||
U32 const matchIndexL = hashLong[h2];
|
U32 const matchIndexL = hashLong[h2];
|
||||||
U32 matchIndexS = hashSmall[h];
|
U32 matchIndexS = hashSmall[h];
|
||||||
@@ -329,7 +398,7 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
|
const BYTE* repMatchEnd = repIndex < prefixLowestIndex ? dictEnd : iend;
|
||||||
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
|
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixLowest) + 4;
|
||||||
ip++;
|
ip++;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_REPCODE_1, mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength);
|
||||||
goto _match_stored;
|
goto _match_stored;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,9 +410,9 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
while (((ip>anchor) & (matchLong>prefixLowest)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
||||||
goto _match_found;
|
goto _match_found;
|
||||||
}
|
}
|
||||||
} else {
|
} else if (dictTagsMatchL) {
|
||||||
/* check dictMatchState long match */
|
/* check dictMatchState long match */
|
||||||
U32 const dictMatchIndexL = dictHashLong[dictHL];
|
U32 const dictMatchIndexL = dictMatchIndexAndTagL >> ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
const BYTE* dictMatchL = dictBase + dictMatchIndexL;
|
const BYTE* dictMatchL = dictBase + dictMatchIndexL;
|
||||||
assert(dictMatchL < dictEnd);
|
assert(dictMatchL < dictEnd);
|
||||||
|
|
||||||
@@ -359,9 +428,9 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
if (MEM_read32(match) == MEM_read32(ip)) {
|
if (MEM_read32(match) == MEM_read32(ip)) {
|
||||||
goto _search_next_long;
|
goto _search_next_long;
|
||||||
}
|
}
|
||||||
} else {
|
} else if (dictTagsMatchS) {
|
||||||
/* check dictMatchState short match */
|
/* check dictMatchState short match */
|
||||||
U32 const dictMatchIndexS = dictHashSmall[dictHS];
|
U32 const dictMatchIndexS = dictMatchIndexAndTagS >> ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
match = dictBase + dictMatchIndexS;
|
match = dictBase + dictMatchIndexS;
|
||||||
matchIndexS = dictMatchIndexS + dictIndexDelta;
|
matchIndexS = dictMatchIndexS + dictIndexDelta;
|
||||||
|
|
||||||
@@ -376,10 +445,11 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState_generic(
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
_search_next_long:
|
_search_next_long:
|
||||||
|
|
||||||
{ size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
{ size_t const hl3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
||||||
size_t const dictHLNext = ZSTD_hashPtr(ip+1, dictHBitsL, 8);
|
size_t const dictHashAndTagL3 = ZSTD_hashPtr(ip+1, dictHBitsL, 8);
|
||||||
U32 const matchIndexL3 = hashLong[hl3];
|
U32 const matchIndexL3 = hashLong[hl3];
|
||||||
|
U32 const dictMatchIndexAndTagL3 = dictHashLong[dictHashAndTagL3 >> ZSTD_SHORT_CACHE_TAG_BITS];
|
||||||
|
int const dictTagsMatchL3 = ZSTD_comparePackedTags(dictMatchIndexAndTagL3, dictHashAndTagL3);
|
||||||
const BYTE* matchL3 = base + matchIndexL3;
|
const BYTE* matchL3 = base + matchIndexL3;
|
||||||
hashLong[hl3] = curr + 1;
|
hashLong[hl3] = curr + 1;
|
||||||
|
|
||||||
@@ -392,9 +462,9 @@ _search_next_long:
|
|||||||
while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
|
while (((ip>anchor) & (matchL3>prefixLowest)) && (ip[-1] == matchL3[-1])) { ip--; matchL3--; mLength++; } /* catch up */
|
||||||
goto _match_found;
|
goto _match_found;
|
||||||
}
|
}
|
||||||
} else {
|
} else if (dictTagsMatchL3) {
|
||||||
/* check dict long +1 match */
|
/* check dict long +1 match */
|
||||||
U32 const dictMatchIndexL3 = dictHashLong[dictHLNext];
|
U32 const dictMatchIndexL3 = dictMatchIndexAndTagL3 >> ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3;
|
const BYTE* dictMatchL3 = dictBase + dictMatchIndexL3;
|
||||||
assert(dictMatchL3 < dictEnd);
|
assert(dictMatchL3 < dictEnd);
|
||||||
if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) {
|
if (dictMatchL3 > dictStart && MEM_read64(dictMatchL3) == MEM_read64(ip+1)) {
|
||||||
@@ -420,7 +490,7 @@ _match_found:
|
|||||||
offset_2 = offset_1;
|
offset_2 = offset_1;
|
||||||
offset_1 = offset;
|
offset_1 = offset;
|
||||||
|
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
|
||||||
_match_stored:
|
_match_stored:
|
||||||
/* match found */
|
/* match found */
|
||||||
@@ -449,7 +519,7 @@ _match_stored:
|
|||||||
const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend;
|
const BYTE* const repEnd2 = repIndex2 < prefixLowestIndex ? dictEnd : iend;
|
||||||
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4;
|
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixLowest) + 4;
|
||||||
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
||||||
ZSTD_storeSeq(seqStore, 0, anchor, iend, STORE_REPCODE_1, repLength2);
|
ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2);
|
||||||
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
|
||||||
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
|
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
|
||||||
ip += repLength2;
|
ip += repLength2;
|
||||||
@@ -462,8 +532,8 @@ _match_stored:
|
|||||||
} /* while (ip < ilimit) */
|
} /* while (ip < ilimit) */
|
||||||
|
|
||||||
/* save reps for next block */
|
/* save reps for next block */
|
||||||
rep[0] = offset_1 ? offset_1 : offsetSaved;
|
rep[0] = offset_1;
|
||||||
rep[1] = offset_2 ? offset_2 : offsetSaved;
|
rep[1] = offset_2;
|
||||||
|
|
||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
@@ -528,7 +598,9 @@ size_t ZSTD_compressBlock_doubleFast_dictMatchState(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize,
|
void const* src, size_t srcSize,
|
||||||
U32 const mls /* template */)
|
U32 const mls /* template */)
|
||||||
@@ -586,7 +658,7 @@ static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
|||||||
const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
const BYTE* repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
||||||
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
|
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
|
||||||
ip++;
|
ip++;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_REPCODE_1, mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength);
|
||||||
} else {
|
} else {
|
||||||
if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
|
if ((matchLongIndex > dictStartIndex) && (MEM_read64(matchLong) == MEM_read64(ip))) {
|
||||||
const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend;
|
const BYTE* const matchEnd = matchLongIndex < prefixStartIndex ? dictEnd : iend;
|
||||||
@@ -597,7 +669,7 @@ static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
|||||||
while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
while (((ip>anchor) & (matchLong>lowMatchPtr)) && (ip[-1] == matchLong[-1])) { ip--; matchLong--; mLength++; } /* catch up */
|
||||||
offset_2 = offset_1;
|
offset_2 = offset_1;
|
||||||
offset_1 = offset;
|
offset_1 = offset;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
|
||||||
} else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) {
|
} else if ((matchIndex > dictStartIndex) && (MEM_read32(match) == MEM_read32(ip))) {
|
||||||
size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
size_t const h3 = ZSTD_hashPtr(ip+1, hBitsL, 8);
|
||||||
@@ -622,7 +694,7 @@ static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
|||||||
}
|
}
|
||||||
offset_2 = offset_1;
|
offset_2 = offset_1;
|
||||||
offset_1 = offset;
|
offset_1 = offset;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
ip += ((ip-anchor) >> kSearchStrength) + 1;
|
ip += ((ip-anchor) >> kSearchStrength) + 1;
|
||||||
@@ -654,7 +726,7 @@ static size_t ZSTD_compressBlock_doubleFast_extDict_generic(
|
|||||||
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
||||||
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
||||||
U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
||||||
ZSTD_storeSeq(seqStore, 0, anchor, iend, STORE_REPCODE_1, repLength2);
|
ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2);
|
||||||
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
|
hashSmall[ZSTD_hashPtr(ip, hBitsS, mls)] = current2;
|
||||||
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
|
hashLong[ZSTD_hashPtr(ip, hBitsL, 8)] = current2;
|
||||||
ip += repLength2;
|
ip += repLength2;
|
||||||
@@ -696,4 +768,6 @@ size_t ZSTD_compressBlock_doubleFast_extDict(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */
|
||||||
|
|
||||||
#endif /* USE_EXTERNAL_ZSTD */
|
#endif /* USE_EXTERNAL_ZSTD */
|
||||||
|
|||||||
16
vendor/github.com/DataDog/zstd/zstd_double_fast.h
generated
vendored
16
vendor/github.com/DataDog/zstd/zstd_double_fast.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -19,8 +19,12 @@ extern "C" {
|
|||||||
#include "mem.h" /* U32 */
|
#include "mem.h" /* U32 */
|
||||||
#include "zstd_compress_internal.h" /* ZSTD_CCtx, size_t */
|
#include "zstd_compress_internal.h" /* ZSTD_CCtx, size_t */
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR
|
||||||
|
|
||||||
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
|
void ZSTD_fillDoubleHashTable(ZSTD_matchState_t* ms,
|
||||||
void const* end, ZSTD_dictTableLoadMethod_e dtlm);
|
void const* end, ZSTD_dictTableLoadMethod_e dtlm,
|
||||||
|
ZSTD_tableFillPurpose_e tfp);
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_doubleFast(
|
size_t ZSTD_compressBlock_doubleFast(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
@@ -31,6 +35,14 @@ size_t ZSTD_compressBlock_doubleFast_extDict(
|
|||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST ZSTD_compressBlock_doubleFast
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_DICTMATCHSTATE ZSTD_compressBlock_doubleFast_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT ZSTD_compressBlock_doubleFast_extDict
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_DOUBLEFAST_EXTDICT NULL
|
||||||
|
#endif /* ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR */
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
|
|||||||
35
vendor/github.com/DataDog/zstd/zstd_errors.h
generated
vendored
35
vendor/github.com/DataDog/zstd/zstd_errors.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -21,19 +21,31 @@ extern "C" {
|
|||||||
|
|
||||||
|
|
||||||
/* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */
|
/* ===== ZSTDERRORLIB_API : control library symbols visibility ===== */
|
||||||
#ifndef ZSTDERRORLIB_VISIBILITY
|
#ifndef ZSTDERRORLIB_VISIBLE
|
||||||
# if defined(__GNUC__) && (__GNUC__ >= 4)
|
/* Backwards compatibility with old macro name */
|
||||||
# define ZSTDERRORLIB_VISIBILITY __attribute__ ((visibility ("default")))
|
# ifdef ZSTDERRORLIB_VISIBILITY
|
||||||
|
# define ZSTDERRORLIB_VISIBLE ZSTDERRORLIB_VISIBILITY
|
||||||
|
# elif defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
|
||||||
|
# define ZSTDERRORLIB_VISIBLE __attribute__ ((visibility ("default")))
|
||||||
# else
|
# else
|
||||||
# define ZSTDERRORLIB_VISIBILITY
|
# define ZSTDERRORLIB_VISIBLE
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTDERRORLIB_HIDDEN
|
||||||
|
# if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__MINGW32__)
|
||||||
|
# define ZSTDERRORLIB_HIDDEN __attribute__ ((visibility ("hidden")))
|
||||||
|
# else
|
||||||
|
# define ZSTDERRORLIB_HIDDEN
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
|
#if defined(ZSTD_DLL_EXPORT) && (ZSTD_DLL_EXPORT==1)
|
||||||
# define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBILITY
|
# define ZSTDERRORLIB_API __declspec(dllexport) ZSTDERRORLIB_VISIBLE
|
||||||
#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
|
#elif defined(ZSTD_DLL_IMPORT) && (ZSTD_DLL_IMPORT==1)
|
||||||
# define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBILITY /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
|
# define ZSTDERRORLIB_API __declspec(dllimport) ZSTDERRORLIB_VISIBLE /* It isn't required but allows to generate better code, saving a function pointer load from the IAT and an indirect jump.*/
|
||||||
#else
|
#else
|
||||||
# define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBILITY
|
# define ZSTDERRORLIB_API ZSTDERRORLIB_VISIBLE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*-*********************************************
|
/*-*********************************************
|
||||||
@@ -59,14 +71,17 @@ typedef enum {
|
|||||||
ZSTD_error_frameParameter_windowTooLarge = 16,
|
ZSTD_error_frameParameter_windowTooLarge = 16,
|
||||||
ZSTD_error_corruption_detected = 20,
|
ZSTD_error_corruption_detected = 20,
|
||||||
ZSTD_error_checksum_wrong = 22,
|
ZSTD_error_checksum_wrong = 22,
|
||||||
|
ZSTD_error_literals_headerWrong = 24,
|
||||||
ZSTD_error_dictionary_corrupted = 30,
|
ZSTD_error_dictionary_corrupted = 30,
|
||||||
ZSTD_error_dictionary_wrong = 32,
|
ZSTD_error_dictionary_wrong = 32,
|
||||||
ZSTD_error_dictionaryCreation_failed = 34,
|
ZSTD_error_dictionaryCreation_failed = 34,
|
||||||
ZSTD_error_parameter_unsupported = 40,
|
ZSTD_error_parameter_unsupported = 40,
|
||||||
|
ZSTD_error_parameter_combination_unsupported = 41,
|
||||||
ZSTD_error_parameter_outOfBound = 42,
|
ZSTD_error_parameter_outOfBound = 42,
|
||||||
ZSTD_error_tableLog_tooLarge = 44,
|
ZSTD_error_tableLog_tooLarge = 44,
|
||||||
ZSTD_error_maxSymbolValue_tooLarge = 46,
|
ZSTD_error_maxSymbolValue_tooLarge = 46,
|
||||||
ZSTD_error_maxSymbolValue_tooSmall = 48,
|
ZSTD_error_maxSymbolValue_tooSmall = 48,
|
||||||
|
ZSTD_error_stabilityCondition_notRespected = 50,
|
||||||
ZSTD_error_stage_wrong = 60,
|
ZSTD_error_stage_wrong = 60,
|
||||||
ZSTD_error_init_missing = 62,
|
ZSTD_error_init_missing = 62,
|
||||||
ZSTD_error_memory_allocation = 64,
|
ZSTD_error_memory_allocation = 64,
|
||||||
@@ -74,11 +89,15 @@ typedef enum {
|
|||||||
ZSTD_error_dstSize_tooSmall = 70,
|
ZSTD_error_dstSize_tooSmall = 70,
|
||||||
ZSTD_error_srcSize_wrong = 72,
|
ZSTD_error_srcSize_wrong = 72,
|
||||||
ZSTD_error_dstBuffer_null = 74,
|
ZSTD_error_dstBuffer_null = 74,
|
||||||
|
ZSTD_error_noForwardProgress_destFull = 80,
|
||||||
|
ZSTD_error_noForwardProgress_inputEmpty = 82,
|
||||||
/* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
|
/* following error codes are __NOT STABLE__, they can be removed or changed in future versions */
|
||||||
ZSTD_error_frameIndex_tooLarge = 100,
|
ZSTD_error_frameIndex_tooLarge = 100,
|
||||||
ZSTD_error_seekableIO = 102,
|
ZSTD_error_seekableIO = 102,
|
||||||
ZSTD_error_dstBuffer_wrong = 104,
|
ZSTD_error_dstBuffer_wrong = 104,
|
||||||
ZSTD_error_srcBuffer_wrong = 105,
|
ZSTD_error_srcBuffer_wrong = 105,
|
||||||
|
ZSTD_error_sequenceProducer_failed = 106,
|
||||||
|
ZSTD_error_externalSequences_invalid = 107,
|
||||||
ZSTD_error_maxCode = 120 /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
|
ZSTD_error_maxCode = 120 /* never EVER use this value directly, it can change in future versions! Use ZSTD_isError() instead */
|
||||||
} ZSTD_ErrorCode;
|
} ZSTD_ErrorCode;
|
||||||
|
|
||||||
|
|||||||
591
vendor/github.com/DataDog/zstd/zstd_fast.c
generated
vendored
591
vendor/github.com/DataDog/zstd/zstd_fast.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -12,8 +12,46 @@
|
|||||||
#include "zstd_compress_internal.h" /* ZSTD_hashPtr, ZSTD_count, ZSTD_storeSeq */
|
#include "zstd_compress_internal.h" /* ZSTD_hashPtr, ZSTD_count, ZSTD_storeSeq */
|
||||||
#include "zstd_fast.h"
|
#include "zstd_fast.h"
|
||||||
|
|
||||||
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
void ZSTD_fillHashTableForCDict(ZSTD_matchState_t* ms,
|
||||||
|
const void* const end,
|
||||||
|
ZSTD_dictTableLoadMethod_e dtlm)
|
||||||
|
{
|
||||||
|
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
||||||
|
U32* const hashTable = ms->hashTable;
|
||||||
|
U32 const hBits = cParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
U32 const mls = cParams->minMatch;
|
||||||
|
const BYTE* const base = ms->window.base;
|
||||||
|
const BYTE* ip = base + ms->nextToUpdate;
|
||||||
|
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
||||||
|
const U32 fastHashFillStep = 3;
|
||||||
|
|
||||||
void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
/* Currently, we always use ZSTD_dtlm_full for filling CDict tables.
|
||||||
|
* Feel free to remove this assert if there's a good reason! */
|
||||||
|
assert(dtlm == ZSTD_dtlm_full);
|
||||||
|
|
||||||
|
/* Always insert every fastHashFillStep position into the hash table.
|
||||||
|
* Insert the other positions if their hash entry is empty.
|
||||||
|
*/
|
||||||
|
for ( ; ip + fastHashFillStep < iend + 2; ip += fastHashFillStep) {
|
||||||
|
U32 const curr = (U32)(ip - base);
|
||||||
|
{ size_t const hashAndTag = ZSTD_hashPtr(ip, hBits, mls);
|
||||||
|
ZSTD_writeTaggedIndex(hashTable, hashAndTag, curr); }
|
||||||
|
|
||||||
|
if (dtlm == ZSTD_dtlm_fast) continue;
|
||||||
|
/* Only load extra positions for ZSTD_dtlm_full */
|
||||||
|
{ U32 p;
|
||||||
|
for (p = 1; p < fastHashFillStep; ++p) {
|
||||||
|
size_t const hashAndTag = ZSTD_hashPtr(ip + p, hBits, mls);
|
||||||
|
if (hashTable[hashAndTag >> ZSTD_SHORT_CACHE_TAG_BITS] == 0) { /* not yet filled */
|
||||||
|
ZSTD_writeTaggedIndex(hashTable, hashAndTag, curr + p);
|
||||||
|
} } } }
|
||||||
|
}
|
||||||
|
|
||||||
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
void ZSTD_fillHashTableForCCtx(ZSTD_matchState_t* ms,
|
||||||
const void* const end,
|
const void* const end,
|
||||||
ZSTD_dictTableLoadMethod_e dtlm)
|
ZSTD_dictTableLoadMethod_e dtlm)
|
||||||
{
|
{
|
||||||
@@ -26,6 +64,10 @@ void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
|||||||
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
const BYTE* const iend = ((const BYTE*)end) - HASH_READ_SIZE;
|
||||||
const U32 fastHashFillStep = 3;
|
const U32 fastHashFillStep = 3;
|
||||||
|
|
||||||
|
/* Currently, we always use ZSTD_dtlm_fast for filling CCtx tables.
|
||||||
|
* Feel free to remove this assert if there's a good reason! */
|
||||||
|
assert(dtlm == ZSTD_dtlm_fast);
|
||||||
|
|
||||||
/* Always insert every fastHashFillStep position into the hash table.
|
/* Always insert every fastHashFillStep position into the hash table.
|
||||||
* Insert the other positions if their hash entry is empty.
|
* Insert the other positions if their hash entry is empty.
|
||||||
*/
|
*/
|
||||||
@@ -43,6 +85,18 @@ void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
|||||||
} } } }
|
} } } }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
||||||
|
const void* const end,
|
||||||
|
ZSTD_dictTableLoadMethod_e dtlm,
|
||||||
|
ZSTD_tableFillPurpose_e tfp)
|
||||||
|
{
|
||||||
|
if (tfp == ZSTD_tfp_forCDict) {
|
||||||
|
ZSTD_fillHashTableForCDict(ms, end, dtlm);
|
||||||
|
} else {
|
||||||
|
ZSTD_fillHashTableForCCtx(ms, end, dtlm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If you squint hard enough (and ignore repcodes), the search operation at any
|
* If you squint hard enough (and ignore repcodes), the search operation at any
|
||||||
@@ -90,8 +144,9 @@ void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
|||||||
*
|
*
|
||||||
* This is also the work we do at the beginning to enter the loop initially.
|
* This is also the work we do at the beginning to enter the loop initially.
|
||||||
*/
|
*/
|
||||||
FORCE_INLINE_TEMPLATE size_t
|
FORCE_INLINE_TEMPLATE
|
||||||
ZSTD_compressBlock_fast_noDict_generic(
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t ZSTD_compressBlock_fast_noDict_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize,
|
void const* src, size_t srcSize,
|
||||||
U32 const mls, U32 const hasStep)
|
U32 const mls, U32 const hasStep)
|
||||||
@@ -118,7 +173,7 @@ ZSTD_compressBlock_fast_noDict_generic(
|
|||||||
|
|
||||||
U32 rep_offset1 = rep[0];
|
U32 rep_offset1 = rep[0];
|
||||||
U32 rep_offset2 = rep[1];
|
U32 rep_offset2 = rep[1];
|
||||||
U32 offsetSaved = 0;
|
U32 offsetSaved1 = 0, offsetSaved2 = 0;
|
||||||
|
|
||||||
size_t hash0; /* hash for ip0 */
|
size_t hash0; /* hash for ip0 */
|
||||||
size_t hash1; /* hash for ip1 */
|
size_t hash1; /* hash for ip1 */
|
||||||
@@ -142,8 +197,8 @@ ZSTD_compressBlock_fast_noDict_generic(
|
|||||||
{ U32 const curr = (U32)(ip0 - base);
|
{ U32 const curr = (U32)(ip0 - base);
|
||||||
U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, cParams->windowLog);
|
U32 const windowLow = ZSTD_getLowestPrefixIndex(ms, curr, cParams->windowLog);
|
||||||
U32 const maxRep = curr - windowLow;
|
U32 const maxRep = curr - windowLow;
|
||||||
if (rep_offset2 > maxRep) offsetSaved = rep_offset2, rep_offset2 = 0;
|
if (rep_offset2 > maxRep) offsetSaved2 = rep_offset2, rep_offset2 = 0;
|
||||||
if (rep_offset1 > maxRep) offsetSaved = rep_offset1, rep_offset1 = 0;
|
if (rep_offset1 > maxRep) offsetSaved1 = rep_offset1, rep_offset1 = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* start each op */
|
/* start each op */
|
||||||
@@ -181,8 +236,14 @@ _start: /* Requires: ip0 */
|
|||||||
mLength = ip0[-1] == match0[-1];
|
mLength = ip0[-1] == match0[-1];
|
||||||
ip0 -= mLength;
|
ip0 -= mLength;
|
||||||
match0 -= mLength;
|
match0 -= mLength;
|
||||||
offcode = STORE_REPCODE_1;
|
offcode = REPCODE1_TO_OFFBASE;
|
||||||
mLength += 4;
|
mLength += 4;
|
||||||
|
|
||||||
|
/* First write next hash table entry; we've already calculated it.
|
||||||
|
* This write is known to be safe because the ip1 is before the
|
||||||
|
* repcode (ip2). */
|
||||||
|
hashTable[hash1] = (U32)(ip1 - base);
|
||||||
|
|
||||||
goto _match;
|
goto _match;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,6 +257,12 @@ _start: /* Requires: ip0 */
|
|||||||
/* check match at ip[0] */
|
/* check match at ip[0] */
|
||||||
if (MEM_read32(ip0) == mval) {
|
if (MEM_read32(ip0) == mval) {
|
||||||
/* found a match! */
|
/* found a match! */
|
||||||
|
|
||||||
|
/* First write next hash table entry; we've already calculated it.
|
||||||
|
* This write is known to be safe because the ip1 == ip0 + 1, so
|
||||||
|
* we know we will resume searching after ip1 */
|
||||||
|
hashTable[hash1] = (U32)(ip1 - base);
|
||||||
|
|
||||||
goto _offset;
|
goto _offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -225,6 +292,21 @@ _start: /* Requires: ip0 */
|
|||||||
/* check match at ip[0] */
|
/* check match at ip[0] */
|
||||||
if (MEM_read32(ip0) == mval) {
|
if (MEM_read32(ip0) == mval) {
|
||||||
/* found a match! */
|
/* found a match! */
|
||||||
|
|
||||||
|
/* first write next hash table entry; we've already calculated it */
|
||||||
|
if (step <= 4) {
|
||||||
|
/* We need to avoid writing an index into the hash table >= the
|
||||||
|
* position at which we will pick up our searching after we've
|
||||||
|
* taken this match.
|
||||||
|
*
|
||||||
|
* The minimum possible match has length 4, so the earliest ip0
|
||||||
|
* can be after we take this match will be the current ip0 + 4.
|
||||||
|
* ip1 is ip0 + step - 1. If ip1 is >= ip0 + 4, we can't safely
|
||||||
|
* write this position.
|
||||||
|
*/
|
||||||
|
hashTable[hash1] = (U32)(ip1 - base);
|
||||||
|
}
|
||||||
|
|
||||||
goto _offset;
|
goto _offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -255,9 +337,24 @@ _cleanup:
|
|||||||
* However, it seems to be a meaningful performance hit to try to search
|
* However, it seems to be a meaningful performance hit to try to search
|
||||||
* them. So let's not. */
|
* them. So let's not. */
|
||||||
|
|
||||||
|
/* When the repcodes are outside of the prefix, we set them to zero before the loop.
|
||||||
|
* When the offsets are still zero, we need to restore them after the block to have a correct
|
||||||
|
* repcode history. If only one offset was invalid, it is easy. The tricky case is when both
|
||||||
|
* offsets were invalid. We need to figure out which offset to refill with.
|
||||||
|
* - If both offsets are zero they are in the same order.
|
||||||
|
* - If both offsets are non-zero, we won't restore the offsets from `offsetSaved[12]`.
|
||||||
|
* - If only one is zero, we need to decide which offset to restore.
|
||||||
|
* - If rep_offset1 is non-zero, then rep_offset2 must be offsetSaved1.
|
||||||
|
* - It is impossible for rep_offset2 to be non-zero.
|
||||||
|
*
|
||||||
|
* So if rep_offset1 started invalid (offsetSaved1 != 0) and became valid (rep_offset1 != 0), then
|
||||||
|
* set rep[0] = rep_offset1 and rep[1] = offsetSaved1.
|
||||||
|
*/
|
||||||
|
offsetSaved2 = ((offsetSaved1 != 0) && (rep_offset1 != 0)) ? offsetSaved1 : offsetSaved2;
|
||||||
|
|
||||||
/* save reps for next block */
|
/* save reps for next block */
|
||||||
rep[0] = rep_offset1 ? rep_offset1 : offsetSaved;
|
rep[0] = rep_offset1 ? rep_offset1 : offsetSaved1;
|
||||||
rep[1] = rep_offset2 ? rep_offset2 : offsetSaved;
|
rep[1] = rep_offset2 ? rep_offset2 : offsetSaved2;
|
||||||
|
|
||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
@@ -268,7 +365,7 @@ _offset: /* Requires: ip0, idx */
|
|||||||
match0 = base + idx;
|
match0 = base + idx;
|
||||||
rep_offset2 = rep_offset1;
|
rep_offset2 = rep_offset1;
|
||||||
rep_offset1 = (U32)(ip0-match0);
|
rep_offset1 = (U32)(ip0-match0);
|
||||||
offcode = STORE_OFFSET(rep_offset1);
|
offcode = OFFSET_TO_OFFBASE(rep_offset1);
|
||||||
mLength = 4;
|
mLength = 4;
|
||||||
|
|
||||||
/* Count the backwards match length. */
|
/* Count the backwards match length. */
|
||||||
@@ -288,11 +385,6 @@ _match: /* Requires: ip0, match0, offcode */
|
|||||||
ip0 += mLength;
|
ip0 += mLength;
|
||||||
anchor = ip0;
|
anchor = ip0;
|
||||||
|
|
||||||
/* write next hash table entry */
|
|
||||||
if (ip1 < ip0) {
|
|
||||||
hashTable[hash1] = (U32)(ip1 - base);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Fill table and check for immediate repcode. */
|
/* Fill table and check for immediate repcode. */
|
||||||
if (ip0 <= ilimit) {
|
if (ip0 <= ilimit) {
|
||||||
/* Fill Table */
|
/* Fill Table */
|
||||||
@@ -307,7 +399,7 @@ _match: /* Requires: ip0, match0, offcode */
|
|||||||
{ U32 const tmpOff = rep_offset2; rep_offset2 = rep_offset1; rep_offset1 = tmpOff; } /* swap rep_offset2 <=> rep_offset1 */
|
{ U32 const tmpOff = rep_offset2; rep_offset2 = rep_offset1; rep_offset1 = tmpOff; } /* swap rep_offset2 <=> rep_offset1 */
|
||||||
hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
|
hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
|
||||||
ip0 += rLength;
|
ip0 += rLength;
|
||||||
ZSTD_storeSeq(seqStore, 0 /*litLen*/, anchor, iend, STORE_REPCODE_1, rLength);
|
ZSTD_storeSeq(seqStore, 0 /*litLen*/, anchor, iend, REPCODE1_TO_OFFBASE, rLength);
|
||||||
anchor = ip0;
|
anchor = ip0;
|
||||||
continue; /* faster when present (confirmed on gcc-8) ... (?) */
|
continue; /* faster when present (confirmed on gcc-8) ... (?) */
|
||||||
} } }
|
} } }
|
||||||
@@ -370,6 +462,7 @@ size_t ZSTD_compressBlock_fast(
|
|||||||
}
|
}
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
size_t ZSTD_compressBlock_fast_dictMatchState_generic(
|
size_t ZSTD_compressBlock_fast_dictMatchState_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize, U32 const mls, U32 const hasStep)
|
void const* src, size_t srcSize, U32 const mls, U32 const hasStep)
|
||||||
@@ -381,14 +474,14 @@ size_t ZSTD_compressBlock_fast_dictMatchState_generic(
|
|||||||
U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
|
U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
|
||||||
const BYTE* const base = ms->window.base;
|
const BYTE* const base = ms->window.base;
|
||||||
const BYTE* const istart = (const BYTE*)src;
|
const BYTE* const istart = (const BYTE*)src;
|
||||||
const BYTE* ip = istart;
|
const BYTE* ip0 = istart;
|
||||||
|
const BYTE* ip1 = ip0 + stepSize; /* we assert below that stepSize >= 1 */
|
||||||
const BYTE* anchor = istart;
|
const BYTE* anchor = istart;
|
||||||
const U32 prefixStartIndex = ms->window.dictLimit;
|
const U32 prefixStartIndex = ms->window.dictLimit;
|
||||||
const BYTE* const prefixStart = base + prefixStartIndex;
|
const BYTE* const prefixStart = base + prefixStartIndex;
|
||||||
const BYTE* const iend = istart + srcSize;
|
const BYTE* const iend = istart + srcSize;
|
||||||
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
const BYTE* const ilimit = iend - HASH_READ_SIZE;
|
||||||
U32 offset_1=rep[0], offset_2=rep[1];
|
U32 offset_1=rep[0], offset_2=rep[1];
|
||||||
U32 offsetSaved = 0;
|
|
||||||
|
|
||||||
const ZSTD_matchState_t* const dms = ms->dictMatchState;
|
const ZSTD_matchState_t* const dms = ms->dictMatchState;
|
||||||
const ZSTD_compressionParameters* const dictCParams = &dms->cParams ;
|
const ZSTD_compressionParameters* const dictCParams = &dms->cParams ;
|
||||||
@@ -398,13 +491,13 @@ size_t ZSTD_compressBlock_fast_dictMatchState_generic(
|
|||||||
const BYTE* const dictStart = dictBase + dictStartIndex;
|
const BYTE* const dictStart = dictBase + dictStartIndex;
|
||||||
const BYTE* const dictEnd = dms->window.nextSrc;
|
const BYTE* const dictEnd = dms->window.nextSrc;
|
||||||
const U32 dictIndexDelta = prefixStartIndex - (U32)(dictEnd - dictBase);
|
const U32 dictIndexDelta = prefixStartIndex - (U32)(dictEnd - dictBase);
|
||||||
const U32 dictAndPrefixLength = (U32)(ip - prefixStart + dictEnd - dictStart);
|
const U32 dictAndPrefixLength = (U32)(istart - prefixStart + dictEnd - dictStart);
|
||||||
const U32 dictHLog = dictCParams->hashLog;
|
const U32 dictHBits = dictCParams->hashLog + ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
|
||||||
/* if a dictionary is still attached, it necessarily means that
|
/* if a dictionary is still attached, it necessarily means that
|
||||||
* it is within window size. So we just check it. */
|
* it is within window size. So we just check it. */
|
||||||
const U32 maxDistance = 1U << cParams->windowLog;
|
const U32 maxDistance = 1U << cParams->windowLog;
|
||||||
const U32 endIndex = (U32)((size_t)(ip - base) + srcSize);
|
const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
|
||||||
assert(endIndex - prefixStartIndex <= maxDistance);
|
assert(endIndex - prefixStartIndex <= maxDistance);
|
||||||
(void)maxDistance; (void)endIndex; /* these variables are not used when assert() is disabled */
|
(void)maxDistance; (void)endIndex; /* these variables are not used when assert() is disabled */
|
||||||
|
|
||||||
@@ -414,106 +507,155 @@ size_t ZSTD_compressBlock_fast_dictMatchState_generic(
|
|||||||
* when translating a dict index into a local index */
|
* when translating a dict index into a local index */
|
||||||
assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
|
assert(prefixStartIndex >= (U32)(dictEnd - dictBase));
|
||||||
|
|
||||||
|
if (ms->prefetchCDictTables) {
|
||||||
|
size_t const hashTableBytes = (((size_t)1) << dictCParams->hashLog) * sizeof(U32);
|
||||||
|
PREFETCH_AREA(dictHashTable, hashTableBytes);
|
||||||
|
}
|
||||||
|
|
||||||
/* init */
|
/* init */
|
||||||
DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic");
|
DEBUGLOG(5, "ZSTD_compressBlock_fast_dictMatchState_generic");
|
||||||
ip += (dictAndPrefixLength == 0);
|
ip0 += (dictAndPrefixLength == 0);
|
||||||
/* dictMatchState repCode checks don't currently handle repCode == 0
|
/* dictMatchState repCode checks don't currently handle repCode == 0
|
||||||
* disabling. */
|
* disabling. */
|
||||||
assert(offset_1 <= dictAndPrefixLength);
|
assert(offset_1 <= dictAndPrefixLength);
|
||||||
assert(offset_2 <= dictAndPrefixLength);
|
assert(offset_2 <= dictAndPrefixLength);
|
||||||
|
|
||||||
/* Main Search Loop */
|
/* Outer search loop */
|
||||||
while (ip < ilimit) { /* < instead of <=, because repcode check at (ip+1) */
|
assert(stepSize >= 1);
|
||||||
|
while (ip1 <= ilimit) { /* repcode check at (ip0 + 1) is safe because ip0 < ip1 */
|
||||||
size_t mLength;
|
size_t mLength;
|
||||||
size_t const h = ZSTD_hashPtr(ip, hlog, mls);
|
size_t hash0 = ZSTD_hashPtr(ip0, hlog, mls);
|
||||||
U32 const curr = (U32)(ip-base);
|
|
||||||
U32 const matchIndex = hashTable[h];
|
|
||||||
const BYTE* match = base + matchIndex;
|
|
||||||
const U32 repIndex = curr + 1 - offset_1;
|
|
||||||
const BYTE* repMatch = (repIndex < prefixStartIndex) ?
|
|
||||||
dictBase + (repIndex - dictIndexDelta) :
|
|
||||||
base + repIndex;
|
|
||||||
hashTable[h] = curr; /* update hash table */
|
|
||||||
|
|
||||||
if ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
|
size_t const dictHashAndTag0 = ZSTD_hashPtr(ip0, dictHBits, mls);
|
||||||
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
|
U32 dictMatchIndexAndTag = dictHashTable[dictHashAndTag0 >> ZSTD_SHORT_CACHE_TAG_BITS];
|
||||||
const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
int dictTagsMatch = ZSTD_comparePackedTags(dictMatchIndexAndTag, dictHashAndTag0);
|
||||||
mLength = ZSTD_count_2segments(ip+1+4, repMatch+4, iend, repMatchEnd, prefixStart) + 4;
|
|
||||||
ip++;
|
U32 matchIndex = hashTable[hash0];
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_REPCODE_1, mLength);
|
U32 curr = (U32)(ip0 - base);
|
||||||
} else if ( (matchIndex <= prefixStartIndex) ) {
|
size_t step = stepSize;
|
||||||
size_t const dictHash = ZSTD_hashPtr(ip, dictHLog, mls);
|
const size_t kStepIncr = 1 << kSearchStrength;
|
||||||
U32 const dictMatchIndex = dictHashTable[dictHash];
|
const BYTE* nextStep = ip0 + kStepIncr;
|
||||||
const BYTE* dictMatch = dictBase + dictMatchIndex;
|
|
||||||
if (dictMatchIndex <= dictStartIndex ||
|
/* Inner search loop */
|
||||||
MEM_read32(dictMatch) != MEM_read32(ip)) {
|
while (1) {
|
||||||
assert(stepSize >= 1);
|
const BYTE* match = base + matchIndex;
|
||||||
ip += ((ip-anchor) >> kSearchStrength) + stepSize;
|
const U32 repIndex = curr + 1 - offset_1;
|
||||||
continue;
|
const BYTE* repMatch = (repIndex < prefixStartIndex) ?
|
||||||
} else {
|
dictBase + (repIndex - dictIndexDelta) :
|
||||||
/* found a dict match */
|
base + repIndex;
|
||||||
U32 const offset = (U32)(curr-dictMatchIndex-dictIndexDelta);
|
const size_t hash1 = ZSTD_hashPtr(ip1, hlog, mls);
|
||||||
mLength = ZSTD_count_2segments(ip+4, dictMatch+4, iend, dictEnd, prefixStart) + 4;
|
size_t const dictHashAndTag1 = ZSTD_hashPtr(ip1, dictHBits, mls);
|
||||||
while (((ip>anchor) & (dictMatch>dictStart))
|
hashTable[hash0] = curr; /* update hash table */
|
||||||
&& (ip[-1] == dictMatch[-1])) {
|
|
||||||
ip--; dictMatch--; mLength++;
|
if (((U32) ((prefixStartIndex - 1) - repIndex) >=
|
||||||
|
3) /* intentional underflow : ensure repIndex isn't overlapping dict + prefix */
|
||||||
|
&& (MEM_read32(repMatch) == MEM_read32(ip0 + 1))) {
|
||||||
|
const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
||||||
|
mLength = ZSTD_count_2segments(ip0 + 1 + 4, repMatch + 4, iend, repMatchEnd, prefixStart) + 4;
|
||||||
|
ip0++;
|
||||||
|
ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, REPCODE1_TO_OFFBASE, mLength);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (dictTagsMatch) {
|
||||||
|
/* Found a possible dict match */
|
||||||
|
const U32 dictMatchIndex = dictMatchIndexAndTag >> ZSTD_SHORT_CACHE_TAG_BITS;
|
||||||
|
const BYTE* dictMatch = dictBase + dictMatchIndex;
|
||||||
|
if (dictMatchIndex > dictStartIndex &&
|
||||||
|
MEM_read32(dictMatch) == MEM_read32(ip0)) {
|
||||||
|
/* To replicate extDict parse behavior, we only use dict matches when the normal matchIndex is invalid */
|
||||||
|
if (matchIndex <= prefixStartIndex) {
|
||||||
|
U32 const offset = (U32) (curr - dictMatchIndex - dictIndexDelta);
|
||||||
|
mLength = ZSTD_count_2segments(ip0 + 4, dictMatch + 4, iend, dictEnd, prefixStart) + 4;
|
||||||
|
while (((ip0 > anchor) & (dictMatch > dictStart))
|
||||||
|
&& (ip0[-1] == dictMatch[-1])) {
|
||||||
|
ip0--;
|
||||||
|
dictMatch--;
|
||||||
|
mLength++;
|
||||||
|
} /* catch up */
|
||||||
|
offset_2 = offset_1;
|
||||||
|
offset_1 = offset;
|
||||||
|
ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (matchIndex > prefixStartIndex && MEM_read32(match) == MEM_read32(ip0)) {
|
||||||
|
/* found a regular match */
|
||||||
|
U32 const offset = (U32) (ip0 - match);
|
||||||
|
mLength = ZSTD_count(ip0 + 4, match + 4, iend) + 4;
|
||||||
|
while (((ip0 > anchor) & (match > prefixStart))
|
||||||
|
&& (ip0[-1] == match[-1])) {
|
||||||
|
ip0--;
|
||||||
|
match--;
|
||||||
|
mLength++;
|
||||||
} /* catch up */
|
} /* catch up */
|
||||||
offset_2 = offset_1;
|
offset_2 = offset_1;
|
||||||
offset_1 = offset;
|
offset_1 = offset;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
ZSTD_storeSeq(seqStore, (size_t) (ip0 - anchor), anchor, iend, OFFSET_TO_OFFBASE(offset), mLength);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
} else if (MEM_read32(match) != MEM_read32(ip)) {
|
|
||||||
/* it's not a match, and we're not going to check the dictionary */
|
/* Prepare for next iteration */
|
||||||
assert(stepSize >= 1);
|
dictMatchIndexAndTag = dictHashTable[dictHashAndTag1 >> ZSTD_SHORT_CACHE_TAG_BITS];
|
||||||
ip += ((ip-anchor) >> kSearchStrength) + stepSize;
|
dictTagsMatch = ZSTD_comparePackedTags(dictMatchIndexAndTag, dictHashAndTag1);
|
||||||
continue;
|
matchIndex = hashTable[hash1];
|
||||||
} else {
|
|
||||||
/* found a regular match */
|
if (ip1 >= nextStep) {
|
||||||
U32 const offset = (U32)(ip-match);
|
step++;
|
||||||
mLength = ZSTD_count(ip+4, match+4, iend) + 4;
|
nextStep += kStepIncr;
|
||||||
while (((ip>anchor) & (match>prefixStart))
|
}
|
||||||
&& (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
ip0 = ip1;
|
||||||
offset_2 = offset_1;
|
ip1 = ip1 + step;
|
||||||
offset_1 = offset;
|
if (ip1 > ilimit) goto _cleanup;
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
|
||||||
}
|
curr = (U32)(ip0 - base);
|
||||||
|
hash0 = hash1;
|
||||||
|
} /* end inner search loop */
|
||||||
|
|
||||||
/* match found */
|
/* match found */
|
||||||
ip += mLength;
|
assert(mLength);
|
||||||
anchor = ip;
|
ip0 += mLength;
|
||||||
|
anchor = ip0;
|
||||||
|
|
||||||
if (ip <= ilimit) {
|
if (ip0 <= ilimit) {
|
||||||
/* Fill Table */
|
/* Fill Table */
|
||||||
assert(base+curr+2 > istart); /* check base overflow */
|
assert(base+curr+2 > istart); /* check base overflow */
|
||||||
hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2; /* here because curr+2 could be > iend-8 */
|
hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2; /* here because curr+2 could be > iend-8 */
|
||||||
hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
|
hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base);
|
||||||
|
|
||||||
/* check immediate repcode */
|
/* check immediate repcode */
|
||||||
while (ip <= ilimit) {
|
while (ip0 <= ilimit) {
|
||||||
U32 const current2 = (U32)(ip-base);
|
U32 const current2 = (U32)(ip0-base);
|
||||||
U32 const repIndex2 = current2 - offset_2;
|
U32 const repIndex2 = current2 - offset_2;
|
||||||
const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
|
const BYTE* repMatch2 = repIndex2 < prefixStartIndex ?
|
||||||
dictBase - dictIndexDelta + repIndex2 :
|
dictBase - dictIndexDelta + repIndex2 :
|
||||||
base + repIndex2;
|
base + repIndex2;
|
||||||
if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
|
if ( ((U32)((prefixStartIndex-1) - (U32)repIndex2) >= 3 /* intentional overflow */)
|
||||||
&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
|
&& (MEM_read32(repMatch2) == MEM_read32(ip0))) {
|
||||||
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
||||||
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
size_t const repLength2 = ZSTD_count_2segments(ip0+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
||||||
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
U32 tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; /* swap offset_2 <=> offset_1 */
|
||||||
ZSTD_storeSeq(seqStore, 0, anchor, iend, STORE_REPCODE_1, repLength2);
|
ZSTD_storeSeq(seqStore, 0, anchor, iend, REPCODE1_TO_OFFBASE, repLength2);
|
||||||
hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
|
hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = current2;
|
||||||
ip += repLength2;
|
ip0 += repLength2;
|
||||||
anchor = ip;
|
anchor = ip0;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Prepare for next iteration */
|
||||||
|
assert(ip0 == anchor);
|
||||||
|
ip1 = ip0 + stepSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_cleanup:
|
||||||
/* save reps for next block */
|
/* save reps for next block */
|
||||||
rep[0] = offset_1 ? offset_1 : offsetSaved;
|
rep[0] = offset_1;
|
||||||
rep[1] = offset_2 ? offset_2 : offsetSaved;
|
rep[1] = offset_2;
|
||||||
|
|
||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
@@ -546,7 +688,9 @@ size_t ZSTD_compressBlock_fast_dictMatchState(
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static size_t ZSTD_compressBlock_fast_extDict_generic(
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t ZSTD_compressBlock_fast_extDict_generic(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize, U32 const mls, U32 const hasStep)
|
void const* src, size_t srcSize, U32 const mls, U32 const hasStep)
|
||||||
{
|
{
|
||||||
@@ -554,11 +698,10 @@ static size_t ZSTD_compressBlock_fast_extDict_generic(
|
|||||||
U32* const hashTable = ms->hashTable;
|
U32* const hashTable = ms->hashTable;
|
||||||
U32 const hlog = cParams->hashLog;
|
U32 const hlog = cParams->hashLog;
|
||||||
/* support stepSize of 0 */
|
/* support stepSize of 0 */
|
||||||
U32 const stepSize = cParams->targetLength + !(cParams->targetLength);
|
size_t const stepSize = cParams->targetLength + !(cParams->targetLength) + 1;
|
||||||
const BYTE* const base = ms->window.base;
|
const BYTE* const base = ms->window.base;
|
||||||
const BYTE* const dictBase = ms->window.dictBase;
|
const BYTE* const dictBase = ms->window.dictBase;
|
||||||
const BYTE* const istart = (const BYTE*)src;
|
const BYTE* const istart = (const BYTE*)src;
|
||||||
const BYTE* ip = istart;
|
|
||||||
const BYTE* anchor = istart;
|
const BYTE* anchor = istart;
|
||||||
const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
|
const U32 endIndex = (U32)((size_t)(istart - base) + srcSize);
|
||||||
const U32 lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
|
const U32 lowLimit = ZSTD_getLowestMatchIndex(ms, endIndex, cParams->windowLog);
|
||||||
@@ -571,6 +714,28 @@ static size_t ZSTD_compressBlock_fast_extDict_generic(
|
|||||||
const BYTE* const iend = istart + srcSize;
|
const BYTE* const iend = istart + srcSize;
|
||||||
const BYTE* const ilimit = iend - 8;
|
const BYTE* const ilimit = iend - 8;
|
||||||
U32 offset_1=rep[0], offset_2=rep[1];
|
U32 offset_1=rep[0], offset_2=rep[1];
|
||||||
|
U32 offsetSaved1 = 0, offsetSaved2 = 0;
|
||||||
|
|
||||||
|
const BYTE* ip0 = istart;
|
||||||
|
const BYTE* ip1;
|
||||||
|
const BYTE* ip2;
|
||||||
|
const BYTE* ip3;
|
||||||
|
U32 current0;
|
||||||
|
|
||||||
|
|
||||||
|
size_t hash0; /* hash for ip0 */
|
||||||
|
size_t hash1; /* hash for ip1 */
|
||||||
|
U32 idx; /* match idx for ip0 */
|
||||||
|
const BYTE* idxBase; /* base pointer for idx */
|
||||||
|
|
||||||
|
U32 offcode;
|
||||||
|
const BYTE* match0;
|
||||||
|
size_t mLength;
|
||||||
|
const BYTE* matchEnd = 0; /* initialize to avoid warning, assert != 0 later */
|
||||||
|
|
||||||
|
size_t step;
|
||||||
|
const BYTE* nextStep;
|
||||||
|
const size_t kStepIncr = (1 << (kSearchStrength - 1));
|
||||||
|
|
||||||
(void)hasStep; /* not currently specialized on whether it's accelerated */
|
(void)hasStep; /* not currently specialized on whether it's accelerated */
|
||||||
|
|
||||||
@@ -580,75 +745,202 @@ static size_t ZSTD_compressBlock_fast_extDict_generic(
|
|||||||
if (prefixStartIndex == dictStartIndex)
|
if (prefixStartIndex == dictStartIndex)
|
||||||
return ZSTD_compressBlock_fast(ms, seqStore, rep, src, srcSize);
|
return ZSTD_compressBlock_fast(ms, seqStore, rep, src, srcSize);
|
||||||
|
|
||||||
/* Search Loop */
|
{ U32 const curr = (U32)(ip0 - base);
|
||||||
while (ip < ilimit) { /* < instead of <=, because (ip+1) */
|
U32 const maxRep = curr - dictStartIndex;
|
||||||
const size_t h = ZSTD_hashPtr(ip, hlog, mls);
|
if (offset_2 >= maxRep) offsetSaved2 = offset_2, offset_2 = 0;
|
||||||
const U32 matchIndex = hashTable[h];
|
if (offset_1 >= maxRep) offsetSaved1 = offset_1, offset_1 = 0;
|
||||||
const BYTE* const matchBase = matchIndex < prefixStartIndex ? dictBase : base;
|
}
|
||||||
const BYTE* match = matchBase + matchIndex;
|
|
||||||
const U32 curr = (U32)(ip-base);
|
|
||||||
const U32 repIndex = curr + 1 - offset_1;
|
|
||||||
const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
|
|
||||||
const BYTE* const repMatch = repBase + repIndex;
|
|
||||||
hashTable[h] = curr; /* update hash table */
|
|
||||||
DEBUGLOG(7, "offset_1 = %u , curr = %u", offset_1, curr);
|
|
||||||
|
|
||||||
if ( ( ((U32)((prefixStartIndex-1) - repIndex) >= 3) /* intentional underflow */
|
/* start each op */
|
||||||
& (offset_1 <= curr+1 - dictStartIndex) ) /* note: we are searching at curr+1 */
|
_start: /* Requires: ip0 */
|
||||||
&& (MEM_read32(repMatch) == MEM_read32(ip+1)) ) {
|
|
||||||
const BYTE* const repMatchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
step = stepSize;
|
||||||
size_t const rLength = ZSTD_count_2segments(ip+1 +4, repMatch +4, iend, repMatchEnd, prefixStart) + 4;
|
nextStep = ip0 + kStepIncr;
|
||||||
ip++;
|
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_REPCODE_1, rLength);
|
/* calculate positions, ip0 - anchor == 0, so we skip step calc */
|
||||||
ip += rLength;
|
ip1 = ip0 + 1;
|
||||||
anchor = ip;
|
ip2 = ip0 + step;
|
||||||
} else {
|
ip3 = ip2 + 1;
|
||||||
if ( (matchIndex < dictStartIndex) ||
|
|
||||||
(MEM_read32(match) != MEM_read32(ip)) ) {
|
if (ip3 >= ilimit) {
|
||||||
assert(stepSize >= 1);
|
goto _cleanup;
|
||||||
ip += ((ip-anchor) >> kSearchStrength) + stepSize;
|
}
|
||||||
continue;
|
|
||||||
|
hash0 = ZSTD_hashPtr(ip0, hlog, mls);
|
||||||
|
hash1 = ZSTD_hashPtr(ip1, hlog, mls);
|
||||||
|
|
||||||
|
idx = hashTable[hash0];
|
||||||
|
idxBase = idx < prefixStartIndex ? dictBase : base;
|
||||||
|
|
||||||
|
do {
|
||||||
|
{ /* load repcode match for ip[2] */
|
||||||
|
U32 const current2 = (U32)(ip2 - base);
|
||||||
|
U32 const repIndex = current2 - offset_1;
|
||||||
|
const BYTE* const repBase = repIndex < prefixStartIndex ? dictBase : base;
|
||||||
|
U32 rval;
|
||||||
|
if ( ((U32)(prefixStartIndex - repIndex) >= 4) /* intentional underflow */
|
||||||
|
& (offset_1 > 0) ) {
|
||||||
|
rval = MEM_read32(repBase + repIndex);
|
||||||
|
} else {
|
||||||
|
rval = MEM_read32(ip2) ^ 1; /* guaranteed to not match. */
|
||||||
}
|
}
|
||||||
{ const BYTE* const matchEnd = matchIndex < prefixStartIndex ? dictEnd : iend;
|
|
||||||
const BYTE* const lowMatchPtr = matchIndex < prefixStartIndex ? dictStart : prefixStart;
|
/* write back hash table entry */
|
||||||
U32 const offset = curr - matchIndex;
|
current0 = (U32)(ip0 - base);
|
||||||
size_t mLength = ZSTD_count_2segments(ip+4, match+4, iend, matchEnd, prefixStart) + 4;
|
hashTable[hash0] = current0;
|
||||||
while (((ip>anchor) & (match>lowMatchPtr)) && (ip[-1] == match[-1])) { ip--; match--; mLength++; } /* catch up */
|
|
||||||
offset_2 = offset_1; offset_1 = offset; /* update offset history */
|
/* check repcode at ip[2] */
|
||||||
ZSTD_storeSeq(seqStore, (size_t)(ip-anchor), anchor, iend, STORE_OFFSET(offset), mLength);
|
if (MEM_read32(ip2) == rval) {
|
||||||
ip += mLength;
|
ip0 = ip2;
|
||||||
anchor = ip;
|
match0 = repBase + repIndex;
|
||||||
|
matchEnd = repIndex < prefixStartIndex ? dictEnd : iend;
|
||||||
|
assert((match0 != prefixStart) & (match0 != dictStart));
|
||||||
|
mLength = ip0[-1] == match0[-1];
|
||||||
|
ip0 -= mLength;
|
||||||
|
match0 -= mLength;
|
||||||
|
offcode = REPCODE1_TO_OFFBASE;
|
||||||
|
mLength += 4;
|
||||||
|
goto _match;
|
||||||
} }
|
} }
|
||||||
|
|
||||||
if (ip <= ilimit) {
|
{ /* load match for ip[0] */
|
||||||
/* Fill Table */
|
U32 const mval = idx >= dictStartIndex ?
|
||||||
hashTable[ZSTD_hashPtr(base+curr+2, hlog, mls)] = curr+2;
|
MEM_read32(idxBase + idx) :
|
||||||
hashTable[ZSTD_hashPtr(ip-2, hlog, mls)] = (U32)(ip-2-base);
|
MEM_read32(ip0) ^ 1; /* guaranteed not to match */
|
||||||
/* check immediate repcode */
|
|
||||||
while (ip <= ilimit) {
|
/* check match at ip[0] */
|
||||||
U32 const current2 = (U32)(ip-base);
|
if (MEM_read32(ip0) == mval) {
|
||||||
U32 const repIndex2 = current2 - offset_2;
|
/* found a match! */
|
||||||
const BYTE* const repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
|
goto _offset;
|
||||||
if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (offset_2 <= curr - dictStartIndex)) /* intentional overflow */
|
} }
|
||||||
&& (MEM_read32(repMatch2) == MEM_read32(ip)) ) {
|
|
||||||
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
/* lookup ip[1] */
|
||||||
size_t const repLength2 = ZSTD_count_2segments(ip+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
idx = hashTable[hash1];
|
||||||
{ U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; } /* swap offset_2 <=> offset_1 */
|
idxBase = idx < prefixStartIndex ? dictBase : base;
|
||||||
ZSTD_storeSeq(seqStore, 0 /*litlen*/, anchor, iend, STORE_REPCODE_1, repLength2);
|
|
||||||
hashTable[ZSTD_hashPtr(ip, hlog, mls)] = current2;
|
/* hash ip[2] */
|
||||||
ip += repLength2;
|
hash0 = hash1;
|
||||||
anchor = ip;
|
hash1 = ZSTD_hashPtr(ip2, hlog, mls);
|
||||||
continue;
|
|
||||||
}
|
/* advance to next positions */
|
||||||
break;
|
ip0 = ip1;
|
||||||
} } }
|
ip1 = ip2;
|
||||||
|
ip2 = ip3;
|
||||||
|
|
||||||
|
/* write back hash table entry */
|
||||||
|
current0 = (U32)(ip0 - base);
|
||||||
|
hashTable[hash0] = current0;
|
||||||
|
|
||||||
|
{ /* load match for ip[0] */
|
||||||
|
U32 const mval = idx >= dictStartIndex ?
|
||||||
|
MEM_read32(idxBase + idx) :
|
||||||
|
MEM_read32(ip0) ^ 1; /* guaranteed not to match */
|
||||||
|
|
||||||
|
/* check match at ip[0] */
|
||||||
|
if (MEM_read32(ip0) == mval) {
|
||||||
|
/* found a match! */
|
||||||
|
goto _offset;
|
||||||
|
} }
|
||||||
|
|
||||||
|
/* lookup ip[1] */
|
||||||
|
idx = hashTable[hash1];
|
||||||
|
idxBase = idx < prefixStartIndex ? dictBase : base;
|
||||||
|
|
||||||
|
/* hash ip[2] */
|
||||||
|
hash0 = hash1;
|
||||||
|
hash1 = ZSTD_hashPtr(ip2, hlog, mls);
|
||||||
|
|
||||||
|
/* advance to next positions */
|
||||||
|
ip0 = ip1;
|
||||||
|
ip1 = ip2;
|
||||||
|
ip2 = ip0 + step;
|
||||||
|
ip3 = ip1 + step;
|
||||||
|
|
||||||
|
/* calculate step */
|
||||||
|
if (ip2 >= nextStep) {
|
||||||
|
step++;
|
||||||
|
PREFETCH_L1(ip1 + 64);
|
||||||
|
PREFETCH_L1(ip1 + 128);
|
||||||
|
nextStep += kStepIncr;
|
||||||
|
}
|
||||||
|
} while (ip3 < ilimit);
|
||||||
|
|
||||||
|
_cleanup:
|
||||||
|
/* Note that there are probably still a couple positions we could search.
|
||||||
|
* However, it seems to be a meaningful performance hit to try to search
|
||||||
|
* them. So let's not. */
|
||||||
|
|
||||||
|
/* If offset_1 started invalid (offsetSaved1 != 0) and became valid (offset_1 != 0),
|
||||||
|
* rotate saved offsets. See comment in ZSTD_compressBlock_fast_noDict for more context. */
|
||||||
|
offsetSaved2 = ((offsetSaved1 != 0) && (offset_1 != 0)) ? offsetSaved1 : offsetSaved2;
|
||||||
|
|
||||||
/* save reps for next block */
|
/* save reps for next block */
|
||||||
rep[0] = offset_1;
|
rep[0] = offset_1 ? offset_1 : offsetSaved1;
|
||||||
rep[1] = offset_2;
|
rep[1] = offset_2 ? offset_2 : offsetSaved2;
|
||||||
|
|
||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
|
|
||||||
|
_offset: /* Requires: ip0, idx, idxBase */
|
||||||
|
|
||||||
|
/* Compute the offset code. */
|
||||||
|
{ U32 const offset = current0 - idx;
|
||||||
|
const BYTE* const lowMatchPtr = idx < prefixStartIndex ? dictStart : prefixStart;
|
||||||
|
matchEnd = idx < prefixStartIndex ? dictEnd : iend;
|
||||||
|
match0 = idxBase + idx;
|
||||||
|
offset_2 = offset_1;
|
||||||
|
offset_1 = offset;
|
||||||
|
offcode = OFFSET_TO_OFFBASE(offset);
|
||||||
|
mLength = 4;
|
||||||
|
|
||||||
|
/* Count the backwards match length. */
|
||||||
|
while (((ip0>anchor) & (match0>lowMatchPtr)) && (ip0[-1] == match0[-1])) {
|
||||||
|
ip0--;
|
||||||
|
match0--;
|
||||||
|
mLength++;
|
||||||
|
} }
|
||||||
|
|
||||||
|
_match: /* Requires: ip0, match0, offcode, matchEnd */
|
||||||
|
|
||||||
|
/* Count the forward length. */
|
||||||
|
assert(matchEnd != 0);
|
||||||
|
mLength += ZSTD_count_2segments(ip0 + mLength, match0 + mLength, iend, matchEnd, prefixStart);
|
||||||
|
|
||||||
|
ZSTD_storeSeq(seqStore, (size_t)(ip0 - anchor), anchor, iend, offcode, mLength);
|
||||||
|
|
||||||
|
ip0 += mLength;
|
||||||
|
anchor = ip0;
|
||||||
|
|
||||||
|
/* write next hash table entry */
|
||||||
|
if (ip1 < ip0) {
|
||||||
|
hashTable[hash1] = (U32)(ip1 - base);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Fill table and check for immediate repcode. */
|
||||||
|
if (ip0 <= ilimit) {
|
||||||
|
/* Fill Table */
|
||||||
|
assert(base+current0+2 > istart); /* check base overflow */
|
||||||
|
hashTable[ZSTD_hashPtr(base+current0+2, hlog, mls)] = current0+2; /* here because current+2 could be > iend-8 */
|
||||||
|
hashTable[ZSTD_hashPtr(ip0-2, hlog, mls)] = (U32)(ip0-2-base);
|
||||||
|
|
||||||
|
while (ip0 <= ilimit) {
|
||||||
|
U32 const repIndex2 = (U32)(ip0-base) - offset_2;
|
||||||
|
const BYTE* const repMatch2 = repIndex2 < prefixStartIndex ? dictBase + repIndex2 : base + repIndex2;
|
||||||
|
if ( (((U32)((prefixStartIndex-1) - repIndex2) >= 3) & (offset_2 > 0)) /* intentional underflow */
|
||||||
|
&& (MEM_read32(repMatch2) == MEM_read32(ip0)) ) {
|
||||||
|
const BYTE* const repEnd2 = repIndex2 < prefixStartIndex ? dictEnd : iend;
|
||||||
|
size_t const repLength2 = ZSTD_count_2segments(ip0+4, repMatch2+4, iend, repEnd2, prefixStart) + 4;
|
||||||
|
{ U32 const tmpOffset = offset_2; offset_2 = offset_1; offset_1 = tmpOffset; } /* swap offset_2 <=> offset_1 */
|
||||||
|
ZSTD_storeSeq(seqStore, 0 /*litlen*/, anchor, iend, REPCODE1_TO_OFFBASE, repLength2);
|
||||||
|
hashTable[ZSTD_hashPtr(ip0, hlog, mls)] = (U32)(ip0-base);
|
||||||
|
ip0 += repLength2;
|
||||||
|
anchor = ip0;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
} }
|
||||||
|
|
||||||
|
goto _start;
|
||||||
}
|
}
|
||||||
|
|
||||||
ZSTD_GEN_FAST_FN(extDict, 4, 0)
|
ZSTD_GEN_FAST_FN(extDict, 4, 0)
|
||||||
@@ -661,6 +953,7 @@ size_t ZSTD_compressBlock_fast_extDict(
|
|||||||
void const* src, size_t srcSize)
|
void const* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
U32 const mls = ms->cParams.minMatch;
|
U32 const mls = ms->cParams.minMatch;
|
||||||
|
assert(ms->dictMatchState == NULL);
|
||||||
switch(mls)
|
switch(mls)
|
||||||
{
|
{
|
||||||
default: /* includes case 3 */
|
default: /* includes case 3 */
|
||||||
|
|||||||
5
vendor/github.com/DataDog/zstd/zstd_fast.h
generated
vendored
5
vendor/github.com/DataDog/zstd/zstd_fast.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -20,7 +20,8 @@ extern "C" {
|
|||||||
#include "zstd_compress_internal.h"
|
#include "zstd_compress_internal.h"
|
||||||
|
|
||||||
void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
void ZSTD_fillHashTable(ZSTD_matchState_t* ms,
|
||||||
void const* end, ZSTD_dictTableLoadMethod_e dtlm);
|
void const* end, ZSTD_dictTableLoadMethod_e dtlm,
|
||||||
|
ZSTD_tableFillPurpose_e tfp);
|
||||||
size_t ZSTD_compressBlock_fast(
|
size_t ZSTD_compressBlock_fast(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|||||||
145
vendor/github.com/DataDog/zstd/zstd_internal.h
generated
vendored
145
vendor/github.com/DataDog/zstd/zstd_internal.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -29,7 +29,6 @@
|
|||||||
#include "zstd.h"
|
#include "zstd.h"
|
||||||
#define FSE_STATIC_LINKING_ONLY
|
#define FSE_STATIC_LINKING_ONLY
|
||||||
#include "fse.h"
|
#include "fse.h"
|
||||||
#define HUF_STATIC_LINKING_ONLY
|
|
||||||
#include "huf.h"
|
#include "huf.h"
|
||||||
#ifndef XXH_STATIC_LINKING_ONLY
|
#ifndef XXH_STATIC_LINKING_ONLY
|
||||||
# define XXH_STATIC_LINKING_ONLY /* XXH64_state_t */
|
# define XXH_STATIC_LINKING_ONLY /* XXH64_state_t */
|
||||||
@@ -94,9 +93,9 @@ typedef enum { bt_raw, bt_rle, bt_compressed, bt_reserved } blockType_e;
|
|||||||
#define ZSTD_FRAMECHECKSUMSIZE 4
|
#define ZSTD_FRAMECHECKSUMSIZE 4
|
||||||
|
|
||||||
#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */
|
#define MIN_SEQUENCES_SIZE 1 /* nbSeq==0 */
|
||||||
#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */ + MIN_SEQUENCES_SIZE /* nbSeq==0 */) /* for a non-null block */
|
#define MIN_CBLOCK_SIZE (1 /*litCSize*/ + 1 /* RLE or RAW */) /* for a non-null block */
|
||||||
|
#define MIN_LITERALS_FOR_4_STREAMS 6
|
||||||
|
|
||||||
#define HufLog 12
|
|
||||||
typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingType_e;
|
typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingType_e;
|
||||||
|
|
||||||
#define LONGNBSEQ 0x7F00
|
#define LONGNBSEQ 0x7F00
|
||||||
@@ -104,6 +103,7 @@ typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingTy
|
|||||||
#define MINMATCH 3
|
#define MINMATCH 3
|
||||||
|
|
||||||
#define Litbits 8
|
#define Litbits 8
|
||||||
|
#define LitHufLog 11
|
||||||
#define MaxLit ((1<<Litbits) - 1)
|
#define MaxLit ((1<<Litbits) - 1)
|
||||||
#define MaxML 52
|
#define MaxML 52
|
||||||
#define MaxLL 35
|
#define MaxLL 35
|
||||||
@@ -114,6 +114,8 @@ typedef enum { set_basic, set_rle, set_compressed, set_repeat } symbolEncodingTy
|
|||||||
#define LLFSELog 9
|
#define LLFSELog 9
|
||||||
#define OffFSELog 8
|
#define OffFSELog 8
|
||||||
#define MaxFSELog MAX(MAX(MLFSELog, LLFSELog), OffFSELog)
|
#define MaxFSELog MAX(MAX(MLFSELog, LLFSELog), OffFSELog)
|
||||||
|
#define MaxMLBits 16
|
||||||
|
#define MaxLLBits 16
|
||||||
|
|
||||||
#define ZSTD_MAX_HUF_HEADER_SIZE 128 /* header + <= 127 byte tree description */
|
#define ZSTD_MAX_HUF_HEADER_SIZE 128 /* header + <= 127 byte tree description */
|
||||||
/* Each table cannot take more than #symbols * FSELog bits */
|
/* Each table cannot take more than #symbols * FSELog bits */
|
||||||
@@ -177,7 +179,7 @@ static void ZSTD_copy8(void* dst, const void* src) {
|
|||||||
ZSTD_memcpy(dst, src, 8);
|
ZSTD_memcpy(dst, src, 8);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#define COPY8(d,s) { ZSTD_copy8(d,s); d+=8; s+=8; }
|
#define COPY8(d,s) do { ZSTD_copy8(d,s); d+=8; s+=8; } while (0)
|
||||||
|
|
||||||
/* Need to use memmove here since the literal buffer can now be located within
|
/* Need to use memmove here since the literal buffer can now be located within
|
||||||
the dst buffer. In circumstances where the op "catches up" to where the
|
the dst buffer. In circumstances where the op "catches up" to where the
|
||||||
@@ -197,7 +199,7 @@ static void ZSTD_copy16(void* dst, const void* src) {
|
|||||||
ZSTD_memcpy(dst, copy16_buf, 16);
|
ZSTD_memcpy(dst, copy16_buf, 16);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
#define COPY16(d,s) { ZSTD_copy16(d,s); d+=16; s+=16; }
|
#define COPY16(d,s) do { ZSTD_copy16(d,s); d+=16; s+=16; } while (0)
|
||||||
|
|
||||||
#define WILDCOPY_OVERLENGTH 32
|
#define WILDCOPY_OVERLENGTH 32
|
||||||
#define WILDCOPY_VECLEN 16
|
#define WILDCOPY_VECLEN 16
|
||||||
@@ -226,7 +228,7 @@ void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e
|
|||||||
if (ovtype == ZSTD_overlap_src_before_dst && diff < WILDCOPY_VECLEN) {
|
if (ovtype == ZSTD_overlap_src_before_dst && diff < WILDCOPY_VECLEN) {
|
||||||
/* Handle short offset copies. */
|
/* Handle short offset copies. */
|
||||||
do {
|
do {
|
||||||
COPY8(op, ip)
|
COPY8(op, ip);
|
||||||
} while (op < oend);
|
} while (op < oend);
|
||||||
} else {
|
} else {
|
||||||
assert(diff >= WILDCOPY_VECLEN || diff <= -WILDCOPY_VECLEN);
|
assert(diff >= WILDCOPY_VECLEN || diff <= -WILDCOPY_VECLEN);
|
||||||
@@ -236,12 +238,6 @@ void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e
|
|||||||
* one COPY16() in the first call. Then, do two calls per loop since
|
* one COPY16() in the first call. Then, do two calls per loop since
|
||||||
* at that point it is more likely to have a high trip count.
|
* at that point it is more likely to have a high trip count.
|
||||||
*/
|
*/
|
||||||
#ifdef __aarch64__
|
|
||||||
do {
|
|
||||||
COPY16(op, ip);
|
|
||||||
}
|
|
||||||
while (op < oend);
|
|
||||||
#else
|
|
||||||
ZSTD_copy16(op, ip);
|
ZSTD_copy16(op, ip);
|
||||||
if (16 >= length) return;
|
if (16 >= length) return;
|
||||||
op += 16;
|
op += 16;
|
||||||
@@ -251,7 +247,6 @@ void ZSTD_wildcopy(void* dst, const void* src, ptrdiff_t length, ZSTD_overlap_e
|
|||||||
COPY16(op, ip);
|
COPY16(op, ip);
|
||||||
}
|
}
|
||||||
while (op < oend);
|
while (op < oend);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -300,11 +295,11 @@ typedef enum {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
seqDef* sequencesStart;
|
seqDef* sequencesStart;
|
||||||
seqDef* sequences; /* ptr to end of sequences */
|
seqDef* sequences; /* ptr to end of sequences */
|
||||||
BYTE* litStart;
|
BYTE* litStart;
|
||||||
BYTE* lit; /* ptr to end of literals */
|
BYTE* lit; /* ptr to end of literals */
|
||||||
BYTE* llCode;
|
BYTE* llCode;
|
||||||
BYTE* mlCode;
|
BYTE* mlCode;
|
||||||
BYTE* ofCode;
|
BYTE* ofCode;
|
||||||
size_t maxNbSeq;
|
size_t maxNbSeq;
|
||||||
size_t maxNbLit;
|
size_t maxNbLit;
|
||||||
|
|
||||||
@@ -312,8 +307,8 @@ typedef struct {
|
|||||||
* in the seqStore that has a value larger than U16 (if it exists). To do so, we increment
|
* in the seqStore that has a value larger than U16 (if it exists). To do so, we increment
|
||||||
* the existing value of the litLength or matchLength by 0x10000.
|
* the existing value of the litLength or matchLength by 0x10000.
|
||||||
*/
|
*/
|
||||||
ZSTD_longLengthType_e longLengthType;
|
ZSTD_longLengthType_e longLengthType;
|
||||||
U32 longLengthPos; /* Index of the sequence to apply long length modification to */
|
U32 longLengthPos; /* Index of the sequence to apply long length modification to */
|
||||||
} seqStore_t;
|
} seqStore_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
@@ -332,10 +327,10 @@ MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore
|
|||||||
seqLen.matchLength = seq->mlBase + MINMATCH;
|
seqLen.matchLength = seq->mlBase + MINMATCH;
|
||||||
if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) {
|
if (seqStore->longLengthPos == (U32)(seq - seqStore->sequencesStart)) {
|
||||||
if (seqStore->longLengthType == ZSTD_llt_literalLength) {
|
if (seqStore->longLengthType == ZSTD_llt_literalLength) {
|
||||||
seqLen.litLength += 0xFFFF;
|
seqLen.litLength += 0x10000;
|
||||||
}
|
}
|
||||||
if (seqStore->longLengthType == ZSTD_llt_matchLength) {
|
if (seqStore->longLengthType == ZSTD_llt_matchLength) {
|
||||||
seqLen.matchLength += 0xFFFF;
|
seqLen.matchLength += 0x10000;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return seqLen;
|
return seqLen;
|
||||||
@@ -348,109 +343,13 @@ MEM_STATIC ZSTD_sequenceLength ZSTD_getSequenceLength(seqStore_t const* seqStore
|
|||||||
* `decompressedBound != ZSTD_CONTENTSIZE_ERROR`
|
* `decompressedBound != ZSTD_CONTENTSIZE_ERROR`
|
||||||
*/
|
*/
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
size_t nbBlocks;
|
||||||
size_t compressedSize;
|
size_t compressedSize;
|
||||||
unsigned long long decompressedBound;
|
unsigned long long decompressedBound;
|
||||||
} ZSTD_frameSizeInfo; /* decompress & legacy */
|
} ZSTD_frameSizeInfo; /* decompress & legacy */
|
||||||
|
|
||||||
const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */
|
const seqStore_t* ZSTD_getSeqStore(const ZSTD_CCtx* ctx); /* compress & dictBuilder */
|
||||||
void ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */
|
int ZSTD_seqToCodes(const seqStore_t* seqStorePtr); /* compress, dictBuilder, decodeCorpus (shouldn't get its definition from here) */
|
||||||
|
|
||||||
/* custom memory allocation functions */
|
|
||||||
void* ZSTD_customMalloc(size_t size, ZSTD_customMem customMem);
|
|
||||||
void* ZSTD_customCalloc(size_t size, ZSTD_customMem customMem);
|
|
||||||
void ZSTD_customFree(void* ptr, ZSTD_customMem customMem);
|
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC U32 ZSTD_highbit32(U32 val) /* compress, dictBuilder, decodeCorpus */
|
|
||||||
{
|
|
||||||
assert(val != 0);
|
|
||||||
{
|
|
||||||
# if defined(_MSC_VER) /* Visual */
|
|
||||||
# if STATIC_BMI2 == 1
|
|
||||||
return _lzcnt_u32(val)^31;
|
|
||||||
# else
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanReverse(&r, val);
|
|
||||||
return (unsigned)r;
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3) /* GCC Intrinsic */
|
|
||||||
return __builtin_clz (val) ^ 31;
|
|
||||||
# elif defined(__ICCARM__) /* IAR Intrinsic */
|
|
||||||
return 31 - __CLZ(val);
|
|
||||||
# else /* Software version */
|
|
||||||
static const U32 DeBruijnClz[32] = { 0, 9, 1, 10, 13, 21, 2, 29, 11, 14, 16, 18, 22, 25, 3, 30, 8, 12, 20, 28, 15, 17, 24, 7, 19, 27, 23, 6, 26, 5, 4, 31 };
|
|
||||||
U32 v = val;
|
|
||||||
v |= v >> 1;
|
|
||||||
v |= v >> 2;
|
|
||||||
v |= v >> 4;
|
|
||||||
v |= v >> 8;
|
|
||||||
v |= v >> 16;
|
|
||||||
return DeBruijnClz[(v * 0x07C4ACDDU) >> 27];
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Counts the number of trailing zeros of a `size_t`.
|
|
||||||
* Most compilers should support CTZ as a builtin. A backup
|
|
||||||
* implementation is provided if the builtin isn't supported, but
|
|
||||||
* it may not be terribly efficient.
|
|
||||||
*/
|
|
||||||
MEM_STATIC unsigned ZSTD_countTrailingZeros(size_t val)
|
|
||||||
{
|
|
||||||
if (MEM_64bits()) {
|
|
||||||
# if defined(_MSC_VER) && defined(_WIN64)
|
|
||||||
# if STATIC_BMI2
|
|
||||||
return _tzcnt_u64(val);
|
|
||||||
# else
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward64(&r, (U64)val);
|
|
||||||
return (unsigned)r;
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# endif
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 4)
|
|
||||||
return __builtin_ctzll((U64)val);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[64] = { 0, 1, 2, 7, 3, 13, 8, 19,
|
|
||||||
4, 25, 14, 28, 9, 34, 20, 56,
|
|
||||||
5, 17, 26, 54, 15, 41, 29, 43,
|
|
||||||
10, 31, 38, 35, 21, 45, 49, 57,
|
|
||||||
63, 6, 12, 18, 24, 27, 33, 55,
|
|
||||||
16, 53, 40, 42, 30, 37, 44, 48,
|
|
||||||
62, 11, 23, 32, 52, 39, 36, 47,
|
|
||||||
61, 22, 51, 46, 60, 50, 59, 58 };
|
|
||||||
return DeBruijnBytePos[((U64)((val & -(long long)val) * 0x0218A392CDABBD3FULL)) >> 58];
|
|
||||||
# endif
|
|
||||||
} else { /* 32 bits */
|
|
||||||
# if defined(_MSC_VER)
|
|
||||||
if (val != 0) {
|
|
||||||
unsigned long r;
|
|
||||||
_BitScanForward(&r, (U32)val);
|
|
||||||
return (unsigned)r;
|
|
||||||
} else {
|
|
||||||
/* Should not reach this code path */
|
|
||||||
__assume(0);
|
|
||||||
}
|
|
||||||
# elif defined(__GNUC__) && (__GNUC__ >= 3)
|
|
||||||
return __builtin_ctz((U32)val);
|
|
||||||
# else
|
|
||||||
static const int DeBruijnBytePos[32] = { 0, 1, 28, 2, 29, 14, 24, 3,
|
|
||||||
30, 22, 20, 15, 25, 17, 4, 8,
|
|
||||||
31, 27, 13, 23, 21, 19, 16, 7,
|
|
||||||
26, 12, 18, 6, 11, 5, 10, 9 };
|
|
||||||
return DeBruijnBytePos[((U32)((val & -(S32)val) * 0x077CB531U)) >> 27];
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ZSTD_invalidateRepCodes() :
|
/* ZSTD_invalidateRepCodes() :
|
||||||
@@ -468,13 +367,13 @@ typedef struct {
|
|||||||
|
|
||||||
/*! ZSTD_getcBlockSize() :
|
/*! ZSTD_getcBlockSize() :
|
||||||
* Provides the size of compressed block from block header `src` */
|
* Provides the size of compressed block from block header `src` */
|
||||||
/* Used by: decompress, fullbench (does not get its definition from here) */
|
/* Used by: decompress, fullbench */
|
||||||
size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
|
size_t ZSTD_getcBlockSize(const void* src, size_t srcSize,
|
||||||
blockProperties_t* bpPtr);
|
blockProperties_t* bpPtr);
|
||||||
|
|
||||||
/*! ZSTD_decodeSeqHeaders() :
|
/*! ZSTD_decodeSeqHeaders() :
|
||||||
* decode sequence header from src */
|
* decode sequence header from src */
|
||||||
/* Used by: decompress, fullbench (does not get its definition from here) */
|
/* Used by: zstd_decompress_block, fullbench */
|
||||||
size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
|
size_t ZSTD_decodeSeqHeaders(ZSTD_DCtx* dctx, int* nbSeqPtr,
|
||||||
const void* src, size_t srcSize);
|
const void* src, size_t srcSize);
|
||||||
|
|
||||||
|
|||||||
1057
vendor/github.com/DataDog/zstd/zstd_lazy.c
generated
vendored
1057
vendor/github.com/DataDog/zstd/zstd_lazy.c
generated
vendored
File diff suppressed because it is too large
Load Diff
181
vendor/github.com/DataDog/zstd/zstd_lazy.h
generated
vendored
181
vendor/github.com/DataDog/zstd/zstd_lazy.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -26,98 +26,175 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
#define ZSTD_LAZY_DDSS_BUCKET_LOG 2
|
#define ZSTD_LAZY_DDSS_BUCKET_LOG 2
|
||||||
|
|
||||||
|
#define ZSTD_ROW_HASH_TAG_BITS 8 /* nb bits to use for the tag */
|
||||||
|
|
||||||
|
#if !defined(ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR)
|
||||||
U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip);
|
U32 ZSTD_insertAndFindFirstIndex(ZSTD_matchState_t* ms, const BYTE* ip);
|
||||||
void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip);
|
void ZSTD_row_update(ZSTD_matchState_t* const ms, const BYTE* ip);
|
||||||
|
|
||||||
void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip);
|
void ZSTD_dedicatedDictSearch_lazy_loadDictionary(ZSTD_matchState_t* ms, const BYTE* const ip);
|
||||||
|
|
||||||
void ZSTD_preserveUnsortedMark (U32* const table, U32 const size, U32 const reducerValue); /*! used in ZSTD_reduceIndex(). preemptively increase value of ZSTD_DUBT_UNSORTED_MARK */
|
void ZSTD_preserveUnsortedMark (U32* const table, U32 const size, U32 const reducerValue); /*! used in ZSTD_reduceIndex(). preemptively increase value of ZSTD_DUBT_UNSORTED_MARK */
|
||||||
|
#endif
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btlazy2(
|
#ifndef ZSTD_EXCLUDE_GREEDY_BLOCK_COMPRESSOR
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy2(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy(
|
size_t ZSTD_compressBlock_greedy(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy2_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_row(
|
size_t ZSTD_compressBlock_greedy_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btlazy2_dictMatchState(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy2_dictMatchState(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy_dictMatchState(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_dictMatchState(
|
size_t ZSTD_compressBlock_greedy_dictMatchState(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy2_dictMatchState_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy_dictMatchState_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_dictMatchState_row(
|
size_t ZSTD_compressBlock_greedy_dictMatchState_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy_dedicatedDictSearch(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_dedicatedDictSearch(
|
size_t ZSTD_compressBlock_greedy_dedicatedDictSearch(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row(
|
size_t ZSTD_compressBlock_greedy_dedicatedDictSearch_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_greedy_extDict(
|
size_t ZSTD_compressBlock_greedy_extDict(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy_extDict(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_lazy2_extDict(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_greedy_extDict_row(
|
size_t ZSTD_compressBlock_greedy_extDict_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY ZSTD_compressBlock_greedy
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_ROW ZSTD_compressBlock_greedy_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE ZSTD_compressBlock_greedy_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE_ROW ZSTD_compressBlock_greedy_dictMatchState_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH ZSTD_compressBlock_greedy_dedicatedDictSearch
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_greedy_dedicatedDictSearch_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT ZSTD_compressBlock_greedy_extDict
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT_ROW ZSTD_compressBlock_greedy_extDict_row
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DICTMATCHSTATE_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_DEDICATEDDICTSEARCH_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_GREEDY_EXTDICT_ROW NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_LAZY_BLOCK_COMPRESSOR
|
||||||
|
size_t ZSTD_compressBlock_lazy(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_dictMatchState(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_dictMatchState_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_dedicatedDictSearch(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_dedicatedDictSearch_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy_extDict(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy_extDict_row(
|
size_t ZSTD_compressBlock_lazy_extDict_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY ZSTD_compressBlock_lazy
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_ROW ZSTD_compressBlock_lazy_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE ZSTD_compressBlock_lazy_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE_ROW ZSTD_compressBlock_lazy_dictMatchState_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH ZSTD_compressBlock_lazy_dedicatedDictSearch
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_lazy_dedicatedDictSearch_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT ZSTD_compressBlock_lazy_extDict
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT_ROW ZSTD_compressBlock_lazy_extDict_row
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DICTMATCHSTATE_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_DEDICATEDDICTSEARCH_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY_EXTDICT_ROW NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_LAZY2_BLOCK_COMPRESSOR
|
||||||
|
size_t ZSTD_compressBlock_lazy2(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_dictMatchState(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_dictMatchState_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_dedicatedDictSearch_row(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_lazy2_extDict(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_lazy2_extDict_row(
|
size_t ZSTD_compressBlock_lazy2_extDict_row(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2 ZSTD_compressBlock_lazy2
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_ROW ZSTD_compressBlock_lazy2_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE ZSTD_compressBlock_lazy2_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE_ROW ZSTD_compressBlock_lazy2_dictMatchState_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH ZSTD_compressBlock_lazy2_dedicatedDictSearch
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH_ROW ZSTD_compressBlock_lazy2_dedicatedDictSearch_row
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT ZSTD_compressBlock_lazy2_extDict
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT_ROW ZSTD_compressBlock_lazy2_extDict_row
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2 NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DICTMATCHSTATE_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_DEDICATEDDICTSEARCH_ROW NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_LAZY2_EXTDICT_ROW NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR
|
||||||
|
size_t ZSTD_compressBlock_btlazy2(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_btlazy2_dictMatchState(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_btlazy2_extDict(
|
size_t ZSTD_compressBlock_btlazy2_extDict(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2 ZSTD_compressBlock_btlazy2
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2_DICTMATCHSTATE ZSTD_compressBlock_btlazy2_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT ZSTD_compressBlock_btlazy2_extDict
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2 NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTLAZY2_EXTDICT NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
|
|||||||
20
vendor/github.com/DataDog/zstd/zstd_ldm.c
generated
vendored
20
vendor/github.com/DataDog/zstd/zstd_ldm.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -243,11 +243,15 @@ static size_t ZSTD_ldm_fillFastTables(ZSTD_matchState_t* ms,
|
|||||||
switch(ms->cParams.strategy)
|
switch(ms->cParams.strategy)
|
||||||
{
|
{
|
||||||
case ZSTD_fast:
|
case ZSTD_fast:
|
||||||
ZSTD_fillHashTable(ms, iend, ZSTD_dtlm_fast);
|
ZSTD_fillHashTable(ms, iend, ZSTD_dtlm_fast, ZSTD_tfp_forCCtx);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ZSTD_dfast:
|
case ZSTD_dfast:
|
||||||
ZSTD_fillDoubleHashTable(ms, iend, ZSTD_dtlm_fast);
|
#ifndef ZSTD_EXCLUDE_DFAST_BLOCK_COMPRESSOR
|
||||||
|
ZSTD_fillDoubleHashTable(ms, iend, ZSTD_dtlm_fast, ZSTD_tfp_forCCtx);
|
||||||
|
#else
|
||||||
|
assert(0); /* shouldn't be called: cparams should've been adjusted. */
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ZSTD_greedy:
|
case ZSTD_greedy:
|
||||||
@@ -319,7 +323,9 @@ static void ZSTD_ldm_limitTableUpdate(ZSTD_matchState_t* ms, const BYTE* anchor)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static size_t ZSTD_ldm_generateSequences_internal(
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t ZSTD_ldm_generateSequences_internal(
|
||||||
ldmState_t* ldmState, rawSeqStore_t* rawSeqStore,
|
ldmState_t* ldmState, rawSeqStore_t* rawSeqStore,
|
||||||
ldmParams_t const* params, void const* src, size_t srcSize)
|
ldmParams_t const* params, void const* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
@@ -550,7 +556,7 @@ size_t ZSTD_ldm_generateSequences(
|
|||||||
* the window through early invalidation.
|
* the window through early invalidation.
|
||||||
* TODO: * Test the chunk size.
|
* TODO: * Test the chunk size.
|
||||||
* * Try invalidation after the sequence generation and test the
|
* * Try invalidation after the sequence generation and test the
|
||||||
* the offset against maxDist directly.
|
* offset against maxDist directly.
|
||||||
*
|
*
|
||||||
* NOTE: Because of dictionaries + sequence splitting we MUST make sure
|
* NOTE: Because of dictionaries + sequence splitting we MUST make sure
|
||||||
* that any offset used is valid at the END of the sequence, since it may
|
* that any offset used is valid at the END of the sequence, since it may
|
||||||
@@ -690,7 +696,6 @@ size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
|
|||||||
/* maybeSplitSequence updates rawSeqStore->pos */
|
/* maybeSplitSequence updates rawSeqStore->pos */
|
||||||
rawSeq const sequence = maybeSplitSequence(rawSeqStore,
|
rawSeq const sequence = maybeSplitSequence(rawSeqStore,
|
||||||
(U32)(iend - ip), minMatch);
|
(U32)(iend - ip), minMatch);
|
||||||
int i;
|
|
||||||
/* End signal */
|
/* End signal */
|
||||||
if (sequence.offset == 0)
|
if (sequence.offset == 0)
|
||||||
break;
|
break;
|
||||||
@@ -703,6 +708,7 @@ size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
|
|||||||
/* Run the block compressor */
|
/* Run the block compressor */
|
||||||
DEBUGLOG(5, "pos %u : calling block compressor on segment of size %u", (unsigned)(ip-istart), sequence.litLength);
|
DEBUGLOG(5, "pos %u : calling block compressor on segment of size %u", (unsigned)(ip-istart), sequence.litLength);
|
||||||
{
|
{
|
||||||
|
int i;
|
||||||
size_t const newLitLength =
|
size_t const newLitLength =
|
||||||
blockCompressor(ms, seqStore, rep, ip, sequence.litLength);
|
blockCompressor(ms, seqStore, rep, ip, sequence.litLength);
|
||||||
ip += sequence.litLength;
|
ip += sequence.litLength;
|
||||||
@@ -712,7 +718,7 @@ size_t ZSTD_ldm_blockCompress(rawSeqStore_t* rawSeqStore,
|
|||||||
rep[0] = sequence.offset;
|
rep[0] = sequence.offset;
|
||||||
/* Store the sequence */
|
/* Store the sequence */
|
||||||
ZSTD_storeSeq(seqStore, newLitLength, ip - newLitLength, iend,
|
ZSTD_storeSeq(seqStore, newLitLength, ip - newLitLength, iend,
|
||||||
STORE_OFFSET(sequence.offset),
|
OFFSET_TO_OFFBASE(sequence.offset),
|
||||||
sequence.matchLength);
|
sequence.matchLength);
|
||||||
ip += sequence.matchLength;
|
ip += sequence.matchLength;
|
||||||
}
|
}
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_ldm.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_ldm.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_ldm_geartab.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_ldm_geartab.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
39
vendor/github.com/DataDog/zstd/zstd_legacy.h
generated
vendored
39
vendor/github.com/DataDog/zstd/zstd_legacy.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -125,6 +125,20 @@ MEM_STATIC size_t ZSTD_decompressLegacy(
|
|||||||
const void* dict,size_t dictSize)
|
const void* dict,size_t dictSize)
|
||||||
{
|
{
|
||||||
U32 const version = ZSTD_isLegacy(src, compressedSize);
|
U32 const version = ZSTD_isLegacy(src, compressedSize);
|
||||||
|
char x;
|
||||||
|
/* Avoid passing NULL to legacy decoding. */
|
||||||
|
if (dst == NULL) {
|
||||||
|
assert(dstCapacity == 0);
|
||||||
|
dst = &x;
|
||||||
|
}
|
||||||
|
if (src == NULL) {
|
||||||
|
assert(compressedSize == 0);
|
||||||
|
src = &x;
|
||||||
|
}
|
||||||
|
if (dict == NULL) {
|
||||||
|
assert(dictSize == 0);
|
||||||
|
dict = &x;
|
||||||
|
}
|
||||||
(void)dst; (void)dstCapacity; (void)dict; (void)dictSize; /* unused when ZSTD_LEGACY_SUPPORT >= 8 */
|
(void)dst; (void)dstCapacity; (void)dict; (void)dictSize; /* unused when ZSTD_LEGACY_SUPPORT >= 8 */
|
||||||
switch(version)
|
switch(version)
|
||||||
{
|
{
|
||||||
@@ -243,6 +257,13 @@ MEM_STATIC ZSTD_frameSizeInfo ZSTD_findFrameSizeInfoLegacy(const void *src, size
|
|||||||
frameSizeInfo.compressedSize = ERROR(srcSize_wrong);
|
frameSizeInfo.compressedSize = ERROR(srcSize_wrong);
|
||||||
frameSizeInfo.decompressedBound = ZSTD_CONTENTSIZE_ERROR;
|
frameSizeInfo.decompressedBound = ZSTD_CONTENTSIZE_ERROR;
|
||||||
}
|
}
|
||||||
|
/* In all cases, decompressedBound == nbBlocks * ZSTD_BLOCKSIZE_MAX.
|
||||||
|
* So we can compute nbBlocks without having to change every function.
|
||||||
|
*/
|
||||||
|
if (frameSizeInfo.decompressedBound != ZSTD_CONTENTSIZE_ERROR) {
|
||||||
|
assert((frameSizeInfo.decompressedBound & (ZSTD_BLOCKSIZE_MAX - 1)) == 0);
|
||||||
|
frameSizeInfo.nbBlocks = (size_t)(frameSizeInfo.decompressedBound / ZSTD_BLOCKSIZE_MAX);
|
||||||
|
}
|
||||||
return frameSizeInfo;
|
return frameSizeInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,6 +302,12 @@ MEM_STATIC size_t ZSTD_freeLegacyStreamContext(void* legacyContext, U32 version)
|
|||||||
MEM_STATIC size_t ZSTD_initLegacyStream(void** legacyContext, U32 prevVersion, U32 newVersion,
|
MEM_STATIC size_t ZSTD_initLegacyStream(void** legacyContext, U32 prevVersion, U32 newVersion,
|
||||||
const void* dict, size_t dictSize)
|
const void* dict, size_t dictSize)
|
||||||
{
|
{
|
||||||
|
char x;
|
||||||
|
/* Avoid passing NULL to legacy decoding. */
|
||||||
|
if (dict == NULL) {
|
||||||
|
assert(dictSize == 0);
|
||||||
|
dict = &x;
|
||||||
|
}
|
||||||
DEBUGLOG(5, "ZSTD_initLegacyStream for v0.%u", newVersion);
|
DEBUGLOG(5, "ZSTD_initLegacyStream for v0.%u", newVersion);
|
||||||
if (prevVersion != newVersion) ZSTD_freeLegacyStreamContext(*legacyContext, prevVersion);
|
if (prevVersion != newVersion) ZSTD_freeLegacyStreamContext(*legacyContext, prevVersion);
|
||||||
switch(newVersion)
|
switch(newVersion)
|
||||||
@@ -340,6 +367,16 @@ MEM_STATIC size_t ZSTD_initLegacyStream(void** legacyContext, U32 prevVersion, U
|
|||||||
MEM_STATIC size_t ZSTD_decompressLegacyStream(void* legacyContext, U32 version,
|
MEM_STATIC size_t ZSTD_decompressLegacyStream(void* legacyContext, U32 version,
|
||||||
ZSTD_outBuffer* output, ZSTD_inBuffer* input)
|
ZSTD_outBuffer* output, ZSTD_inBuffer* input)
|
||||||
{
|
{
|
||||||
|
static char x;
|
||||||
|
/* Avoid passing NULL to legacy decoding. */
|
||||||
|
if (output->dst == NULL) {
|
||||||
|
assert(output->size == 0);
|
||||||
|
output->dst = &x;
|
||||||
|
}
|
||||||
|
if (input->src == NULL) {
|
||||||
|
assert(input->size == 0);
|
||||||
|
input->src = &x;
|
||||||
|
}
|
||||||
DEBUGLOG(5, "ZSTD_decompressLegacyStream for v0.%u", version);
|
DEBUGLOG(5, "ZSTD_decompressLegacyStream for v0.%u", version);
|
||||||
switch(version)
|
switch(version)
|
||||||
{
|
{
|
||||||
|
|||||||
500
vendor/github.com/DataDog/zstd/zstd_opt.c
generated
vendored
500
vendor/github.com/DataDog/zstd/zstd_opt.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Przemyslaw Skibinski, Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -13,11 +13,14 @@
|
|||||||
#include "hist.h"
|
#include "hist.h"
|
||||||
#include "zstd_opt.h"
|
#include "zstd_opt.h"
|
||||||
|
|
||||||
|
#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR)
|
||||||
|
|
||||||
#define ZSTD_LITFREQ_ADD 2 /* scaling factor for litFreq, so that frequencies adapt faster to new stats */
|
#define ZSTD_LITFREQ_ADD 2 /* scaling factor for litFreq, so that frequencies adapt faster to new stats */
|
||||||
#define ZSTD_MAX_PRICE (1<<30)
|
#define ZSTD_MAX_PRICE (1<<30)
|
||||||
|
|
||||||
#define ZSTD_PREDEF_THRESHOLD 1024 /* if srcSize < ZSTD_PREDEF_THRESHOLD, symbols' cost is assumed static, directly determined by pre-defined distributions */
|
#define ZSTD_PREDEF_THRESHOLD 8 /* if srcSize < ZSTD_PREDEF_THRESHOLD, symbols' cost is assumed static, directly determined by pre-defined distributions */
|
||||||
|
|
||||||
|
|
||||||
/*-*************************************
|
/*-*************************************
|
||||||
@@ -27,27 +30,35 @@
|
|||||||
#if 0 /* approximation at bit level (for tests) */
|
#if 0 /* approximation at bit level (for tests) */
|
||||||
# define BITCOST_ACCURACY 0
|
# define BITCOST_ACCURACY 0
|
||||||
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
||||||
# define WEIGHT(stat, opt) ((void)opt, ZSTD_bitWeight(stat))
|
# define WEIGHT(stat, opt) ((void)(opt), ZSTD_bitWeight(stat))
|
||||||
#elif 0 /* fractional bit accuracy (for tests) */
|
#elif 0 /* fractional bit accuracy (for tests) */
|
||||||
# define BITCOST_ACCURACY 8
|
# define BITCOST_ACCURACY 8
|
||||||
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
||||||
# define WEIGHT(stat,opt) ((void)opt, ZSTD_fracWeight(stat))
|
# define WEIGHT(stat,opt) ((void)(opt), ZSTD_fracWeight(stat))
|
||||||
#else /* opt==approx, ultra==accurate */
|
#else /* opt==approx, ultra==accurate */
|
||||||
# define BITCOST_ACCURACY 8
|
# define BITCOST_ACCURACY 8
|
||||||
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
# define BITCOST_MULTIPLIER (1 << BITCOST_ACCURACY)
|
||||||
# define WEIGHT(stat,opt) (opt ? ZSTD_fracWeight(stat) : ZSTD_bitWeight(stat))
|
# define WEIGHT(stat,opt) ((opt) ? ZSTD_fracWeight(stat) : ZSTD_bitWeight(stat))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* ZSTD_bitWeight() :
|
||||||
|
* provide estimated "cost" of a stat in full bits only */
|
||||||
MEM_STATIC U32 ZSTD_bitWeight(U32 stat)
|
MEM_STATIC U32 ZSTD_bitWeight(U32 stat)
|
||||||
{
|
{
|
||||||
return (ZSTD_highbit32(stat+1) * BITCOST_MULTIPLIER);
|
return (ZSTD_highbit32(stat+1) * BITCOST_MULTIPLIER);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* ZSTD_fracWeight() :
|
||||||
|
* provide fractional-bit "cost" of a stat,
|
||||||
|
* using linear interpolation approximation */
|
||||||
MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat)
|
MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat)
|
||||||
{
|
{
|
||||||
U32 const stat = rawStat + 1;
|
U32 const stat = rawStat + 1;
|
||||||
U32 const hb = ZSTD_highbit32(stat);
|
U32 const hb = ZSTD_highbit32(stat);
|
||||||
U32 const BWeight = hb * BITCOST_MULTIPLIER;
|
U32 const BWeight = hb * BITCOST_MULTIPLIER;
|
||||||
|
/* Fweight was meant for "Fractional weight"
|
||||||
|
* but it's effectively a value between 1 and 2
|
||||||
|
* using fixed point arithmetic */
|
||||||
U32 const FWeight = (stat << BITCOST_ACCURACY) >> hb;
|
U32 const FWeight = (stat << BITCOST_ACCURACY) >> hb;
|
||||||
U32 const weight = BWeight + FWeight;
|
U32 const weight = BWeight + FWeight;
|
||||||
assert(hb + BITCOST_ACCURACY < 31);
|
assert(hb + BITCOST_ACCURACY < 31);
|
||||||
@@ -58,7 +69,7 @@ MEM_STATIC U32 ZSTD_fracWeight(U32 rawStat)
|
|||||||
/* debugging function,
|
/* debugging function,
|
||||||
* @return price in bytes as fractional value
|
* @return price in bytes as fractional value
|
||||||
* for debug messages only */
|
* for debug messages only */
|
||||||
MEM_STATIC double ZSTD_fCost(U32 price)
|
MEM_STATIC double ZSTD_fCost(int price)
|
||||||
{
|
{
|
||||||
return (double)price / (BITCOST_MULTIPLIER*8);
|
return (double)price / (BITCOST_MULTIPLIER*8);
|
||||||
}
|
}
|
||||||
@@ -89,20 +100,26 @@ static U32 sum_u32(const unsigned table[], size_t nbElts)
|
|||||||
return total;
|
return total;
|
||||||
}
|
}
|
||||||
|
|
||||||
static U32 ZSTD_downscaleStats(unsigned* table, U32 lastEltIndex, U32 shift)
|
typedef enum { base_0possible=0, base_1guaranteed=1 } base_directive_e;
|
||||||
|
|
||||||
|
static U32
|
||||||
|
ZSTD_downscaleStats(unsigned* table, U32 lastEltIndex, U32 shift, base_directive_e base1)
|
||||||
{
|
{
|
||||||
U32 s, sum=0;
|
U32 s, sum=0;
|
||||||
DEBUGLOG(5, "ZSTD_downscaleStats (nbElts=%u, shift=%u)", (unsigned)lastEltIndex+1, (unsigned)shift);
|
DEBUGLOG(5, "ZSTD_downscaleStats (nbElts=%u, shift=%u)",
|
||||||
|
(unsigned)lastEltIndex+1, (unsigned)shift );
|
||||||
assert(shift < 30);
|
assert(shift < 30);
|
||||||
for (s=0; s<lastEltIndex+1; s++) {
|
for (s=0; s<lastEltIndex+1; s++) {
|
||||||
table[s] = 1 + (table[s] >> shift);
|
unsigned const base = base1 ? 1 : (table[s]>0);
|
||||||
sum += table[s];
|
unsigned const newStat = base + (table[s] >> shift);
|
||||||
|
sum += newStat;
|
||||||
|
table[s] = newStat;
|
||||||
}
|
}
|
||||||
return sum;
|
return sum;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ZSTD_scaleStats() :
|
/* ZSTD_scaleStats() :
|
||||||
* reduce all elements in table is sum too large
|
* reduce all elt frequencies in table if sum too large
|
||||||
* return the resulting sum of elements */
|
* return the resulting sum of elements */
|
||||||
static U32 ZSTD_scaleStats(unsigned* table, U32 lastEltIndex, U32 logTarget)
|
static U32 ZSTD_scaleStats(unsigned* table, U32 lastEltIndex, U32 logTarget)
|
||||||
{
|
{
|
||||||
@@ -111,7 +128,7 @@ static U32 ZSTD_scaleStats(unsigned* table, U32 lastEltIndex, U32 logTarget)
|
|||||||
DEBUGLOG(5, "ZSTD_scaleStats (nbElts=%u, target=%u)", (unsigned)lastEltIndex+1, (unsigned)logTarget);
|
DEBUGLOG(5, "ZSTD_scaleStats (nbElts=%u, target=%u)", (unsigned)lastEltIndex+1, (unsigned)logTarget);
|
||||||
assert(logTarget < 30);
|
assert(logTarget < 30);
|
||||||
if (factor <= 1) return prevsum;
|
if (factor <= 1) return prevsum;
|
||||||
return ZSTD_downscaleStats(table, lastEltIndex, ZSTD_highbit32(factor));
|
return ZSTD_downscaleStats(table, lastEltIndex, ZSTD_highbit32(factor), base_1guaranteed);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ZSTD_rescaleFreqs() :
|
/* ZSTD_rescaleFreqs() :
|
||||||
@@ -130,18 +147,22 @@ ZSTD_rescaleFreqs(optState_t* const optPtr,
|
|||||||
DEBUGLOG(5, "ZSTD_rescaleFreqs (srcSize=%u)", (unsigned)srcSize);
|
DEBUGLOG(5, "ZSTD_rescaleFreqs (srcSize=%u)", (unsigned)srcSize);
|
||||||
optPtr->priceType = zop_dynamic;
|
optPtr->priceType = zop_dynamic;
|
||||||
|
|
||||||
if (optPtr->litLengthSum == 0) { /* first block : init */
|
if (optPtr->litLengthSum == 0) { /* no literals stats collected -> first block assumed -> init */
|
||||||
if (srcSize <= ZSTD_PREDEF_THRESHOLD) { /* heuristic */
|
|
||||||
DEBUGLOG(5, "(srcSize <= ZSTD_PREDEF_THRESHOLD) => zop_predef");
|
/* heuristic: use pre-defined stats for too small inputs */
|
||||||
|
if (srcSize <= ZSTD_PREDEF_THRESHOLD) {
|
||||||
|
DEBUGLOG(5, "srcSize <= %i : use predefined stats", ZSTD_PREDEF_THRESHOLD);
|
||||||
optPtr->priceType = zop_predef;
|
optPtr->priceType = zop_predef;
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(optPtr->symbolCosts != NULL);
|
assert(optPtr->symbolCosts != NULL);
|
||||||
if (optPtr->symbolCosts->huf.repeatMode == HUF_repeat_valid) {
|
if (optPtr->symbolCosts->huf.repeatMode == HUF_repeat_valid) {
|
||||||
/* huffman table presumed generated by dictionary */
|
|
||||||
|
/* huffman stats covering the full value set : table presumed generated by dictionary */
|
||||||
optPtr->priceType = zop_dynamic;
|
optPtr->priceType = zop_dynamic;
|
||||||
|
|
||||||
if (compressedLiterals) {
|
if (compressedLiterals) {
|
||||||
|
/* generate literals statistics from huffman table */
|
||||||
unsigned lit;
|
unsigned lit;
|
||||||
assert(optPtr->litFreq != NULL);
|
assert(optPtr->litFreq != NULL);
|
||||||
optPtr->litSum = 0;
|
optPtr->litSum = 0;
|
||||||
@@ -189,13 +210,14 @@ ZSTD_rescaleFreqs(optState_t* const optPtr,
|
|||||||
optPtr->offCodeSum += optPtr->offCodeFreq[of];
|
optPtr->offCodeSum += optPtr->offCodeFreq[of];
|
||||||
} }
|
} }
|
||||||
|
|
||||||
} else { /* not a dictionary */
|
} else { /* first block, no dictionary */
|
||||||
|
|
||||||
assert(optPtr->litFreq != NULL);
|
assert(optPtr->litFreq != NULL);
|
||||||
if (compressedLiterals) {
|
if (compressedLiterals) {
|
||||||
|
/* base initial cost of literals on direct frequency within src */
|
||||||
unsigned lit = MaxLit;
|
unsigned lit = MaxLit;
|
||||||
HIST_count_simple(optPtr->litFreq, &lit, src, srcSize); /* use raw first block to init statistics */
|
HIST_count_simple(optPtr->litFreq, &lit, src, srcSize); /* use raw first block to init statistics */
|
||||||
optPtr->litSum = ZSTD_downscaleStats(optPtr->litFreq, MaxLit, 8);
|
optPtr->litSum = ZSTD_downscaleStats(optPtr->litFreq, MaxLit, 8, base_0possible);
|
||||||
}
|
}
|
||||||
|
|
||||||
{ unsigned const baseLLfreqs[MaxLL+1] = {
|
{ unsigned const baseLLfreqs[MaxLL+1] = {
|
||||||
@@ -225,10 +247,9 @@ ZSTD_rescaleFreqs(optState_t* const optPtr,
|
|||||||
optPtr->offCodeSum = sum_u32(baseOFCfreqs, MaxOff+1);
|
optPtr->offCodeSum = sum_u32(baseOFCfreqs, MaxOff+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else { /* new block : re-use previous statistics, scaled down */
|
} else { /* new block : scale down accumulated statistics */
|
||||||
|
|
||||||
if (compressedLiterals)
|
if (compressedLiterals)
|
||||||
optPtr->litSum = ZSTD_scaleStats(optPtr->litFreq, MaxLit, 12);
|
optPtr->litSum = ZSTD_scaleStats(optPtr->litFreq, MaxLit, 12);
|
||||||
@@ -247,6 +268,7 @@ static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength,
|
|||||||
const optState_t* const optPtr,
|
const optState_t* const optPtr,
|
||||||
int optLevel)
|
int optLevel)
|
||||||
{
|
{
|
||||||
|
DEBUGLOG(8, "ZSTD_rawLiteralsCost (%u literals)", litLength);
|
||||||
if (litLength == 0) return 0;
|
if (litLength == 0) return 0;
|
||||||
|
|
||||||
if (!ZSTD_compressedLiterals(optPtr))
|
if (!ZSTD_compressedLiterals(optPtr))
|
||||||
@@ -256,11 +278,14 @@ static U32 ZSTD_rawLiteralsCost(const BYTE* const literals, U32 const litLength,
|
|||||||
return (litLength*6) * BITCOST_MULTIPLIER; /* 6 bit per literal - no statistic used */
|
return (litLength*6) * BITCOST_MULTIPLIER; /* 6 bit per literal - no statistic used */
|
||||||
|
|
||||||
/* dynamic statistics */
|
/* dynamic statistics */
|
||||||
{ U32 price = litLength * optPtr->litSumBasePrice;
|
{ U32 price = optPtr->litSumBasePrice * litLength;
|
||||||
|
U32 const litPriceMax = optPtr->litSumBasePrice - BITCOST_MULTIPLIER;
|
||||||
U32 u;
|
U32 u;
|
||||||
|
assert(optPtr->litSumBasePrice >= BITCOST_MULTIPLIER);
|
||||||
for (u=0; u < litLength; u++) {
|
for (u=0; u < litLength; u++) {
|
||||||
assert(WEIGHT(optPtr->litFreq[literals[u]], optLevel) <= optPtr->litSumBasePrice); /* literal cost should never be negative */
|
U32 litPrice = WEIGHT(optPtr->litFreq[literals[u]], optLevel);
|
||||||
price -= WEIGHT(optPtr->litFreq[literals[u]], optLevel);
|
if (UNLIKELY(litPrice > litPriceMax)) litPrice = litPriceMax;
|
||||||
|
price -= litPrice;
|
||||||
}
|
}
|
||||||
return price;
|
return price;
|
||||||
}
|
}
|
||||||
@@ -273,10 +298,11 @@ static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optP
|
|||||||
assert(litLength <= ZSTD_BLOCKSIZE_MAX);
|
assert(litLength <= ZSTD_BLOCKSIZE_MAX);
|
||||||
if (optPtr->priceType == zop_predef)
|
if (optPtr->priceType == zop_predef)
|
||||||
return WEIGHT(litLength, optLevel);
|
return WEIGHT(litLength, optLevel);
|
||||||
/* We can't compute the litLength price for sizes >= ZSTD_BLOCKSIZE_MAX
|
|
||||||
* because it isn't representable in the zstd format. So instead just
|
/* ZSTD_LLcode() can't compute litLength price for sizes >= ZSTD_BLOCKSIZE_MAX
|
||||||
* call it 1 bit more than ZSTD_BLOCKSIZE_MAX - 1. In this case the block
|
* because it isn't representable in the zstd format.
|
||||||
* would be all literals.
|
* So instead just pretend it would cost 1 bit more than ZSTD_BLOCKSIZE_MAX - 1.
|
||||||
|
* In such a case, the block would be all literals.
|
||||||
*/
|
*/
|
||||||
if (litLength == ZSTD_BLOCKSIZE_MAX)
|
if (litLength == ZSTD_BLOCKSIZE_MAX)
|
||||||
return BITCOST_MULTIPLIER + ZSTD_litLengthPrice(ZSTD_BLOCKSIZE_MAX - 1, optPtr, optLevel);
|
return BITCOST_MULTIPLIER + ZSTD_litLengthPrice(ZSTD_BLOCKSIZE_MAX - 1, optPtr, optLevel);
|
||||||
@@ -290,24 +316,25 @@ static U32 ZSTD_litLengthPrice(U32 const litLength, const optState_t* const optP
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* ZSTD_getMatchPrice() :
|
/* ZSTD_getMatchPrice() :
|
||||||
* Provides the cost of the match part (offset + matchLength) of a sequence
|
* Provides the cost of the match part (offset + matchLength) of a sequence.
|
||||||
* Must be combined with ZSTD_fullLiteralsCost() to get the full cost of a sequence.
|
* Must be combined with ZSTD_fullLiteralsCost() to get the full cost of a sequence.
|
||||||
* @offcode : expects a scale where 0,1,2 are repcodes 1-3, and 3+ are real_offsets+2
|
* @offBase : sumtype, representing an offset or a repcode, and using numeric representation of ZSTD_storeSeq()
|
||||||
* @optLevel: when <2, favors small offset for decompression speed (improved cache efficiency)
|
* @optLevel: when <2, favors small offset for decompression speed (improved cache efficiency)
|
||||||
*/
|
*/
|
||||||
FORCE_INLINE_TEMPLATE U32
|
FORCE_INLINE_TEMPLATE U32
|
||||||
ZSTD_getMatchPrice(U32 const offcode,
|
ZSTD_getMatchPrice(U32 const offBase,
|
||||||
U32 const matchLength,
|
U32 const matchLength,
|
||||||
const optState_t* const optPtr,
|
const optState_t* const optPtr,
|
||||||
int const optLevel)
|
int const optLevel)
|
||||||
{
|
{
|
||||||
U32 price;
|
U32 price;
|
||||||
U32 const offCode = ZSTD_highbit32(STORED_TO_OFFBASE(offcode));
|
U32 const offCode = ZSTD_highbit32(offBase);
|
||||||
U32 const mlBase = matchLength - MINMATCH;
|
U32 const mlBase = matchLength - MINMATCH;
|
||||||
assert(matchLength >= MINMATCH);
|
assert(matchLength >= MINMATCH);
|
||||||
|
|
||||||
if (optPtr->priceType == zop_predef) /* fixed scheme, do not use statistics */
|
if (optPtr->priceType == zop_predef) /* fixed scheme, does not use statistics */
|
||||||
return WEIGHT(mlBase, optLevel) + ((16 + offCode) * BITCOST_MULTIPLIER);
|
return WEIGHT(mlBase, optLevel)
|
||||||
|
+ ((16 + offCode) * BITCOST_MULTIPLIER); /* emulated offset cost */
|
||||||
|
|
||||||
/* dynamic statistics */
|
/* dynamic statistics */
|
||||||
price = (offCode * BITCOST_MULTIPLIER) + (optPtr->offCodeSumBasePrice - WEIGHT(optPtr->offCodeFreq[offCode], optLevel));
|
price = (offCode * BITCOST_MULTIPLIER) + (optPtr->offCodeSumBasePrice - WEIGHT(optPtr->offCodeFreq[offCode], optLevel));
|
||||||
@@ -326,10 +353,10 @@ ZSTD_getMatchPrice(U32 const offcode,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* ZSTD_updateStats() :
|
/* ZSTD_updateStats() :
|
||||||
* assumption : literals + litLengtn <= iend */
|
* assumption : literals + litLength <= iend */
|
||||||
static void ZSTD_updateStats(optState_t* const optPtr,
|
static void ZSTD_updateStats(optState_t* const optPtr,
|
||||||
U32 litLength, const BYTE* literals,
|
U32 litLength, const BYTE* literals,
|
||||||
U32 offsetCode, U32 matchLength)
|
U32 offBase, U32 matchLength)
|
||||||
{
|
{
|
||||||
/* literals */
|
/* literals */
|
||||||
if (ZSTD_compressedLiterals(optPtr)) {
|
if (ZSTD_compressedLiterals(optPtr)) {
|
||||||
@@ -345,8 +372,8 @@ static void ZSTD_updateStats(optState_t* const optPtr,
|
|||||||
optPtr->litLengthSum++;
|
optPtr->litLengthSum++;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* offset code : expected to follow storeSeq() numeric representation */
|
/* offset code : follows storeSeq() numeric representation */
|
||||||
{ U32 const offCode = ZSTD_highbit32(STORED_TO_OFFBASE(offsetCode));
|
{ U32 const offCode = ZSTD_highbit32(offBase);
|
||||||
assert(offCode <= MaxOff);
|
assert(offCode <= MaxOff);
|
||||||
optPtr->offCodeFreq[offCode]++;
|
optPtr->offCodeFreq[offCode]++;
|
||||||
optPtr->offCodeSum++;
|
optPtr->offCodeSum++;
|
||||||
@@ -380,9 +407,11 @@ MEM_STATIC U32 ZSTD_readMINMATCH(const void* memPtr, U32 length)
|
|||||||
|
|
||||||
/* Update hashTable3 up to ip (excluded)
|
/* Update hashTable3 up to ip (excluded)
|
||||||
Assumption : always within prefix (i.e. not within extDict) */
|
Assumption : always within prefix (i.e. not within extDict) */
|
||||||
static U32 ZSTD_insertAndFindFirstIndexHash3 (const ZSTD_matchState_t* ms,
|
static
|
||||||
U32* nextToUpdate3,
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
const BYTE* const ip)
|
U32 ZSTD_insertAndFindFirstIndexHash3 (const ZSTD_matchState_t* ms,
|
||||||
|
U32* nextToUpdate3,
|
||||||
|
const BYTE* const ip)
|
||||||
{
|
{
|
||||||
U32* const hashTable3 = ms->hashTable3;
|
U32* const hashTable3 = ms->hashTable3;
|
||||||
U32 const hashLog3 = ms->hashLog3;
|
U32 const hashLog3 = ms->hashLog3;
|
||||||
@@ -409,7 +438,9 @@ static U32 ZSTD_insertAndFindFirstIndexHash3 (const ZSTD_matchState_t* ms,
|
|||||||
* @param ip assumed <= iend-8 .
|
* @param ip assumed <= iend-8 .
|
||||||
* @param target The target of ZSTD_updateTree_internal() - we are filling to this position
|
* @param target The target of ZSTD_updateTree_internal() - we are filling to this position
|
||||||
* @return : nb of positions added */
|
* @return : nb of positions added */
|
||||||
static U32 ZSTD_insertBt1(
|
static
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
U32 ZSTD_insertBt1(
|
||||||
const ZSTD_matchState_t* ms,
|
const ZSTD_matchState_t* ms,
|
||||||
const BYTE* const ip, const BYTE* const iend,
|
const BYTE* const ip, const BYTE* const iend,
|
||||||
U32 const target,
|
U32 const target,
|
||||||
@@ -528,6 +559,7 @@ static U32 ZSTD_insertBt1(
|
|||||||
}
|
}
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
void ZSTD_updateTree_internal(
|
void ZSTD_updateTree_internal(
|
||||||
ZSTD_matchState_t* ms,
|
ZSTD_matchState_t* ms,
|
||||||
const BYTE* const ip, const BYTE* const iend,
|
const BYTE* const ip, const BYTE* const iend,
|
||||||
@@ -536,7 +568,7 @@ void ZSTD_updateTree_internal(
|
|||||||
const BYTE* const base = ms->window.base;
|
const BYTE* const base = ms->window.base;
|
||||||
U32 const target = (U32)(ip - base);
|
U32 const target = (U32)(ip - base);
|
||||||
U32 idx = ms->nextToUpdate;
|
U32 idx = ms->nextToUpdate;
|
||||||
DEBUGLOG(6, "ZSTD_updateTree_internal, from %u to %u (dictMode:%u)",
|
DEBUGLOG(7, "ZSTD_updateTree_internal, from %u to %u (dictMode:%u)",
|
||||||
idx, target, dictMode);
|
idx, target, dictMode);
|
||||||
|
|
||||||
while(idx < target) {
|
while(idx < target) {
|
||||||
@@ -554,15 +586,18 @@ void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE
|
FORCE_INLINE_TEMPLATE
|
||||||
U32 ZSTD_insertBtAndGetAllMatches (
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
ZSTD_match_t* matches, /* store result (found matches) in this table (presumed large enough) */
|
U32
|
||||||
ZSTD_matchState_t* ms,
|
ZSTD_insertBtAndGetAllMatches (
|
||||||
U32* nextToUpdate3,
|
ZSTD_match_t* matches, /* store result (found matches) in this table (presumed large enough) */
|
||||||
const BYTE* const ip, const BYTE* const iLimit, const ZSTD_dictMode_e dictMode,
|
ZSTD_matchState_t* ms,
|
||||||
const U32 rep[ZSTD_REP_NUM],
|
U32* nextToUpdate3,
|
||||||
U32 const ll0, /* tells if associated literal length is 0 or not. This value must be 0 or 1 */
|
const BYTE* const ip, const BYTE* const iLimit,
|
||||||
const U32 lengthToBeat,
|
const ZSTD_dictMode_e dictMode,
|
||||||
U32 const mls /* template */)
|
const U32 rep[ZSTD_REP_NUM],
|
||||||
|
const U32 ll0, /* tells if associated literal length is 0 or not. This value must be 0 or 1 */
|
||||||
|
const U32 lengthToBeat,
|
||||||
|
const U32 mls /* template */)
|
||||||
{
|
{
|
||||||
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
const ZSTD_compressionParameters* const cParams = &ms->cParams;
|
||||||
U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
|
U32 const sufficient_len = MIN(cParams->targetLength, ZSTD_OPT_NUM -1);
|
||||||
@@ -645,7 +680,7 @@ U32 ZSTD_insertBtAndGetAllMatches (
|
|||||||
DEBUGLOG(8, "found repCode %u (ll0:%u, offset:%u) of length %u",
|
DEBUGLOG(8, "found repCode %u (ll0:%u, offset:%u) of length %u",
|
||||||
repCode, ll0, repOffset, repLen);
|
repCode, ll0, repOffset, repLen);
|
||||||
bestLength = repLen;
|
bestLength = repLen;
|
||||||
matches[mnum].off = STORE_REPCODE(repCode - ll0 + 1); /* expect value between 1 and 3 */
|
matches[mnum].off = REPCODE_TO_OFFBASE(repCode - ll0 + 1); /* expect value between 1 and 3 */
|
||||||
matches[mnum].len = (U32)repLen;
|
matches[mnum].len = (U32)repLen;
|
||||||
mnum++;
|
mnum++;
|
||||||
if ( (repLen > sufficient_len)
|
if ( (repLen > sufficient_len)
|
||||||
@@ -674,7 +709,7 @@ U32 ZSTD_insertBtAndGetAllMatches (
|
|||||||
bestLength = mlen;
|
bestLength = mlen;
|
||||||
assert(curr > matchIndex3);
|
assert(curr > matchIndex3);
|
||||||
assert(mnum==0); /* no prior solution */
|
assert(mnum==0); /* no prior solution */
|
||||||
matches[0].off = STORE_OFFSET(curr - matchIndex3);
|
matches[0].off = OFFSET_TO_OFFBASE(curr - matchIndex3);
|
||||||
matches[0].len = (U32)mlen;
|
matches[0].len = (U32)mlen;
|
||||||
mnum = 1;
|
mnum = 1;
|
||||||
if ( (mlen > sufficient_len) |
|
if ( (mlen > sufficient_len) |
|
||||||
@@ -707,13 +742,13 @@ U32 ZSTD_insertBtAndGetAllMatches (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (matchLength > bestLength) {
|
if (matchLength > bestLength) {
|
||||||
DEBUGLOG(8, "found match of length %u at distance %u (offCode=%u)",
|
DEBUGLOG(8, "found match of length %u at distance %u (offBase=%u)",
|
||||||
(U32)matchLength, curr - matchIndex, STORE_OFFSET(curr - matchIndex));
|
(U32)matchLength, curr - matchIndex, OFFSET_TO_OFFBASE(curr - matchIndex));
|
||||||
assert(matchEndIdx > matchIndex);
|
assert(matchEndIdx > matchIndex);
|
||||||
if (matchLength > matchEndIdx - matchIndex)
|
if (matchLength > matchEndIdx - matchIndex)
|
||||||
matchEndIdx = matchIndex + (U32)matchLength;
|
matchEndIdx = matchIndex + (U32)matchLength;
|
||||||
bestLength = matchLength;
|
bestLength = matchLength;
|
||||||
matches[mnum].off = STORE_OFFSET(curr - matchIndex);
|
matches[mnum].off = OFFSET_TO_OFFBASE(curr - matchIndex);
|
||||||
matches[mnum].len = (U32)matchLength;
|
matches[mnum].len = (U32)matchLength;
|
||||||
mnum++;
|
mnum++;
|
||||||
if ( (matchLength > ZSTD_OPT_NUM)
|
if ( (matchLength > ZSTD_OPT_NUM)
|
||||||
@@ -755,12 +790,12 @@ U32 ZSTD_insertBtAndGetAllMatches (
|
|||||||
|
|
||||||
if (matchLength > bestLength) {
|
if (matchLength > bestLength) {
|
||||||
matchIndex = dictMatchIndex + dmsIndexDelta;
|
matchIndex = dictMatchIndex + dmsIndexDelta;
|
||||||
DEBUGLOG(8, "found dms match of length %u at distance %u (offCode=%u)",
|
DEBUGLOG(8, "found dms match of length %u at distance %u (offBase=%u)",
|
||||||
(U32)matchLength, curr - matchIndex, STORE_OFFSET(curr - matchIndex));
|
(U32)matchLength, curr - matchIndex, OFFSET_TO_OFFBASE(curr - matchIndex));
|
||||||
if (matchLength > matchEndIdx - matchIndex)
|
if (matchLength > matchEndIdx - matchIndex)
|
||||||
matchEndIdx = matchIndex + (U32)matchLength;
|
matchEndIdx = matchIndex + (U32)matchLength;
|
||||||
bestLength = matchLength;
|
bestLength = matchLength;
|
||||||
matches[mnum].off = STORE_OFFSET(curr - matchIndex);
|
matches[mnum].off = OFFSET_TO_OFFBASE(curr - matchIndex);
|
||||||
matches[mnum].len = (U32)matchLength;
|
matches[mnum].len = (U32)matchLength;
|
||||||
mnum++;
|
mnum++;
|
||||||
if ( (matchLength > ZSTD_OPT_NUM)
|
if ( (matchLength > ZSTD_OPT_NUM)
|
||||||
@@ -793,7 +828,9 @@ typedef U32 (*ZSTD_getAllMatchesFn)(
|
|||||||
U32 const ll0,
|
U32 const ll0,
|
||||||
U32 const lengthToBeat);
|
U32 const lengthToBeat);
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE U32 ZSTD_btGetAllMatches_internal(
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
U32 ZSTD_btGetAllMatches_internal(
|
||||||
ZSTD_match_t* matches,
|
ZSTD_match_t* matches,
|
||||||
ZSTD_matchState_t* ms,
|
ZSTD_matchState_t* ms,
|
||||||
U32* nextToUpdate3,
|
U32* nextToUpdate3,
|
||||||
@@ -961,7 +998,7 @@ static void ZSTD_optLdm_maybeAddMatch(ZSTD_match_t* matches, U32* nbMatches,
|
|||||||
const ZSTD_optLdm_t* optLdm, U32 currPosInBlock)
|
const ZSTD_optLdm_t* optLdm, U32 currPosInBlock)
|
||||||
{
|
{
|
||||||
U32 const posDiff = currPosInBlock - optLdm->startPosInBlock;
|
U32 const posDiff = currPosInBlock - optLdm->startPosInBlock;
|
||||||
/* Note: ZSTD_match_t actually contains offCode and matchLength (before subtracting MINMATCH) */
|
/* Note: ZSTD_match_t actually contains offBase and matchLength (before subtracting MINMATCH) */
|
||||||
U32 const candidateMatchLength = optLdm->endPosInBlock - optLdm->startPosInBlock - posDiff;
|
U32 const candidateMatchLength = optLdm->endPosInBlock - optLdm->startPosInBlock - posDiff;
|
||||||
|
|
||||||
/* Ensure that current block position is not outside of the match */
|
/* Ensure that current block position is not outside of the match */
|
||||||
@@ -972,11 +1009,11 @@ static void ZSTD_optLdm_maybeAddMatch(ZSTD_match_t* matches, U32* nbMatches,
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (*nbMatches == 0 || ((candidateMatchLength > matches[*nbMatches-1].len) && *nbMatches < ZSTD_OPT_NUM)) {
|
if (*nbMatches == 0 || ((candidateMatchLength > matches[*nbMatches-1].len) && *nbMatches < ZSTD_OPT_NUM)) {
|
||||||
U32 const candidateOffCode = STORE_OFFSET(optLdm->offset);
|
U32 const candidateOffBase = OFFSET_TO_OFFBASE(optLdm->offset);
|
||||||
DEBUGLOG(6, "ZSTD_optLdm_maybeAddMatch(): Adding ldm candidate match (offCode: %u matchLength %u) at block position=%u",
|
DEBUGLOG(6, "ZSTD_optLdm_maybeAddMatch(): Adding ldm candidate match (offBase: %u matchLength %u) at block position=%u",
|
||||||
candidateOffCode, candidateMatchLength, currPosInBlock);
|
candidateOffBase, candidateMatchLength, currPosInBlock);
|
||||||
matches[*nbMatches].len = candidateMatchLength;
|
matches[*nbMatches].len = candidateMatchLength;
|
||||||
matches[*nbMatches].off = candidateOffCode;
|
matches[*nbMatches].off = candidateOffBase;
|
||||||
(*nbMatches)++;
|
(*nbMatches)++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1012,11 +1049,6 @@ ZSTD_optLdm_processMatchCandidate(ZSTD_optLdm_t* optLdm,
|
|||||||
* Optimal parser
|
* Optimal parser
|
||||||
*********************************/
|
*********************************/
|
||||||
|
|
||||||
static U32 ZSTD_totalLen(ZSTD_optimal_t sol)
|
|
||||||
{
|
|
||||||
return sol.litlen + sol.mlen;
|
|
||||||
}
|
|
||||||
|
|
||||||
#if 0 /* debug */
|
#if 0 /* debug */
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -1034,7 +1066,13 @@ listStats(const U32* table, int lastEltID)
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
FORCE_INLINE_TEMPLATE size_t
|
#define LIT_PRICE(_p) (int)ZSTD_rawLiteralsCost(_p, 1, optStatePtr, optLevel)
|
||||||
|
#define LL_PRICE(_l) (int)ZSTD_litLengthPrice(_l, optStatePtr, optLevel)
|
||||||
|
#define LL_INCPRICE(_l) (LL_PRICE(_l) - LL_PRICE(_l-1))
|
||||||
|
|
||||||
|
FORCE_INLINE_TEMPLATE
|
||||||
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
|
size_t
|
||||||
ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
||||||
seqStore_t* seqStore,
|
seqStore_t* seqStore,
|
||||||
U32 rep[ZSTD_REP_NUM],
|
U32 rep[ZSTD_REP_NUM],
|
||||||
@@ -1060,9 +1098,11 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
|
|
||||||
ZSTD_optimal_t* const opt = optStatePtr->priceTable;
|
ZSTD_optimal_t* const opt = optStatePtr->priceTable;
|
||||||
ZSTD_match_t* const matches = optStatePtr->matchTable;
|
ZSTD_match_t* const matches = optStatePtr->matchTable;
|
||||||
ZSTD_optimal_t lastSequence;
|
ZSTD_optimal_t lastStretch;
|
||||||
ZSTD_optLdm_t optLdm;
|
ZSTD_optLdm_t optLdm;
|
||||||
|
|
||||||
|
ZSTD_memset(&lastStretch, 0, sizeof(ZSTD_optimal_t));
|
||||||
|
|
||||||
optLdm.seqStore = ms->ldmSeqStore ? *ms->ldmSeqStore : kNullRawSeqStore;
|
optLdm.seqStore = ms->ldmSeqStore ? *ms->ldmSeqStore : kNullRawSeqStore;
|
||||||
optLdm.endPosInBlock = optLdm.startPosInBlock = optLdm.offset = 0;
|
optLdm.endPosInBlock = optLdm.startPosInBlock = optLdm.offset = 0;
|
||||||
ZSTD_opt_getNextMatchAndUpdateSeqStore(&optLdm, (U32)(ip-istart), (U32)(iend-ip));
|
ZSTD_opt_getNextMatchAndUpdateSeqStore(&optLdm, (U32)(ip-istart), (U32)(iend-ip));
|
||||||
@@ -1083,103 +1123,139 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
U32 const ll0 = !litlen;
|
U32 const ll0 = !litlen;
|
||||||
U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, ip, iend, rep, ll0, minMatch);
|
U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, ip, iend, rep, ll0, minMatch);
|
||||||
ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches,
|
ZSTD_optLdm_processMatchCandidate(&optLdm, matches, &nbMatches,
|
||||||
(U32)(ip-istart), (U32)(iend - ip));
|
(U32)(ip-istart), (U32)(iend-ip));
|
||||||
if (!nbMatches) { ip++; continue; }
|
if (!nbMatches) {
|
||||||
|
DEBUGLOG(8, "no match found at cPos %u", (unsigned)(ip-istart));
|
||||||
|
ip++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Match found: let's store this solution, and eventually find more candidates.
|
||||||
|
* During this forward pass, @opt is used to store stretches,
|
||||||
|
* defined as "a match followed by N literals".
|
||||||
|
* Note how this is different from a Sequence, which is "N literals followed by a match".
|
||||||
|
* Storing stretches allows us to store different match predecessors
|
||||||
|
* for each literal position part of a literals run. */
|
||||||
|
|
||||||
/* initialize opt[0] */
|
/* initialize opt[0] */
|
||||||
{ U32 i ; for (i=0; i<ZSTD_REP_NUM; i++) opt[0].rep[i] = rep[i]; }
|
opt[0].mlen = 0; /* there are only literals so far */
|
||||||
opt[0].mlen = 0; /* means is_a_literal */
|
|
||||||
opt[0].litlen = litlen;
|
opt[0].litlen = litlen;
|
||||||
/* We don't need to include the actual price of the literals because
|
/* No need to include the actual price of the literals before the first match
|
||||||
* it is static for the duration of the forward pass, and is included
|
* because it is static for the duration of the forward pass, and is included
|
||||||
* in every price. We include the literal length to avoid negative
|
* in every subsequent price. But, we include the literal length because
|
||||||
* prices when we subtract the previous literal length.
|
* the cost variation of litlen depends on the value of litlen.
|
||||||
*/
|
*/
|
||||||
opt[0].price = (int)ZSTD_litLengthPrice(litlen, optStatePtr, optLevel);
|
opt[0].price = LL_PRICE(litlen);
|
||||||
|
ZSTD_STATIC_ASSERT(sizeof(opt[0].rep[0]) == sizeof(rep[0]));
|
||||||
|
ZSTD_memcpy(&opt[0].rep, rep, sizeof(opt[0].rep));
|
||||||
|
|
||||||
/* large match -> immediate encoding */
|
/* large match -> immediate encoding */
|
||||||
{ U32 const maxML = matches[nbMatches-1].len;
|
{ U32 const maxML = matches[nbMatches-1].len;
|
||||||
U32 const maxOffcode = matches[nbMatches-1].off;
|
U32 const maxOffBase = matches[nbMatches-1].off;
|
||||||
DEBUGLOG(6, "found %u matches of maxLength=%u and maxOffCode=%u at cPos=%u => start new series",
|
DEBUGLOG(6, "found %u matches of maxLength=%u and maxOffBase=%u at cPos=%u => start new series",
|
||||||
nbMatches, maxML, maxOffcode, (U32)(ip-prefixStart));
|
nbMatches, maxML, maxOffBase, (U32)(ip-prefixStart));
|
||||||
|
|
||||||
if (maxML > sufficient_len) {
|
if (maxML > sufficient_len) {
|
||||||
lastSequence.litlen = litlen;
|
lastStretch.litlen = 0;
|
||||||
lastSequence.mlen = maxML;
|
lastStretch.mlen = maxML;
|
||||||
lastSequence.off = maxOffcode;
|
lastStretch.off = maxOffBase;
|
||||||
DEBUGLOG(6, "large match (%u>%u), immediate encoding",
|
DEBUGLOG(6, "large match (%u>%u) => immediate encoding",
|
||||||
maxML, sufficient_len);
|
maxML, sufficient_len);
|
||||||
cur = 0;
|
cur = 0;
|
||||||
last_pos = ZSTD_totalLen(lastSequence);
|
last_pos = maxML;
|
||||||
goto _shortestPath;
|
goto _shortestPath;
|
||||||
} }
|
} }
|
||||||
|
|
||||||
/* set prices for first matches starting position == 0 */
|
/* set prices for first matches starting position == 0 */
|
||||||
assert(opt[0].price >= 0);
|
assert(opt[0].price >= 0);
|
||||||
{ U32 const literalsPrice = (U32)opt[0].price + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
|
{ U32 pos;
|
||||||
U32 pos;
|
|
||||||
U32 matchNb;
|
U32 matchNb;
|
||||||
for (pos = 1; pos < minMatch; pos++) {
|
for (pos = 1; pos < minMatch; pos++) {
|
||||||
opt[pos].price = ZSTD_MAX_PRICE; /* mlen, litlen and price will be fixed during forward scanning */
|
opt[pos].price = ZSTD_MAX_PRICE;
|
||||||
|
opt[pos].mlen = 0;
|
||||||
|
opt[pos].litlen = litlen + pos;
|
||||||
}
|
}
|
||||||
for (matchNb = 0; matchNb < nbMatches; matchNb++) {
|
for (matchNb = 0; matchNb < nbMatches; matchNb++) {
|
||||||
U32 const offcode = matches[matchNb].off;
|
U32 const offBase = matches[matchNb].off;
|
||||||
U32 const end = matches[matchNb].len;
|
U32 const end = matches[matchNb].len;
|
||||||
for ( ; pos <= end ; pos++ ) {
|
for ( ; pos <= end ; pos++ ) {
|
||||||
U32 const matchPrice = ZSTD_getMatchPrice(offcode, pos, optStatePtr, optLevel);
|
int const matchPrice = (int)ZSTD_getMatchPrice(offBase, pos, optStatePtr, optLevel);
|
||||||
U32 const sequencePrice = literalsPrice + matchPrice;
|
int const sequencePrice = opt[0].price + matchPrice;
|
||||||
DEBUGLOG(7, "rPos:%u => set initial price : %.2f",
|
DEBUGLOG(7, "rPos:%u => set initial price : %.2f",
|
||||||
pos, ZSTD_fCost(sequencePrice));
|
pos, ZSTD_fCost(sequencePrice));
|
||||||
opt[pos].mlen = pos;
|
opt[pos].mlen = pos;
|
||||||
opt[pos].off = offcode;
|
opt[pos].off = offBase;
|
||||||
opt[pos].litlen = litlen;
|
opt[pos].litlen = 0; /* end of match */
|
||||||
opt[pos].price = (int)sequencePrice;
|
opt[pos].price = sequencePrice + LL_PRICE(0);
|
||||||
} }
|
}
|
||||||
|
}
|
||||||
last_pos = pos-1;
|
last_pos = pos-1;
|
||||||
|
opt[pos].price = ZSTD_MAX_PRICE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check further positions */
|
/* check further positions */
|
||||||
for (cur = 1; cur <= last_pos; cur++) {
|
for (cur = 1; cur <= last_pos; cur++) {
|
||||||
const BYTE* const inr = ip + cur;
|
const BYTE* const inr = ip + cur;
|
||||||
assert(cur < ZSTD_OPT_NUM);
|
assert(cur <= ZSTD_OPT_NUM);
|
||||||
DEBUGLOG(7, "cPos:%zi==rPos:%u", inr-istart, cur)
|
DEBUGLOG(7, "cPos:%zi==rPos:%u", inr-istart, cur);
|
||||||
|
|
||||||
/* Fix current position with one literal if cheaper */
|
/* Fix current position with one literal if cheaper */
|
||||||
{ U32 const litlen = (opt[cur-1].mlen == 0) ? opt[cur-1].litlen + 1 : 1;
|
{ U32 const litlen = opt[cur-1].litlen + 1;
|
||||||
int const price = opt[cur-1].price
|
int const price = opt[cur-1].price
|
||||||
+ (int)ZSTD_rawLiteralsCost(ip+cur-1, 1, optStatePtr, optLevel)
|
+ LIT_PRICE(ip+cur-1)
|
||||||
+ (int)ZSTD_litLengthPrice(litlen, optStatePtr, optLevel)
|
+ LL_INCPRICE(litlen);
|
||||||
- (int)ZSTD_litLengthPrice(litlen-1, optStatePtr, optLevel);
|
|
||||||
assert(price < 1000000000); /* overflow check */
|
assert(price < 1000000000); /* overflow check */
|
||||||
if (price <= opt[cur].price) {
|
if (price <= opt[cur].price) {
|
||||||
|
ZSTD_optimal_t const prevMatch = opt[cur];
|
||||||
DEBUGLOG(7, "cPos:%zi==rPos:%u : better price (%.2f<=%.2f) using literal (ll==%u) (hist:%u,%u,%u)",
|
DEBUGLOG(7, "cPos:%zi==rPos:%u : better price (%.2f<=%.2f) using literal (ll==%u) (hist:%u,%u,%u)",
|
||||||
inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price), litlen,
|
inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price), litlen,
|
||||||
opt[cur-1].rep[0], opt[cur-1].rep[1], opt[cur-1].rep[2]);
|
opt[cur-1].rep[0], opt[cur-1].rep[1], opt[cur-1].rep[2]);
|
||||||
opt[cur].mlen = 0;
|
opt[cur] = opt[cur-1];
|
||||||
opt[cur].off = 0;
|
|
||||||
opt[cur].litlen = litlen;
|
opt[cur].litlen = litlen;
|
||||||
opt[cur].price = price;
|
opt[cur].price = price;
|
||||||
|
if ( (optLevel >= 1) /* additional check only for higher modes */
|
||||||
|
&& (prevMatch.litlen == 0) /* replace a match */
|
||||||
|
&& (LL_INCPRICE(1) < 0) /* ll1 is cheaper than ll0 */
|
||||||
|
&& LIKELY(ip + cur < iend)
|
||||||
|
) {
|
||||||
|
/* check next position, in case it would be cheaper */
|
||||||
|
int with1literal = prevMatch.price + LIT_PRICE(ip+cur) + LL_INCPRICE(1);
|
||||||
|
int withMoreLiterals = price + LIT_PRICE(ip+cur) + LL_INCPRICE(litlen+1);
|
||||||
|
DEBUGLOG(7, "then at next rPos %u : match+1lit %.2f vs %ulits %.2f",
|
||||||
|
cur+1, ZSTD_fCost(with1literal), litlen+1, ZSTD_fCost(withMoreLiterals));
|
||||||
|
if ( (with1literal < withMoreLiterals)
|
||||||
|
&& (with1literal < opt[cur+1].price) ) {
|
||||||
|
/* update offset history - before it disappears */
|
||||||
|
U32 const prev = cur - prevMatch.mlen;
|
||||||
|
repcodes_t const newReps = ZSTD_newRep(opt[prev].rep, prevMatch.off, opt[prev].litlen==0);
|
||||||
|
assert(cur >= prevMatch.mlen);
|
||||||
|
DEBUGLOG(7, "==> match+1lit is cheaper (%.2f < %.2f) (hist:%u,%u,%u) !",
|
||||||
|
ZSTD_fCost(with1literal), ZSTD_fCost(withMoreLiterals),
|
||||||
|
newReps.rep[0], newReps.rep[1], newReps.rep[2] );
|
||||||
|
opt[cur+1] = prevMatch; /* mlen & offbase */
|
||||||
|
ZSTD_memcpy(opt[cur+1].rep, &newReps, sizeof(repcodes_t));
|
||||||
|
opt[cur+1].litlen = 1;
|
||||||
|
opt[cur+1].price = with1literal;
|
||||||
|
if (last_pos < cur+1) last_pos = cur+1;
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
DEBUGLOG(7, "cPos:%zi==rPos:%u : literal would cost more (%.2f>%.2f) (hist:%u,%u,%u)",
|
DEBUGLOG(7, "cPos:%zi==rPos:%u : literal would cost more (%.2f>%.2f)",
|
||||||
inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price),
|
inr-istart, cur, ZSTD_fCost(price), ZSTD_fCost(opt[cur].price));
|
||||||
opt[cur].rep[0], opt[cur].rep[1], opt[cur].rep[2]);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set the repcodes of the current position. We must do it here
|
/* Offset history is not updated during match comparison.
|
||||||
* because we rely on the repcodes of the 2nd to last sequence being
|
* Do it here, now that the match is selected and confirmed.
|
||||||
* correct to set the next chunks repcodes during the backward
|
|
||||||
* traversal.
|
|
||||||
*/
|
*/
|
||||||
ZSTD_STATIC_ASSERT(sizeof(opt[cur].rep) == sizeof(repcodes_t));
|
ZSTD_STATIC_ASSERT(sizeof(opt[cur].rep) == sizeof(repcodes_t));
|
||||||
assert(cur >= opt[cur].mlen);
|
assert(cur >= opt[cur].mlen);
|
||||||
if (opt[cur].mlen != 0) {
|
if (opt[cur].litlen == 0) {
|
||||||
|
/* just finished a match => alter offset history */
|
||||||
U32 const prev = cur - opt[cur].mlen;
|
U32 const prev = cur - opt[cur].mlen;
|
||||||
repcodes_t const newReps = ZSTD_newRep(opt[prev].rep, opt[cur].off, opt[cur].litlen==0);
|
repcodes_t const newReps = ZSTD_newRep(opt[prev].rep, opt[cur].off, opt[prev].litlen==0);
|
||||||
ZSTD_memcpy(opt[cur].rep, &newReps, sizeof(repcodes_t));
|
ZSTD_memcpy(opt[cur].rep, &newReps, sizeof(repcodes_t));
|
||||||
} else {
|
|
||||||
ZSTD_memcpy(opt[cur].rep, opt[cur - 1].rep, sizeof(repcodes_t));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* last match must start at a minimum distance of 8 from oend */
|
/* last match must start at a minimum distance of 8 from oend */
|
||||||
@@ -1189,15 +1265,14 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
|
|
||||||
if ( (optLevel==0) /*static_test*/
|
if ( (optLevel==0) /*static_test*/
|
||||||
&& (opt[cur+1].price <= opt[cur].price + (BITCOST_MULTIPLIER/2)) ) {
|
&& (opt[cur+1].price <= opt[cur].price + (BITCOST_MULTIPLIER/2)) ) {
|
||||||
DEBUGLOG(7, "move to next rPos:%u : price is <=", cur+1);
|
DEBUGLOG(7, "skip current position : next rPos(%u) price is cheaper", cur+1);
|
||||||
continue; /* skip unpromising positions; about ~+6% speed, -0.01 ratio */
|
continue; /* skip unpromising positions; about ~+6% speed, -0.01 ratio */
|
||||||
}
|
}
|
||||||
|
|
||||||
assert(opt[cur].price >= 0);
|
assert(opt[cur].price >= 0);
|
||||||
{ U32 const ll0 = (opt[cur].mlen != 0);
|
{ U32 const ll0 = (opt[cur].litlen == 0);
|
||||||
U32 const litlen = (opt[cur].mlen == 0) ? opt[cur].litlen : 0;
|
int const previousPrice = opt[cur].price;
|
||||||
U32 const previousPrice = (U32)opt[cur].price;
|
int const basePrice = previousPrice + LL_PRICE(0);
|
||||||
U32 const basePrice = previousPrice + ZSTD_litLengthPrice(0, optStatePtr, optLevel);
|
|
||||||
U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, inr, iend, opt[cur].rep, ll0, minMatch);
|
U32 nbMatches = getAllMatches(matches, ms, &nextToUpdate3, inr, iend, opt[cur].rep, ll0, minMatch);
|
||||||
U32 matchNb;
|
U32 matchNb;
|
||||||
|
|
||||||
@@ -1209,18 +1284,17 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
{ U32 const maxML = matches[nbMatches-1].len;
|
{ U32 const longestML = matches[nbMatches-1].len;
|
||||||
DEBUGLOG(7, "cPos:%zi==rPos:%u, found %u matches, of maxLength=%u",
|
DEBUGLOG(7, "cPos:%zi==rPos:%u, found %u matches, of longest ML=%u",
|
||||||
inr-istart, cur, nbMatches, maxML);
|
inr-istart, cur, nbMatches, longestML);
|
||||||
|
|
||||||
if ( (maxML > sufficient_len)
|
if ( (longestML > sufficient_len)
|
||||||
|| (cur + maxML >= ZSTD_OPT_NUM) ) {
|
|| (cur + longestML >= ZSTD_OPT_NUM)
|
||||||
lastSequence.mlen = maxML;
|
|| (ip + cur + longestML >= iend) ) {
|
||||||
lastSequence.off = matches[nbMatches-1].off;
|
lastStretch.mlen = longestML;
|
||||||
lastSequence.litlen = litlen;
|
lastStretch.off = matches[nbMatches-1].off;
|
||||||
cur -= (opt[cur].mlen==0) ? opt[cur].litlen : 0; /* last sequence is actually only literals, fix cur to last match - note : may underflow, in which case, it's first sequence, and it's okay */
|
lastStretch.litlen = 0;
|
||||||
last_pos = cur + ZSTD_totalLen(lastSequence);
|
last_pos = cur + longestML;
|
||||||
if (cur > ZSTD_OPT_NUM) cur = 0; /* underflow => first match */
|
|
||||||
goto _shortestPath;
|
goto _shortestPath;
|
||||||
} }
|
} }
|
||||||
|
|
||||||
@@ -1231,20 +1305,25 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
U32 const startML = (matchNb>0) ? matches[matchNb-1].len+1 : minMatch;
|
U32 const startML = (matchNb>0) ? matches[matchNb-1].len+1 : minMatch;
|
||||||
U32 mlen;
|
U32 mlen;
|
||||||
|
|
||||||
DEBUGLOG(7, "testing match %u => offCode=%4u, mlen=%2u, llen=%2u",
|
DEBUGLOG(7, "testing match %u => offBase=%4u, mlen=%2u, llen=%2u",
|
||||||
matchNb, matches[matchNb].off, lastML, litlen);
|
matchNb, matches[matchNb].off, lastML, opt[cur].litlen);
|
||||||
|
|
||||||
for (mlen = lastML; mlen >= startML; mlen--) { /* scan downward */
|
for (mlen = lastML; mlen >= startML; mlen--) { /* scan downward */
|
||||||
U32 const pos = cur + mlen;
|
U32 const pos = cur + mlen;
|
||||||
int const price = (int)basePrice + (int)ZSTD_getMatchPrice(offset, mlen, optStatePtr, optLevel);
|
int const price = basePrice + (int)ZSTD_getMatchPrice(offset, mlen, optStatePtr, optLevel);
|
||||||
|
|
||||||
if ((pos > last_pos) || (price < opt[pos].price)) {
|
if ((pos > last_pos) || (price < opt[pos].price)) {
|
||||||
DEBUGLOG(7, "rPos:%u (ml=%2u) => new better price (%.2f<%.2f)",
|
DEBUGLOG(7, "rPos:%u (ml=%2u) => new better price (%.2f<%.2f)",
|
||||||
pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
|
pos, mlen, ZSTD_fCost(price), ZSTD_fCost(opt[pos].price));
|
||||||
while (last_pos < pos) { opt[last_pos+1].price = ZSTD_MAX_PRICE; last_pos++; } /* fill empty positions */
|
while (last_pos < pos) {
|
||||||
|
/* fill empty positions, for future comparisons */
|
||||||
|
last_pos++;
|
||||||
|
opt[last_pos].price = ZSTD_MAX_PRICE;
|
||||||
|
opt[last_pos].litlen = !0; /* just needs to be != 0, to mean "not an end of match" */
|
||||||
|
}
|
||||||
opt[pos].mlen = mlen;
|
opt[pos].mlen = mlen;
|
||||||
opt[pos].off = offset;
|
opt[pos].off = offset;
|
||||||
opt[pos].litlen = litlen;
|
opt[pos].litlen = 0;
|
||||||
opt[pos].price = price;
|
opt[pos].price = price;
|
||||||
} else {
|
} else {
|
||||||
DEBUGLOG(7, "rPos:%u (ml=%2u) => new price is worse (%.2f>=%.2f)",
|
DEBUGLOG(7, "rPos:%u (ml=%2u) => new price is worse (%.2f>=%.2f)",
|
||||||
@@ -1252,52 +1331,86 @@ ZSTD_compressBlock_opt_generic(ZSTD_matchState_t* ms,
|
|||||||
if (optLevel==0) break; /* early update abort; gets ~+10% speed for about -0.01 ratio loss */
|
if (optLevel==0) break; /* early update abort; gets ~+10% speed for about -0.01 ratio loss */
|
||||||
}
|
}
|
||||||
} } }
|
} } }
|
||||||
|
opt[last_pos+1].price = ZSTD_MAX_PRICE;
|
||||||
} /* for (cur = 1; cur <= last_pos; cur++) */
|
} /* for (cur = 1; cur <= last_pos; cur++) */
|
||||||
|
|
||||||
lastSequence = opt[last_pos];
|
lastStretch = opt[last_pos];
|
||||||
cur = last_pos > ZSTD_totalLen(lastSequence) ? last_pos - ZSTD_totalLen(lastSequence) : 0; /* single sequence, and it starts before `ip` */
|
assert(cur >= lastStretch.mlen);
|
||||||
assert(cur < ZSTD_OPT_NUM); /* control overflow*/
|
cur = last_pos - lastStretch.mlen;
|
||||||
|
|
||||||
_shortestPath: /* cur, last_pos, best_mlen, best_off have to be set */
|
_shortestPath: /* cur, last_pos, best_mlen, best_off have to be set */
|
||||||
assert(opt[0].mlen == 0);
|
assert(opt[0].mlen == 0);
|
||||||
|
assert(last_pos >= lastStretch.mlen);
|
||||||
|
assert(cur == last_pos - lastStretch.mlen);
|
||||||
|
|
||||||
/* Set the next chunk's repcodes based on the repcodes of the beginning
|
if (lastStretch.mlen==0) {
|
||||||
* of the last match, and the last sequence. This avoids us having to
|
/* no solution : all matches have been converted into literals */
|
||||||
* update them while traversing the sequences.
|
assert(lastStretch.litlen == (ip - anchor) + last_pos);
|
||||||
*/
|
ip += last_pos;
|
||||||
if (lastSequence.mlen != 0) {
|
continue;
|
||||||
repcodes_t const reps = ZSTD_newRep(opt[cur].rep, lastSequence.off, lastSequence.litlen==0);
|
}
|
||||||
ZSTD_memcpy(rep, &reps, sizeof(reps));
|
assert(lastStretch.off > 0);
|
||||||
|
|
||||||
|
/* Update offset history */
|
||||||
|
if (lastStretch.litlen == 0) {
|
||||||
|
/* finishing on a match : update offset history */
|
||||||
|
repcodes_t const reps = ZSTD_newRep(opt[cur].rep, lastStretch.off, opt[cur].litlen==0);
|
||||||
|
ZSTD_memcpy(rep, &reps, sizeof(repcodes_t));
|
||||||
} else {
|
} else {
|
||||||
ZSTD_memcpy(rep, opt[cur].rep, sizeof(repcodes_t));
|
ZSTD_memcpy(rep, lastStretch.rep, sizeof(repcodes_t));
|
||||||
|
assert(cur >= lastStretch.litlen);
|
||||||
|
cur -= lastStretch.litlen;
|
||||||
}
|
}
|
||||||
|
|
||||||
{ U32 const storeEnd = cur + 1;
|
/* Let's write the shortest path solution.
|
||||||
|
* It is stored in @opt in reverse order,
|
||||||
|
* starting from @storeEnd (==cur+2),
|
||||||
|
* effectively partially @opt overwriting.
|
||||||
|
* Content is changed too:
|
||||||
|
* - So far, @opt stored stretches, aka a match followed by literals
|
||||||
|
* - Now, it will store sequences, aka literals followed by a match
|
||||||
|
*/
|
||||||
|
{ U32 const storeEnd = cur + 2;
|
||||||
U32 storeStart = storeEnd;
|
U32 storeStart = storeEnd;
|
||||||
U32 seqPos = cur;
|
U32 stretchPos = cur;
|
||||||
|
|
||||||
DEBUGLOG(6, "start reverse traversal (last_pos:%u, cur:%u)",
|
DEBUGLOG(6, "start reverse traversal (last_pos:%u, cur:%u)",
|
||||||
last_pos, cur); (void)last_pos;
|
last_pos, cur); (void)last_pos;
|
||||||
assert(storeEnd < ZSTD_OPT_NUM);
|
assert(storeEnd < ZSTD_OPT_SIZE);
|
||||||
DEBUGLOG(6, "last sequence copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
|
DEBUGLOG(6, "last stretch copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
|
||||||
storeEnd, lastSequence.litlen, lastSequence.mlen, lastSequence.off);
|
storeEnd, lastStretch.litlen, lastStretch.mlen, lastStretch.off);
|
||||||
opt[storeEnd] = lastSequence;
|
if (lastStretch.litlen > 0) {
|
||||||
while (seqPos > 0) {
|
/* last "sequence" is unfinished: just a bunch of literals */
|
||||||
U32 const backDist = ZSTD_totalLen(opt[seqPos]);
|
opt[storeEnd].litlen = lastStretch.litlen;
|
||||||
|
opt[storeEnd].mlen = 0;
|
||||||
|
storeStart = storeEnd-1;
|
||||||
|
opt[storeStart] = lastStretch;
|
||||||
|
} {
|
||||||
|
opt[storeEnd] = lastStretch; /* note: litlen will be fixed */
|
||||||
|
storeStart = storeEnd;
|
||||||
|
}
|
||||||
|
while (1) {
|
||||||
|
ZSTD_optimal_t nextStretch = opt[stretchPos];
|
||||||
|
opt[storeStart].litlen = nextStretch.litlen;
|
||||||
|
DEBUGLOG(6, "selected sequence (llen=%u,mlen=%u,ofc=%u)",
|
||||||
|
opt[storeStart].litlen, opt[storeStart].mlen, opt[storeStart].off);
|
||||||
|
if (nextStretch.mlen == 0) {
|
||||||
|
/* reaching beginning of segment */
|
||||||
|
break;
|
||||||
|
}
|
||||||
storeStart--;
|
storeStart--;
|
||||||
DEBUGLOG(6, "sequence from rPos=%u copied into pos=%u (llen=%u,mlen=%u,ofc=%u)",
|
opt[storeStart] = nextStretch; /* note: litlen will be fixed */
|
||||||
seqPos, storeStart, opt[seqPos].litlen, opt[seqPos].mlen, opt[seqPos].off);
|
assert(nextStretch.litlen + nextStretch.mlen <= stretchPos);
|
||||||
opt[storeStart] = opt[seqPos];
|
stretchPos -= nextStretch.litlen + nextStretch.mlen;
|
||||||
seqPos = (seqPos > backDist) ? seqPos - backDist : 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* save sequences */
|
/* save sequences */
|
||||||
DEBUGLOG(6, "sending selected sequences into seqStore")
|
DEBUGLOG(6, "sending selected sequences into seqStore");
|
||||||
{ U32 storePos;
|
{ U32 storePos;
|
||||||
for (storePos=storeStart; storePos <= storeEnd; storePos++) {
|
for (storePos=storeStart; storePos <= storeEnd; storePos++) {
|
||||||
U32 const llen = opt[storePos].litlen;
|
U32 const llen = opt[storePos].litlen;
|
||||||
U32 const mlen = opt[storePos].mlen;
|
U32 const mlen = opt[storePos].mlen;
|
||||||
U32 const offCode = opt[storePos].off;
|
U32 const offBase = opt[storePos].off;
|
||||||
U32 const advance = llen + mlen;
|
U32 const advance = llen + mlen;
|
||||||
DEBUGLOG(6, "considering seq starting at %zi, llen=%u, mlen=%u",
|
DEBUGLOG(6, "considering seq starting at %zi, llen=%u, mlen=%u",
|
||||||
anchor - istart, (unsigned)llen, (unsigned)mlen);
|
anchor - istart, (unsigned)llen, (unsigned)mlen);
|
||||||
@@ -1309,11 +1422,14 @@ _shortestPath: /* cur, last_pos, best_mlen, best_off have to be set */
|
|||||||
}
|
}
|
||||||
|
|
||||||
assert(anchor + llen <= iend);
|
assert(anchor + llen <= iend);
|
||||||
ZSTD_updateStats(optStatePtr, llen, anchor, offCode, mlen);
|
ZSTD_updateStats(optStatePtr, llen, anchor, offBase, mlen);
|
||||||
ZSTD_storeSeq(seqStore, llen, anchor, iend, offCode, mlen);
|
ZSTD_storeSeq(seqStore, llen, anchor, iend, offBase, mlen);
|
||||||
anchor += advance;
|
anchor += advance;
|
||||||
ip = anchor;
|
ip = anchor;
|
||||||
} }
|
} }
|
||||||
|
DEBUGLOG(7, "new offset history : %u, %u, %u", rep[0], rep[1], rep[2]);
|
||||||
|
|
||||||
|
/* update all costs */
|
||||||
ZSTD_setBasePrices(optStatePtr, optLevel);
|
ZSTD_setBasePrices(optStatePtr, optLevel);
|
||||||
}
|
}
|
||||||
} /* while (ip < ilimit) */
|
} /* while (ip < ilimit) */
|
||||||
@@ -1321,21 +1437,27 @@ _shortestPath: /* cur, last_pos, best_mlen, best_off have to be set */
|
|||||||
/* Return the last literals size */
|
/* Return the last literals size */
|
||||||
return (size_t)(iend - anchor);
|
return (size_t)(iend - anchor);
|
||||||
}
|
}
|
||||||
|
#endif /* build exclusions */
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR
|
||||||
static size_t ZSTD_compressBlock_opt0(
|
static size_t ZSTD_compressBlock_opt0(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode)
|
const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode)
|
||||||
{
|
{
|
||||||
return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /* optLevel */, dictMode);
|
return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 0 /* optLevel */, dictMode);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR
|
||||||
static size_t ZSTD_compressBlock_opt2(
|
static size_t ZSTD_compressBlock_opt2(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode)
|
const void* src, size_t srcSize, const ZSTD_dictMode_e dictMode)
|
||||||
{
|
{
|
||||||
return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /* optLevel */, dictMode);
|
return ZSTD_compressBlock_opt_generic(ms, seqStore, rep, src, srcSize, 2 /* optLevel */, dictMode);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR
|
||||||
size_t ZSTD_compressBlock_btopt(
|
size_t ZSTD_compressBlock_btopt(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
const void* src, size_t srcSize)
|
const void* src, size_t srcSize)
|
||||||
@@ -1343,20 +1465,23 @@ size_t ZSTD_compressBlock_btopt(
|
|||||||
DEBUGLOG(5, "ZSTD_compressBlock_btopt");
|
DEBUGLOG(5, "ZSTD_compressBlock_btopt");
|
||||||
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_noDict);
|
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_noDict);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR
|
||||||
/* ZSTD_initStats_ultra():
|
/* ZSTD_initStats_ultra():
|
||||||
* make a first compression pass, just to seed stats with more accurate starting values.
|
* make a first compression pass, just to seed stats with more accurate starting values.
|
||||||
* only works on first block, with no dictionary and no ldm.
|
* only works on first block, with no dictionary and no ldm.
|
||||||
* this function cannot error, hence its contract must be respected.
|
* this function cannot error out, its narrow contract must be respected.
|
||||||
*/
|
*/
|
||||||
static void
|
static
|
||||||
ZSTD_initStats_ultra(ZSTD_matchState_t* ms,
|
ZSTD_ALLOW_POINTER_OVERFLOW_ATTR
|
||||||
seqStore_t* seqStore,
|
void ZSTD_initStats_ultra(ZSTD_matchState_t* ms,
|
||||||
U32 rep[ZSTD_REP_NUM],
|
seqStore_t* seqStore,
|
||||||
const void* src, size_t srcSize)
|
U32 rep[ZSTD_REP_NUM],
|
||||||
|
const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
U32 tmpRep[ZSTD_REP_NUM]; /* updated rep codes will sink here */
|
U32 tmpRep[ZSTD_REP_NUM]; /* updated rep codes will sink here */
|
||||||
ZSTD_memcpy(tmpRep, rep, sizeof(tmpRep));
|
ZSTD_memcpy(tmpRep, rep, sizeof(tmpRep));
|
||||||
@@ -1369,7 +1494,7 @@ ZSTD_initStats_ultra(ZSTD_matchState_t* ms,
|
|||||||
|
|
||||||
ZSTD_compressBlock_opt2(ms, seqStore, tmpRep, src, srcSize, ZSTD_noDict); /* generate stats into ms->opt*/
|
ZSTD_compressBlock_opt2(ms, seqStore, tmpRep, src, srcSize, ZSTD_noDict); /* generate stats into ms->opt*/
|
||||||
|
|
||||||
/* invalidate first scan from history */
|
/* invalidate first scan from history, only keep entropy stats */
|
||||||
ZSTD_resetSeqStore(seqStore);
|
ZSTD_resetSeqStore(seqStore);
|
||||||
ms->window.base -= srcSize;
|
ms->window.base -= srcSize;
|
||||||
ms->window.dictLimit += (U32)srcSize;
|
ms->window.dictLimit += (U32)srcSize;
|
||||||
@@ -1393,10 +1518,10 @@ size_t ZSTD_compressBlock_btultra2(
|
|||||||
U32 const curr = (U32)((const BYTE*)src - ms->window.base);
|
U32 const curr = (U32)((const BYTE*)src - ms->window.base);
|
||||||
DEBUGLOG(5, "ZSTD_compressBlock_btultra2 (srcSize=%zu)", srcSize);
|
DEBUGLOG(5, "ZSTD_compressBlock_btultra2 (srcSize=%zu)", srcSize);
|
||||||
|
|
||||||
/* 2-pass strategy:
|
/* 2-passes strategy:
|
||||||
* this strategy makes a first pass over first block to collect statistics
|
* this strategy makes a first pass over first block to collect statistics
|
||||||
* and seed next round's statistics with it.
|
* in order to seed next round's statistics with it.
|
||||||
* After 1st pass, function forgets everything, and starts a new block.
|
* After 1st pass, function forgets history, and starts a new block.
|
||||||
* Consequently, this can only work if no data has been previously loaded in tables,
|
* Consequently, this can only work if no data has been previously loaded in tables,
|
||||||
* aka, no dictionary, no prefix, no ldm preprocessing.
|
* aka, no dictionary, no prefix, no ldm preprocessing.
|
||||||
* The compression ratio gain is generally small (~0.5% on first block),
|
* The compression ratio gain is generally small (~0.5% on first block),
|
||||||
@@ -1405,15 +1530,17 @@ size_t ZSTD_compressBlock_btultra2(
|
|||||||
if ( (ms->opt.litLengthSum==0) /* first block */
|
if ( (ms->opt.litLengthSum==0) /* first block */
|
||||||
&& (seqStore->sequences == seqStore->sequencesStart) /* no ldm */
|
&& (seqStore->sequences == seqStore->sequencesStart) /* no ldm */
|
||||||
&& (ms->window.dictLimit == ms->window.lowLimit) /* no dictionary */
|
&& (ms->window.dictLimit == ms->window.lowLimit) /* no dictionary */
|
||||||
&& (curr == ms->window.dictLimit) /* start of frame, nothing already loaded nor skipped */
|
&& (curr == ms->window.dictLimit) /* start of frame, nothing already loaded nor skipped */
|
||||||
&& (srcSize > ZSTD_PREDEF_THRESHOLD)
|
&& (srcSize > ZSTD_PREDEF_THRESHOLD) /* input large enough to not employ default stats */
|
||||||
) {
|
) {
|
||||||
ZSTD_initStats_ultra(ms, seqStore, rep, src, srcSize);
|
ZSTD_initStats_ultra(ms, seqStore, rep, src, srcSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_noDict);
|
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_noDict);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR
|
||||||
size_t ZSTD_compressBlock_btopt_dictMatchState(
|
size_t ZSTD_compressBlock_btopt_dictMatchState(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
const void* src, size_t srcSize)
|
const void* src, size_t srcSize)
|
||||||
@@ -1421,19 +1548,21 @@ size_t ZSTD_compressBlock_btopt_dictMatchState(
|
|||||||
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState);
|
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btultra_dictMatchState(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
const void* src, size_t srcSize)
|
|
||||||
{
|
|
||||||
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState);
|
|
||||||
}
|
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btopt_extDict(
|
size_t ZSTD_compressBlock_btopt_extDict(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
const void* src, size_t srcSize)
|
const void* src, size_t srcSize)
|
||||||
{
|
{
|
||||||
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_extDict);
|
return ZSTD_compressBlock_opt0(ms, seqStore, rep, src, srcSize, ZSTD_extDict);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR
|
||||||
|
size_t ZSTD_compressBlock_btultra_dictMatchState(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
const void* src, size_t srcSize)
|
||||||
|
{
|
||||||
|
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_dictMatchState);
|
||||||
|
}
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btultra_extDict(
|
size_t ZSTD_compressBlock_btultra_extDict(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
@@ -1441,6 +1570,7 @@ size_t ZSTD_compressBlock_btultra_extDict(
|
|||||||
{
|
{
|
||||||
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_extDict);
|
return ZSTD_compressBlock_opt2(ms, seqStore, rep, src, srcSize, ZSTD_extDict);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* note : no btultra2 variant for extDict nor dictMatchState,
|
/* note : no btultra2 variant for extDict nor dictMatchState,
|
||||||
* because btultra2 is not meant to work with dictionaries
|
* because btultra2 is not meant to work with dictionaries
|
||||||
|
|||||||
46
vendor/github.com/DataDog/zstd/zstd_opt.h
generated
vendored
46
vendor/github.com/DataDog/zstd/zstd_opt.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -18,28 +18,38 @@ extern "C" {
|
|||||||
|
|
||||||
#include "zstd_compress_internal.h"
|
#include "zstd_compress_internal.h"
|
||||||
|
|
||||||
|
#if !defined(ZSTD_EXCLUDE_BTLAZY2_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR) \
|
||||||
|
|| !defined(ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR)
|
||||||
/* used in ZSTD_loadDictionaryContent() */
|
/* used in ZSTD_loadDictionaryContent() */
|
||||||
void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend);
|
void ZSTD_updateTree(ZSTD_matchState_t* ms, const BYTE* ip, const BYTE* iend);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTOPT_BLOCK_COMPRESSOR
|
||||||
size_t ZSTD_compressBlock_btopt(
|
size_t ZSTD_compressBlock_btopt(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_btultra(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
size_t ZSTD_compressBlock_btultra2(
|
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
|
||||||
void const* src, size_t srcSize);
|
|
||||||
|
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btopt_dictMatchState(
|
size_t ZSTD_compressBlock_btopt_dictMatchState(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_btultra_dictMatchState(
|
size_t ZSTD_compressBlock_btopt_extDict(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
size_t ZSTD_compressBlock_btopt_extDict(
|
#define ZSTD_COMPRESSBLOCK_BTOPT ZSTD_compressBlock_btopt
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTOPT_DICTMATCHSTATE ZSTD_compressBlock_btopt_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTOPT_EXTDICT ZSTD_compressBlock_btopt_extDict
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTOPT NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTOPT_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTOPT_EXTDICT NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ZSTD_EXCLUDE_BTULTRA_BLOCK_COMPRESSOR
|
||||||
|
size_t ZSTD_compressBlock_btultra(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
size_t ZSTD_compressBlock_btultra_dictMatchState(
|
||||||
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
void const* src, size_t srcSize);
|
void const* src, size_t srcSize);
|
||||||
size_t ZSTD_compressBlock_btultra_extDict(
|
size_t ZSTD_compressBlock_btultra_extDict(
|
||||||
@@ -49,6 +59,20 @@ size_t ZSTD_compressBlock_btultra_extDict(
|
|||||||
/* note : no btultra2 variant for extDict nor dictMatchState,
|
/* note : no btultra2 variant for extDict nor dictMatchState,
|
||||||
* because btultra2 is not meant to work with dictionaries
|
* because btultra2 is not meant to work with dictionaries
|
||||||
* and is only specific for the first block (no prefix) */
|
* and is only specific for the first block (no prefix) */
|
||||||
|
size_t ZSTD_compressBlock_btultra2(
|
||||||
|
ZSTD_matchState_t* ms, seqStore_t* seqStore, U32 rep[ZSTD_REP_NUM],
|
||||||
|
void const* src, size_t srcSize);
|
||||||
|
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA ZSTD_compressBlock_btultra
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE ZSTD_compressBlock_btultra_dictMatchState
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT ZSTD_compressBlock_btultra_extDict
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA2 ZSTD_compressBlock_btultra2
|
||||||
|
#else
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA_DICTMATCHSTATE NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA_EXTDICT NULL
|
||||||
|
#define ZSTD_COMPRESSBLOCK_BTULTRA2 NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
|
|||||||
23
vendor/github.com/DataDog/zstd/zstd_stream.go
generated
vendored
23
vendor/github.com/DataDog/zstd/zstd_stream.go
generated
vendored
@@ -72,6 +72,7 @@ import (
|
|||||||
|
|
||||||
var errShortRead = errors.New("short read")
|
var errShortRead = errors.New("short read")
|
||||||
var errReaderClosed = errors.New("Reader is closed")
|
var errReaderClosed = errors.New("Reader is closed")
|
||||||
|
var ErrNoParallelSupport = errors.New("No parallel support")
|
||||||
|
|
||||||
// Writer is an io.WriteCloser that zstd-compresses its input.
|
// Writer is an io.WriteCloser that zstd-compresses its input.
|
||||||
type Writer struct {
|
type Writer struct {
|
||||||
@@ -302,6 +303,28 @@ func (w *Writer) Close() error {
|
|||||||
return getError(int(C.ZSTD_freeCStream(w.ctx)))
|
return getError(int(C.ZSTD_freeCStream(w.ctx)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Set the number of workers to run the compression in parallel using multiple threads
|
||||||
|
// If > 1, the Write() call will become asynchronous. This means data will be buffered until processed.
|
||||||
|
// If you call Write() too fast, you might incur a memory buffer up to as large as your input.
|
||||||
|
// Consider calling Flush() periodically if you need to compress a very large file that would not fit all in memory.
|
||||||
|
// By default only one worker is used.
|
||||||
|
func (w *Writer) SetNbWorkers(n int) error {
|
||||||
|
if w.firstError != nil {
|
||||||
|
return w.firstError
|
||||||
|
}
|
||||||
|
if err := getError(int(C.ZSTD_CCtx_setParameter(w.ctx, C.ZSTD_c_nbWorkers, C.int(n)))); err != nil {
|
||||||
|
w.firstError = err
|
||||||
|
// First error case, a shared libary is used, and the library was compiled without parallel support
|
||||||
|
if err.Error() == "Unsupported parameter" {
|
||||||
|
return ErrNoParallelSupport
|
||||||
|
} else {
|
||||||
|
// This could happen if a very large number is passed in, and possibly zstd refuse to create as many threads, or the OS fails to do so
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// cSize is the recommended size of reader.compressionBuffer. This func and
|
// cSize is the recommended size of reader.compressionBuffer. This func and
|
||||||
// invocation allow for a one-time check for validity.
|
// invocation allow for a one-time check for validity.
|
||||||
var cSize = func() int {
|
var cSize = func() int {
|
||||||
|
|||||||
6
vendor/github.com/DataDog/zstd/zstd_trace.h
generated
vendored
6
vendor/github.com/DataDog/zstd/zstd_trace.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Facebook, Inc.
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -22,13 +22,13 @@ extern "C" {
|
|||||||
* For now, enable conservatively:
|
* For now, enable conservatively:
|
||||||
* - Only GNUC
|
* - Only GNUC
|
||||||
* - Only ELF
|
* - Only ELF
|
||||||
* - Only x86-64 and i386
|
* - Only x86-64, i386 and aarch64
|
||||||
* Also, explicitly disable on platforms known not to work so they aren't
|
* Also, explicitly disable on platforms known not to work so they aren't
|
||||||
* forgotten in the future.
|
* forgotten in the future.
|
||||||
*/
|
*/
|
||||||
#if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && \
|
#if !defined(ZSTD_HAVE_WEAK_SYMBOLS) && \
|
||||||
defined(__GNUC__) && defined(__ELF__) && \
|
defined(__GNUC__) && defined(__ELF__) && \
|
||||||
(defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) && \
|
(defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86) || defined(__aarch64__)) && \
|
||||||
!defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
|
!defined(__APPLE__) && !defined(_WIN32) && !defined(__MINGW32__) && \
|
||||||
!defined(__CYGWIN__) && !defined(_AIX)
|
!defined(__CYGWIN__) && !defined(_AIX)
|
||||||
# define ZSTD_HAVE_WEAK_SYMBOLS 1
|
# define ZSTD_HAVE_WEAK_SYMBOLS 1
|
||||||
|
|||||||
65
vendor/github.com/DataDog/zstd/zstd_v01.c
generated
vendored
65
vendor/github.com/DataDog/zstd/zstd_v01.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -15,6 +15,7 @@
|
|||||||
******************************************/
|
******************************************/
|
||||||
#include <stddef.h> /* size_t, ptrdiff_t */
|
#include <stddef.h> /* size_t, ptrdiff_t */
|
||||||
#include "zstd_v01.h"
|
#include "zstd_v01.h"
|
||||||
|
#include "compiler.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -191,25 +192,6 @@ typedef signed long long S64;
|
|||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Memory I/O
|
* Memory I/O
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
/* FSE_FORCE_MEMORY_ACCESS
|
|
||||||
* By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
|
|
||||||
* Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
|
|
||||||
* The below switch allow to select different access method for improved performance.
|
|
||||||
* Method 0 (default) : use `memcpy()`. Safe and portable.
|
|
||||||
* Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
|
|
||||||
* This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
|
|
||||||
* Method 2 : direct access. This method is portable but violate C standard.
|
|
||||||
* It can generate buggy code on targets generating assembly depending on alignment.
|
|
||||||
* But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
|
|
||||||
* See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
|
|
||||||
* Prefer these methods in priority order (0 > 1 > 2)
|
|
||||||
*/
|
|
||||||
#ifndef FSE_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
|
||||||
# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
|
|
||||||
# define FSE_FORCE_MEMORY_ACCESS 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
static unsigned FSE_32bits(void)
|
static unsigned FSE_32bits(void)
|
||||||
{
|
{
|
||||||
@@ -222,24 +204,6 @@ static unsigned FSE_isLittleEndian(void)
|
|||||||
return one.c[0];
|
return one.c[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(FSE_FORCE_MEMORY_ACCESS) && (FSE_FORCE_MEMORY_ACCESS==2)
|
|
||||||
|
|
||||||
static U16 FSE_read16(const void* memPtr) { return *(const U16*) memPtr; }
|
|
||||||
static U32 FSE_read32(const void* memPtr) { return *(const U32*) memPtr; }
|
|
||||||
static U64 FSE_read64(const void* memPtr) { return *(const U64*) memPtr; }
|
|
||||||
|
|
||||||
#elif defined(FSE_FORCE_MEMORY_ACCESS) && (FSE_FORCE_MEMORY_ACCESS==1)
|
|
||||||
|
|
||||||
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
|
|
||||||
/* currently only defined for gcc and icc */
|
|
||||||
typedef union { U16 u16; U32 u32; U64 u64; } __attribute__((packed)) unalign;
|
|
||||||
|
|
||||||
static U16 FSE_read16(const void* ptr) { return ((const unalign*)ptr)->u16; }
|
|
||||||
static U32 FSE_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
|
|
||||||
static U64 FSE_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
static U16 FSE_read16(const void* memPtr)
|
static U16 FSE_read16(const void* memPtr)
|
||||||
{
|
{
|
||||||
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
||||||
@@ -255,8 +219,6 @@ static U64 FSE_read64(const void* memPtr)
|
|||||||
U64 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
U64 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* FSE_FORCE_MEMORY_ACCESS */
|
|
||||||
|
|
||||||
static U16 FSE_readLE16(const void* memPtr)
|
static U16 FSE_readLE16(const void* memPtr)
|
||||||
{
|
{
|
||||||
if (FSE_isLittleEndian())
|
if (FSE_isLittleEndian())
|
||||||
@@ -1191,7 +1153,7 @@ static size_t HUF_decompress (void* dst, size_t maxDstSize, const void* cSrc, si
|
|||||||
zstd - standard compression library
|
zstd - standard compression library
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1760,20 +1722,26 @@ static size_t ZSTD_execSequence(BYTE* op,
|
|||||||
static const int dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */
|
static const int dec32table[] = {0, 1, 2, 1, 4, 4, 4, 4}; /* added */
|
||||||
static const int dec64table[] = {8, 8, 8, 7, 8, 9,10,11}; /* subtracted */
|
static const int dec64table[] = {8, 8, 8, 7, 8, 9,10,11}; /* subtracted */
|
||||||
const BYTE* const ostart = op;
|
const BYTE* const ostart = op;
|
||||||
|
BYTE* const oLitEnd = op + sequence.litLength;
|
||||||
const size_t litLength = sequence.litLength;
|
const size_t litLength = sequence.litLength;
|
||||||
BYTE* const endMatch = op + litLength + sequence.matchLength; /* risk : address space overflow (32-bits) */
|
BYTE* const endMatch = op + litLength + sequence.matchLength; /* risk : address space overflow (32-bits) */
|
||||||
const BYTE* const litEnd = *litPtr + litLength;
|
const BYTE* const litEnd = *litPtr + litLength;
|
||||||
|
|
||||||
/* check */
|
/* checks */
|
||||||
|
size_t const seqLength = sequence.litLength + sequence.matchLength;
|
||||||
|
|
||||||
|
if (seqLength > (size_t)(oend - op)) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.litLength > (size_t)(litLimit - *litPtr)) return ERROR(corruption_detected);
|
||||||
|
/* Now we know there are no overflow in literal nor match lengths, can use pointer checks */
|
||||||
|
if (sequence.offset > (U32)(oLitEnd - base)) return ERROR(corruption_detected);
|
||||||
|
|
||||||
if (endMatch > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
if (endMatch > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
||||||
if (litEnd > litLimit) return ERROR(corruption_detected);
|
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
||||||
if (sequence.matchLength > (size_t)(*litPtr-op)) return ERROR(dstSize_tooSmall); /* overwrite literal segment */
|
if (sequence.matchLength > (size_t)(*litPtr-op)) return ERROR(dstSize_tooSmall); /* overwrite literal segment */
|
||||||
|
|
||||||
/* copy Literals */
|
/* copy Literals */
|
||||||
if (((size_t)(*litPtr - op) < 8) || ((size_t)(oend-litEnd) < 8) || (op+litLength > oend-8))
|
ZSTD_memmove(op, *litPtr, sequence.litLength); /* note : v0.1 seems to allow scenarios where output or input are close to end of buffer */
|
||||||
memmove(op, *litPtr, litLength); /* overwrite risk */
|
|
||||||
else
|
|
||||||
ZSTD_wildcopy(op, *litPtr, litLength);
|
|
||||||
op += litLength;
|
op += litLength;
|
||||||
*litPtr = litEnd; /* update for next sequence */
|
*litPtr = litEnd; /* update for next sequence */
|
||||||
|
|
||||||
@@ -2152,6 +2120,7 @@ size_t ZSTDv01_decompressContinue(ZSTDv01_Dctx* dctx, void* dst, size_t maxDstSi
|
|||||||
}
|
}
|
||||||
ctx->phase = 1;
|
ctx->phase = 1;
|
||||||
ctx->expected = ZSTD_blockHeaderSize;
|
ctx->expected = ZSTD_blockHeaderSize;
|
||||||
|
if (ZSTDv01_isError(rSize)) return rSize;
|
||||||
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
||||||
return rSize;
|
return rSize;
|
||||||
}
|
}
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_v01.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_v01.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
105
vendor/github.com/DataDog/zstd/zstd_v02.c
generated
vendored
105
vendor/github.com/DataDog/zstd/zstd_v02.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
#include <stddef.h> /* size_t, ptrdiff_t */
|
#include <stddef.h> /* size_t, ptrdiff_t */
|
||||||
#include "zstd_v02.h"
|
#include "zstd_v02.h"
|
||||||
|
#include "compiler.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -29,7 +30,7 @@
|
|||||||
low-level memory access routines
|
low-level memory access routines
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -72,20 +73,6 @@ extern "C" {
|
|||||||
#include <string.h> /* memcpy */
|
#include <string.h> /* memcpy */
|
||||||
|
|
||||||
|
|
||||||
/******************************************
|
|
||||||
* Compiler-specific
|
|
||||||
******************************************/
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
# define MEM_STATIC static __attribute__((unused))
|
|
||||||
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
|
||||||
# define MEM_STATIC static inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# define MEM_STATIC static __inline
|
|
||||||
#else
|
|
||||||
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Basic Types
|
* Basic Types
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
@@ -116,24 +103,6 @@ extern "C" {
|
|||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Memory I/O
|
* Memory I/O
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
/* MEM_FORCE_MEMORY_ACCESS
|
|
||||||
* By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
|
|
||||||
* Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
|
|
||||||
* The below switch allow to select different access method for improved performance.
|
|
||||||
* Method 0 (default) : use `memcpy()`. Safe and portable.
|
|
||||||
* Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
|
|
||||||
* This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
|
|
||||||
* Method 2 : direct access. This method is portable but violate C standard.
|
|
||||||
* It can generate buggy code on targets generating assembly depending on alignment.
|
|
||||||
* But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
|
|
||||||
* See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
|
|
||||||
* Prefer these methods in priority order (0 > 1 > 2)
|
|
||||||
*/
|
|
||||||
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
|
||||||
# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
|
|
||||||
# define MEM_FORCE_MEMORY_ACCESS 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
||||||
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
||||||
@@ -144,33 +113,6 @@ MEM_STATIC unsigned MEM_isLittleEndian(void)
|
|||||||
return one.c[0];
|
return one.c[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2)
|
|
||||||
|
|
||||||
/* violates C standard on structure alignment.
|
|
||||||
Only use if no other choice to achieve best performance on target platform */
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
|
|
||||||
|
|
||||||
#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
|
|
||||||
|
|
||||||
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
|
|
||||||
/* currently only defined for gcc and icc */
|
|
||||||
typedef union { U16 u16; U32 u32; U64 u64; } __attribute__((packed)) unalign;
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign*)ptr)->u16; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign*)memPtr)->u16 = value; }
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/* default method, safe and standard.
|
|
||||||
can sometimes prove slower */
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
||||||
{
|
{
|
||||||
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
||||||
@@ -191,9 +133,6 @@ MEM_STATIC void MEM_write16(void* memPtr, U16 value)
|
|||||||
memcpy(memPtr, &value, sizeof(value));
|
memcpy(memPtr, &value, sizeof(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MEM_FORCE_MEMORY_ACCESS */
|
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
||||||
{
|
{
|
||||||
if (MEM_isLittleEndian())
|
if (MEM_isLittleEndian())
|
||||||
@@ -270,7 +209,7 @@ MEM_STATIC size_t MEM_readLEST(const void* memPtr)
|
|||||||
header file (to include)
|
header file (to include)
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -434,7 +373,7 @@ MEM_STATIC size_t BIT_lookBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*! BIT_lookBitsFast :
|
/*! BIT_lookBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
||||||
@@ -454,7 +393,7 @@ MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!BIT_readBitsFast :
|
/*!BIT_readBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
||||||
@@ -511,7 +450,7 @@ MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream)
|
|||||||
Error codes and messages
|
Error codes and messages
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -610,7 +549,7 @@ typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be mor
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -754,7 +693,7 @@ MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -823,7 +762,7 @@ static size_t HUF_decompress4X6 (void* dst, size_t dstSize, const void* cSrc, si
|
|||||||
Header File
|
Header File
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -883,7 +822,7 @@ typedef struct ZSTD_CCtx_s ZSTD_CCtx; /* incomplete type */
|
|||||||
Header File for static linking only
|
Header File for static linking only
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -924,7 +863,7 @@ extern "C" {
|
|||||||
* Streaming functions
|
* Streaming functions
|
||||||
***************************************/
|
***************************************/
|
||||||
|
|
||||||
typedef struct ZSTD_DCtx_s ZSTD_DCtx;
|
typedef struct ZSTDv02_Dctx_s ZSTD_DCtx;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Use above functions alternatively.
|
Use above functions alternatively.
|
||||||
@@ -947,7 +886,7 @@ typedef struct ZSTD_DCtx_s ZSTD_DCtx;
|
|||||||
FSE : Finite State Entropy coder
|
FSE : Finite State Entropy coder
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1451,7 +1390,7 @@ static size_t FSE_decompress(void* dst, size_t maxDstSize, const void* cSrc, siz
|
|||||||
Huff0 : Huffman coder, part of New Generation Entropy library
|
Huff0 : Huffman coder, part of New Generation Entropy library
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2610,7 +2549,7 @@ static size_t HUF_decompress (void* dst, size_t dstSize, const void* cSrc, size_
|
|||||||
zstd - standard compression library
|
zstd - standard compression library
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2799,7 +2738,7 @@ static unsigned ZSTD_isError(size_t code) { return ERR_isError(code); }
|
|||||||
/* *************************************************************
|
/* *************************************************************
|
||||||
* Decompression section
|
* Decompression section
|
||||||
***************************************************************/
|
***************************************************************/
|
||||||
struct ZSTD_DCtx_s
|
struct ZSTDv02_Dctx_s
|
||||||
{
|
{
|
||||||
U32 LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)];
|
U32 LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)];
|
||||||
U32 OffTable[FSE_DTABLE_SIZE_U32(OffFSELog)];
|
U32 OffTable[FSE_DTABLE_SIZE_U32(OffFSELog)];
|
||||||
@@ -3115,12 +3054,19 @@ static size_t ZSTD_execSequence(BYTE* op,
|
|||||||
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
||||||
|
|
||||||
/* checks */
|
/* checks */
|
||||||
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of 8 from oend */
|
size_t const seqLength = sequence.litLength + sequence.matchLength;
|
||||||
|
|
||||||
|
if (seqLength > (size_t)(oend - op)) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.litLength > (size_t)(litLimit - *litPtr)) return ERROR(corruption_detected);
|
||||||
|
/* Now we know there are no overflow in literal nor match lengths, can use the pointer check */
|
||||||
|
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.offset > (U32)(oLitEnd - base)) return ERROR(corruption_detected);
|
||||||
|
|
||||||
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
||||||
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
||||||
|
|
||||||
/* copy Literals */
|
/* copy Literals */
|
||||||
ZSTD_wildcopy(op, *litPtr, sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
ZSTD_wildcopy(op, *litPtr, (ptrdiff_t)sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
||||||
op = oLitEnd;
|
op = oLitEnd;
|
||||||
*litPtr = litEnd; /* update for next sequence */
|
*litPtr = litEnd; /* update for next sequence */
|
||||||
|
|
||||||
@@ -3473,6 +3419,7 @@ static size_t ZSTD_decompressContinue(ZSTD_DCtx* ctx, void* dst, size_t maxDstSi
|
|||||||
}
|
}
|
||||||
ctx->phase = 1;
|
ctx->phase = 1;
|
||||||
ctx->expected = ZSTD_blockHeaderSize;
|
ctx->expected = ZSTD_blockHeaderSize;
|
||||||
|
if (ZSTD_isError(rSize)) return rSize;
|
||||||
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
||||||
return rSize;
|
return rSize;
|
||||||
}
|
}
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_v02.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_v02.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
109
vendor/github.com/DataDog/zstd/zstd_v03.c
generated
vendored
109
vendor/github.com/DataDog/zstd/zstd_v03.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
|
|
||||||
#include <stddef.h> /* size_t, ptrdiff_t */
|
#include <stddef.h> /* size_t, ptrdiff_t */
|
||||||
#include "zstd_v03.h"
|
#include "zstd_v03.h"
|
||||||
|
#include "compiler.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -30,7 +31,7 @@
|
|||||||
low-level memory access routines
|
low-level memory access routines
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -73,20 +74,6 @@ extern "C" {
|
|||||||
#include <string.h> /* memcpy */
|
#include <string.h> /* memcpy */
|
||||||
|
|
||||||
|
|
||||||
/******************************************
|
|
||||||
* Compiler-specific
|
|
||||||
******************************************/
|
|
||||||
#if defined(__GNUC__)
|
|
||||||
# define MEM_STATIC static __attribute__((unused))
|
|
||||||
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
|
||||||
# define MEM_STATIC static inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# define MEM_STATIC static __inline
|
|
||||||
#else
|
|
||||||
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Basic Types
|
* Basic Types
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
@@ -117,24 +104,6 @@ extern "C" {
|
|||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Memory I/O
|
* Memory I/O
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
/* MEM_FORCE_MEMORY_ACCESS
|
|
||||||
* By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
|
|
||||||
* Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
|
|
||||||
* The below switch allow to select different access method for improved performance.
|
|
||||||
* Method 0 (default) : use `memcpy()`. Safe and portable.
|
|
||||||
* Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
|
|
||||||
* This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
|
|
||||||
* Method 2 : direct access. This method is portable but violate C standard.
|
|
||||||
* It can generate buggy code on targets generating assembly depending on alignment.
|
|
||||||
* But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
|
|
||||||
* See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
|
|
||||||
* Prefer these methods in priority order (0 > 1 > 2)
|
|
||||||
*/
|
|
||||||
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
|
||||||
# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
|
|
||||||
# define MEM_FORCE_MEMORY_ACCESS 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
||||||
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
||||||
@@ -145,33 +114,6 @@ MEM_STATIC unsigned MEM_isLittleEndian(void)
|
|||||||
return one.c[0];
|
return one.c[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2)
|
|
||||||
|
|
||||||
/* violates C standard on structure alignment.
|
|
||||||
Only use if no other choice to achieve best performance on target platform */
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
|
|
||||||
|
|
||||||
#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
|
|
||||||
|
|
||||||
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
|
|
||||||
/* currently only defined for gcc and icc */
|
|
||||||
typedef union { U16 u16; U32 u32; U64 u64; } __attribute__((packed)) unalign;
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign*)ptr)->u16; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign*)memPtr)->u16 = value; }
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/* default method, safe and standard.
|
|
||||||
can sometimes prove slower */
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
||||||
{
|
{
|
||||||
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
||||||
@@ -192,10 +134,6 @@ MEM_STATIC void MEM_write16(void* memPtr, U16 value)
|
|||||||
memcpy(memPtr, &value, sizeof(value));
|
memcpy(memPtr, &value, sizeof(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif /* MEM_FORCE_MEMORY_ACCESS */
|
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
||||||
{
|
{
|
||||||
if (MEM_isLittleEndian())
|
if (MEM_isLittleEndian())
|
||||||
@@ -272,7 +210,7 @@ MEM_STATIC size_t MEM_readLEST(const void* memPtr)
|
|||||||
header file (to include)
|
header file (to include)
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -436,7 +374,7 @@ MEM_STATIC size_t BIT_lookBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*! BIT_lookBitsFast :
|
/*! BIT_lookBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
||||||
@@ -456,7 +394,7 @@ MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!BIT_readBitsFast :
|
/*!BIT_readBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
||||||
@@ -513,7 +451,7 @@ MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream)
|
|||||||
Error codes and messages
|
Error codes and messages
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -612,7 +550,7 @@ typedef unsigned FSE_DTable; /* don't allocate that. It's just a way to be mor
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -756,7 +694,7 @@ MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -824,7 +762,7 @@ static size_t HUF_decompress4X4 (void* dst, size_t dstSize, const void* cSrc, si
|
|||||||
Header File
|
Header File
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -884,7 +822,7 @@ typedef struct ZSTD_CCtx_s ZSTD_CCtx; /* incomplete type */
|
|||||||
Header File for static linking only
|
Header File for static linking only
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -925,7 +863,7 @@ extern "C" {
|
|||||||
* Streaming functions
|
* Streaming functions
|
||||||
***************************************/
|
***************************************/
|
||||||
|
|
||||||
typedef struct ZSTD_DCtx_s ZSTD_DCtx;
|
typedef struct ZSTDv03_Dctx_s ZSTD_DCtx;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Use above functions alternatively.
|
Use above functions alternatively.
|
||||||
@@ -948,7 +886,7 @@ typedef struct ZSTD_DCtx_s ZSTD_DCtx;
|
|||||||
FSE : Finite State Entropy coder
|
FSE : Finite State Entropy coder
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1452,7 +1390,7 @@ static size_t FSE_decompress(void* dst, size_t maxDstSize, const void* cSrc, siz
|
|||||||
Huff0 : Huffman coder, part of New Generation Entropy library
|
Huff0 : Huffman coder, part of New Generation Entropy library
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2249,7 +2187,7 @@ static size_t HUF_decompress (void* dst, size_t dstSize, const void* cSrc, size_
|
|||||||
zstd - standard compression library
|
zstd - standard compression library
|
||||||
Copyright (C) 2014-2015, Yann Collet.
|
Copyright (C) 2014-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2440,7 +2378,7 @@ static unsigned ZSTD_isError(size_t code) { return ERR_isError(code); }
|
|||||||
/* *************************************************************
|
/* *************************************************************
|
||||||
* Decompression section
|
* Decompression section
|
||||||
***************************************************************/
|
***************************************************************/
|
||||||
struct ZSTD_DCtx_s
|
struct ZSTDv03_Dctx_s
|
||||||
{
|
{
|
||||||
U32 LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)];
|
U32 LLTable[FSE_DTABLE_SIZE_U32(LLFSELog)];
|
||||||
U32 OffTable[FSE_DTABLE_SIZE_U32(OffFSELog)];
|
U32 OffTable[FSE_DTABLE_SIZE_U32(OffFSELog)];
|
||||||
@@ -2756,18 +2694,24 @@ static size_t ZSTD_execSequence(BYTE* op,
|
|||||||
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
||||||
|
|
||||||
/* checks */
|
/* checks */
|
||||||
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of 8 from oend */
|
size_t const seqLength = sequence.litLength + sequence.matchLength;
|
||||||
|
|
||||||
|
if (seqLength > (size_t)(oend - op)) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.litLength > (size_t)(litLimit - *litPtr)) return ERROR(corruption_detected);
|
||||||
|
/* Now we know there are no overflow in literal nor match lengths, can use pointer checks */
|
||||||
|
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.offset > (U32)(oLitEnd - base)) return ERROR(corruption_detected);
|
||||||
|
|
||||||
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
||||||
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
||||||
|
|
||||||
/* copy Literals */
|
/* copy Literals */
|
||||||
ZSTD_wildcopy(op, *litPtr, sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
ZSTD_wildcopy(op, *litPtr, (ptrdiff_t)sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
||||||
op = oLitEnd;
|
op = oLitEnd;
|
||||||
*litPtr = litEnd; /* update for next sequence */
|
*litPtr = litEnd; /* update for next sequence */
|
||||||
|
|
||||||
/* copy Match */
|
/* copy Match */
|
||||||
{
|
{ const BYTE* match = op - sequence.offset;
|
||||||
const BYTE* match = op - sequence.offset;
|
|
||||||
|
|
||||||
/* check */
|
/* check */
|
||||||
if (sequence.offset > (size_t)op) return ERROR(corruption_detected); /* address space overflow test (this test seems kept by clang optimizer) */
|
if (sequence.offset > (size_t)op) return ERROR(corruption_detected); /* address space overflow test (this test seems kept by clang optimizer) */
|
||||||
@@ -3115,6 +3059,7 @@ static size_t ZSTD_decompressContinue(ZSTD_DCtx* ctx, void* dst, size_t maxDstSi
|
|||||||
}
|
}
|
||||||
ctx->phase = 1;
|
ctx->phase = 1;
|
||||||
ctx->expected = ZSTD_blockHeaderSize;
|
ctx->expected = ZSTD_blockHeaderSize;
|
||||||
|
if (ZSTD_isError(rSize)) return rSize;
|
||||||
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
ctx->previousDstEnd = (void*)( ((char*)dst) + rSize);
|
||||||
return rSize;
|
return rSize;
|
||||||
}
|
}
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_v03.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_v03.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
99
vendor/github.com/DataDog/zstd/zstd_v04.c
generated
vendored
99
vendor/github.com/DataDog/zstd/zstd_v04.c
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
#include <string.h> /* memcpy */
|
#include <string.h> /* memcpy */
|
||||||
|
|
||||||
#include "zstd_v04.h"
|
#include "zstd_v04.h"
|
||||||
|
#include "compiler.h"
|
||||||
#include "error_private.h"
|
#include "error_private.h"
|
||||||
|
|
||||||
|
|
||||||
@@ -38,15 +39,6 @@ extern "C" {
|
|||||||
# include <stdlib.h> /* _byteswap_ulong */
|
# include <stdlib.h> /* _byteswap_ulong */
|
||||||
# include <intrin.h> /* _byteswap_* */
|
# include <intrin.h> /* _byteswap_* */
|
||||||
#endif
|
#endif
|
||||||
#if defined(__GNUC__)
|
|
||||||
# define MEM_STATIC static __attribute__((unused))
|
|
||||||
#elif defined (__cplusplus) || (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 */)
|
|
||||||
# define MEM_STATIC static inline
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# define MEM_STATIC static __inline
|
|
||||||
#else
|
|
||||||
# define MEM_STATIC static /* this version may generate warnings for unused static functions; disable the relevant warning */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************
|
/****************************************************************
|
||||||
@@ -88,24 +80,6 @@ extern "C" {
|
|||||||
/****************************************************************
|
/****************************************************************
|
||||||
* Memory I/O
|
* Memory I/O
|
||||||
*****************************************************************/
|
*****************************************************************/
|
||||||
/* MEM_FORCE_MEMORY_ACCESS
|
|
||||||
* By default, access to unaligned memory is controlled by `memcpy()`, which is safe and portable.
|
|
||||||
* Unfortunately, on some target/compiler combinations, the generated assembly is sub-optimal.
|
|
||||||
* The below switch allow to select different access method for improved performance.
|
|
||||||
* Method 0 (default) : use `memcpy()`. Safe and portable.
|
|
||||||
* Method 1 : `__packed` statement. It depends on compiler extension (ie, not portable).
|
|
||||||
* This method is safe if your compiler supports it, and *generally* as fast or faster than `memcpy`.
|
|
||||||
* Method 2 : direct access. This method is portable but violate C standard.
|
|
||||||
* It can generate buggy code on targets generating assembly depending on alignment.
|
|
||||||
* But in some circumstances, it's the only known way to get the most performance (ie GCC + ARMv6)
|
|
||||||
* See http://fastcompression.blogspot.fr/2015/08/accessing-unaligned-memory.html for details.
|
|
||||||
* Prefer these methods in priority order (0 > 1 > 2)
|
|
||||||
*/
|
|
||||||
#ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */
|
|
||||||
# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__)
|
|
||||||
# define MEM_FORCE_MEMORY_ACCESS 1
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
MEM_STATIC unsigned MEM_32bits(void) { return sizeof(void*)==4; }
|
||||||
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
MEM_STATIC unsigned MEM_64bits(void) { return sizeof(void*)==8; }
|
||||||
@@ -116,33 +90,6 @@ MEM_STATIC unsigned MEM_isLittleEndian(void)
|
|||||||
return one.c[0];
|
return one.c[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==2)
|
|
||||||
|
|
||||||
/* violates C standard on structure alignment.
|
|
||||||
Only use if no other choice to achieve best performance on target platform */
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr) { return *(const U16*) memPtr; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* memPtr) { return *(const U32*) memPtr; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* memPtr) { return *(const U64*) memPtr; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { *(U16*)memPtr = value; }
|
|
||||||
|
|
||||||
#elif defined(MEM_FORCE_MEMORY_ACCESS) && (MEM_FORCE_MEMORY_ACCESS==1)
|
|
||||||
|
|
||||||
/* __pack instructions are safer, but compiler specific, hence potentially problematic for some compilers */
|
|
||||||
/* currently only defined for gcc and icc */
|
|
||||||
typedef union { U16 u16; U32 u32; U64 u64; } __attribute__((packed)) unalign;
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* ptr) { return ((const unalign*)ptr)->u16; }
|
|
||||||
MEM_STATIC U32 MEM_read32(const void* ptr) { return ((const unalign*)ptr)->u32; }
|
|
||||||
MEM_STATIC U64 MEM_read64(const void* ptr) { return ((const unalign*)ptr)->u64; }
|
|
||||||
|
|
||||||
MEM_STATIC void MEM_write16(void* memPtr, U16 value) { ((unalign*)memPtr)->u16 = value; }
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/* default method, safe and standard.
|
|
||||||
can sometimes prove slower */
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
MEM_STATIC U16 MEM_read16(const void* memPtr)
|
||||||
{
|
{
|
||||||
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
U16 val; memcpy(&val, memPtr, sizeof(val)); return val;
|
||||||
@@ -163,9 +110,6 @@ MEM_STATIC void MEM_write16(void* memPtr, U16 value)
|
|||||||
memcpy(memPtr, &value, sizeof(value));
|
memcpy(memPtr, &value, sizeof(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MEM_FORCE_MEMORY_ACCESS */
|
|
||||||
|
|
||||||
|
|
||||||
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
MEM_STATIC U16 MEM_readLE16(const void* memPtr)
|
||||||
{
|
{
|
||||||
if (MEM_isLittleEndian())
|
if (MEM_isLittleEndian())
|
||||||
@@ -543,7 +487,7 @@ If there is an error, the function will return an error code, which can be teste
|
|||||||
header file (to include)
|
header file (to include)
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -701,7 +645,7 @@ MEM_STATIC size_t BIT_lookBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*! BIT_lookBitsFast :
|
/*! BIT_lookBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_lookBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
const U32 bitMask = sizeof(bitD->bitContainer)*8 - 1;
|
||||||
@@ -721,7 +665,7 @@ MEM_STATIC size_t BIT_readBits(BIT_DStream_t* bitD, U32 nbBits)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*!BIT_readBitsFast :
|
/*!BIT_readBitsFast :
|
||||||
* unsafe version; only works only if nbBits >= 1 */
|
* unsafe version; only works if nbBits >= 1 */
|
||||||
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
MEM_STATIC size_t BIT_readBitsFast(BIT_DStream_t* bitD, U32 nbBits)
|
||||||
{
|
{
|
||||||
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
size_t value = BIT_lookBitsFast(bitD, nbBits);
|
||||||
@@ -782,7 +726,7 @@ MEM_STATIC unsigned BIT_endOfDStream(const BIT_DStream_t* DStream)
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -931,7 +875,7 @@ MEM_STATIC unsigned FSE_endOfDState(const FSE_DState_t* DStatePtr)
|
|||||||
FSE : Finite State Entropy coder
|
FSE : Finite State Entropy coder
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1437,7 +1381,7 @@ static size_t FSE_decompress(void* dst, size_t maxDstSize, const void* cSrc, siz
|
|||||||
header file
|
header file
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1515,7 +1459,7 @@ static unsigned HUF_isError(size_t code); /* tells if a return value i
|
|||||||
header file for static linking (only)
|
header file for static linking (only)
|
||||||
Copyright (C) 2013-2015, Yann Collet
|
Copyright (C) 2013-2015, Yann Collet
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -1602,7 +1546,7 @@ static size_t HUF_decompress4X4_usingDTable(void* dst, size_t maxDstSize, const
|
|||||||
Huff0 : Huffman coder, part of New Generation Entropy library
|
Huff0 : Huffman coder, part of New Generation Entropy library
|
||||||
Copyright (C) 2013-2015, Yann Collet.
|
Copyright (C) 2013-2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2402,7 +2346,7 @@ static size_t HUF_decompress (void* dst, size_t dstSize, const void* cSrc, size_
|
|||||||
zstd - decompression module fo v0.4 legacy format
|
zstd - decompression module fo v0.4 legacy format
|
||||||
Copyright (C) 2015-2016, Yann Collet.
|
Copyright (C) 2015-2016, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -2877,13 +2821,19 @@ static size_t ZSTD_execSequence(BYTE* op,
|
|||||||
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
const BYTE* const litEnd = *litPtr + sequence.litLength;
|
||||||
const BYTE* match = oLitEnd - sequence.offset;
|
const BYTE* match = oLitEnd - sequence.offset;
|
||||||
|
|
||||||
/* check */
|
/* checks */
|
||||||
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall); /* last match must start at a minimum distance of 8 from oend */
|
size_t const seqLength = sequence.litLength + sequence.matchLength;
|
||||||
|
|
||||||
|
if (seqLength > (size_t)(oend - op)) return ERROR(dstSize_tooSmall);
|
||||||
|
if (sequence.litLength > (size_t)(litLimit - *litPtr)) return ERROR(corruption_detected);
|
||||||
|
/* Now we know there are no overflow in literal nor match lengths, can use pointer checks */
|
||||||
|
if (oLitEnd > oend_8) return ERROR(dstSize_tooSmall);
|
||||||
|
|
||||||
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
if (oMatchEnd > oend) return ERROR(dstSize_tooSmall); /* overwrite beyond dst buffer */
|
||||||
if (litEnd > litLimit) return ERROR(corruption_detected); /* risk read beyond lit buffer */
|
if (litEnd > litLimit) return ERROR(corruption_detected); /* overRead beyond lit buffer */
|
||||||
|
|
||||||
/* copy Literals */
|
/* copy Literals */
|
||||||
ZSTD_wildcopy(op, *litPtr, sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
ZSTD_wildcopy(op, *litPtr, (ptrdiff_t)sequence.litLength); /* note : oLitEnd <= oend-8 : no risk of overwrite beyond oend */
|
||||||
op = oLitEnd;
|
op = oLitEnd;
|
||||||
*litPtr = litEnd; /* update for next sequence */
|
*litPtr = litEnd; /* update for next sequence */
|
||||||
|
|
||||||
@@ -3261,6 +3211,7 @@ static size_t ZSTD_decompressContinue(ZSTD_DCtx* ctx, void* dst, size_t maxDstSi
|
|||||||
}
|
}
|
||||||
ctx->stage = ZSTDds_decodeBlockHeader;
|
ctx->stage = ZSTDds_decodeBlockHeader;
|
||||||
ctx->expected = ZSTD_blockHeaderSize;
|
ctx->expected = ZSTD_blockHeaderSize;
|
||||||
|
if (ZSTD_isError(rSize)) return rSize;
|
||||||
ctx->previousDstEnd = (char*)dst + rSize;
|
ctx->previousDstEnd = (char*)dst + rSize;
|
||||||
return rSize;
|
return rSize;
|
||||||
}
|
}
|
||||||
@@ -3284,7 +3235,7 @@ static void ZSTD_decompress_insertDictionary(ZSTD_DCtx* ctx, const void* dict, s
|
|||||||
Buffered version of Zstd compression library
|
Buffered version of Zstd compression library
|
||||||
Copyright (C) 2015, Yann Collet.
|
Copyright (C) 2015, Yann Collet.
|
||||||
|
|
||||||
BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
|
BSD 2-Clause License (https://opensource.org/licenses/bsd-license.php)
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions are
|
modification, are permitted provided that the following conditions are
|
||||||
@@ -3588,8 +3539,8 @@ static size_t ZBUFF_decompressContinue(ZBUFF_DCtx* zbc, void* dst, size_t* maxDs
|
|||||||
unsigned ZBUFFv04_isError(size_t errorCode) { return ERR_isError(errorCode); }
|
unsigned ZBUFFv04_isError(size_t errorCode) { return ERR_isError(errorCode); }
|
||||||
const char* ZBUFFv04_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
|
const char* ZBUFFv04_getErrorName(size_t errorCode) { return ERR_getErrorName(errorCode); }
|
||||||
|
|
||||||
size_t ZBUFFv04_recommendedDInSize() { return BLOCKSIZE + 3; }
|
size_t ZBUFFv04_recommendedDInSize(void) { return BLOCKSIZE + 3; }
|
||||||
size_t ZBUFFv04_recommendedDOutSize() { return BLOCKSIZE; }
|
size_t ZBUFFv04_recommendedDOutSize(void) { return BLOCKSIZE; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
vendor/github.com/DataDog/zstd/zstd_v04.h
generated
vendored
2
vendor/github.com/DataDog/zstd/zstd_v04.h
generated
vendored
@@ -1,6 +1,6 @@
|
|||||||
#ifndef USE_EXTERNAL_ZSTD
|
#ifndef USE_EXTERNAL_ZSTD
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Yann Collet, Facebook, Inc.
|
* Copyright (c) Yann Collet, Meta Platforms, Inc. and affiliates.
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* This source code is licensed under both the BSD-style license (found in the
|
* This source code is licensed under both the BSD-style license (found in the
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user