aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-16 21:42:27 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-16 23:14:05 +0100
commit3597c0396b9bd6440c02462107c743c6aeb29672 (patch)
tree20274331d7f3a3100cb771b6c729322266b23d37
parent584e46b1e03c18755ee4527164d751ddb20d8d18 (diff)
downloadguix-3597c0396b9bd6440c02462107c743c6aeb29672.tar.gz
guix-3597c0396b9bd6440c02462107c743c6aeb29672.zip
lzlib: Define 'dictionary-size+match-length-limit'.
* guix/lzlib.scm (%compression-levels): Splice the rest of each element. (dictionary-size+match-length-limit): New procedure. (make-lzip-output-port, make-lzip-input-port/compressed): Use it. * tests/lzlib.scm ("Bytevector of size relative to Lzip internal buffers (2 * dictionary)"): Use 'dictionary-size+match-length-limit' instead of 'assoc-ref'.
-rw-r--r--guix/lzlib.scm42
-rw-r--r--tests/lzlib.scm3
2 files changed, 27 insertions, 18 deletions
diff --git a/guix/lzlib.scm b/guix/lzlib.scm
index 24c7b4b448..2fc326ba34 100644
--- a/guix/lzlib.scm
+++ b/guix/lzlib.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
-;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,7 +32,8 @@
call-with-lzip-input-port
call-with-lzip-output-port
%default-member-length-limit
- %default-compression-level))
+ %default-compression-level
+ dictionary-size+match-length-limit))
;;; Commentary:
;;;
@@ -569,20 +570,27 @@ the number of uncompressed bytes written, a non-negative integer."
;; Alist of (levels (dictionary-size match-length-limit)). 0 is the fastest.
;; See bbexample.c in lzlib's source.
(define %compression-levels
- `((0 (65535 16))
- (1 (,(bitwise-arithmetic-shift-left 1 20) 5))
- (2 (,(bitwise-arithmetic-shift-left 3 19) 6))
- (3 (,(bitwise-arithmetic-shift-left 1 21) 8))
- (4 (,(bitwise-arithmetic-shift-left 3 20) 12))
- (5 (,(bitwise-arithmetic-shift-left 1 22) 20))
- (6 (,(bitwise-arithmetic-shift-left 1 23) 36))
- (7 (,(bitwise-arithmetic-shift-left 1 24) 68))
- (8 (,(bitwise-arithmetic-shift-left 3 23) 132))
- (9 (,(bitwise-arithmetic-shift-left 1 25) 273))))
+ `((0 65535 16)
+ (1 ,(bitwise-arithmetic-shift-left 1 20) 5)
+ (2 ,(bitwise-arithmetic-shift-left 3 19) 6)
+ (3 ,(bitwise-arithmetic-shift-left 1 21) 8)
+ (4 ,(bitwise-arithmetic-shift-left 3 20) 12)
+ (5 ,(bitwise-arithmetic-shift-left 1 22) 20)
+ (6 ,(bitwise-arithmetic-shift-left 1 23) 36)
+ (7 ,(bitwise-arithmetic-shift-left 1 24) 68)
+ (8 ,(bitwise-arithmetic-shift-left 3 23) 132)
+ (9 ,(bitwise-arithmetic-shift-left 1 25) 273)))
(define %default-compression-level
6)
+(define (dictionary-size+match-length-limit level)
+ "Return two values: the dictionary size for LEVEL, and its match-length
+limit. LEVEL must be a compression level, an integer between 0 and 9."
+ (match (assv-ref %compression-levels level)
+ ((dictionary-size match-length-limit)
+ (values dictionary-size match-length-limit))))
+
(define* (make-lzip-input-port port)
"Return an input port that decompresses data read from PORT, a file port.
PORT is automatically closed when the resulting port is closed."
@@ -602,8 +610,9 @@ PORT is automatically closed when the resulting port is closed."
"Return an output port that compresses data at the given LEVEL, using PORT,
a file port, as its sink. PORT is automatically closed when the resulting
port is closed."
- (define encoder (apply lz-compress-open
- (car (assoc-ref %compression-levels level))))
+ (define encoder
+ (call-with-values (lambda () (dictionary-size+match-length-limit level))
+ lz-compress-open))
(define (write! bv start count)
(lzwrite encoder bv port start count))
@@ -626,8 +635,9 @@ port is closed."
(level %default-compression-level))
"Return an input port that compresses data read from PORT, with the given LEVEL.
PORT is automatically closed when the resulting port is closed."
- (define encoder (apply lz-compress-open
- (car (assoc-ref %compression-levels level))))
+ (define encoder
+ (call-with-values (lambda () (dictionary-size+match-length-limit level))
+ lz-compress-open))
(define input-buffer (make-bytevector 8192))
(define input-len 0)
diff --git a/tests/lzlib.scm b/tests/lzlib.scm
index d8d0e6edf8..63d1e15641 100644
--- a/tests/lzlib.scm
+++ b/tests/lzlib.scm
@@ -87,8 +87,7 @@
(test-assert* "Bytevector of size relative to Lzip internal buffers (2 * dictionary)"
(compress-and-decompress
(random-bytevector
- (* 2 (car (car (assoc-ref (@@ (guix lzlib) %compression-levels)
- (@@ (guix lzlib) %default-compression-level))))))))
+ (* 2 (dictionary-size+match-length-limit %default-compression-level)))))
(test-assert* "Bytevector of size relative to Lzip internal buffers (64KiB)"
(compress-and-decompress (random-bytevector (* 64 1024))))