summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPiotr Szarmanski2022-12-30 09:00:15 +0100
committerPiotr Szarmanski2022-12-30 09:00:15 +0100
commit855e79b7ffa37ac64de51defa18104ed897576b3 (patch)
treea5dea5b592e40c20308d428e489bc57eb3c7cdda /src
parent618ee634557122b3b3c5012405603b28c0001d13 (diff)
Initial buffer reuse encoding commit
Diffstat (limited to 'src')
-rw-r--r--src/backend.lisp2
-rw-r--r--src/eris.lisp45
-rw-r--r--src/file-backend.lisp7
-rw-r--r--src/hash-backend.lisp5
-rw-r--r--src/package.lisp2
5 files changed, 31 insertions, 30 deletions
diff --git a/src/backend.lisp b/src/backend.lisp
index 9bb00d0..0230b24 100644
--- a/src/backend.lisp
+++ b/src/backend.lisp
@@ -22,7 +22,7 @@
(defclass decoding-backend ()
((fetch-function :type function)))
-(defgeneric fetch-read-capability (read-capability backend &key &allow-other-keys)
+(defgeneric fetch-data (read-capability backend &key &allow-other-keys)
(:documentation
"Using the BACKEND, return a stream that decodes the provided READ-CAPABILITY
object."))
diff --git a/src/eris.lisp b/src/eris.lisp
index 91200a1..d86934b 100644
--- a/src/eris.lisp
+++ b/src/eris.lisp
@@ -166,38 +166,37 @@ versioning bytes are not supported by eris-cl."
(defvar *output-hashmap* nil)
-(defmacro output-block (ref-vector &rest expr)
+(defmacro output-block (ref-vector)
`(let ((reference (compute-reference block)))
(if hash-output
(unless (gethash reference *output-hashmap*)
(let ((rk (encrypt-block block secret reference)))
(vector-push-extend rk ,ref-vector)
- (funcall output-function block (reference rk))
- (setf (gethash reference *output-hashmap*) t)))
+ (setf (gethash reference *output-hashmap*) t)
+ (funcall output-function block (reference rk))))
(let ((rk (encrypt-block block secret reference)))
(vector-push-extend rk ,ref-vector)
- (funcall output-function block (reference rk))))
- ,@expr))
+ (funcall output-function block (reference rk))))))
-(defmacro output-internal-block (ref-vector nonce &rest expr)
+(defmacro output-internal-block (ref-vector nonce)
`(let ((reference (compute-reference block)))
(if hash-output
(unless (gethash reference *output-hashmap*)
(let ((rk (encrypt-internal-block block reference ,nonce)))
(vector-push-extend rk ,ref-vector)
- (funcall output-function block (reference rk))
- (setf (gethash reference *output-hashmap*) t)))
+ (setf (gethash reference *output-hashmap*) t)
+ (funcall output-function block (reference rk))))
(let ((rk (encrypt-internal-block block reference ,nonce)))
(vector-push-extend rk ,ref-vector)
- (funcall output-function block (reference rk))))
- ,@expr))
+ (funcall output-function block (reference rk))))))
(defgeneric eris-encode (input block-size output-function &key secret hash-output)
(:documentation
"Encode an INPUT into BLOCK-SIZE (32kib or 1kib) blocks, that are output using
the function OUTPUT-FUNCTION. This function wil be called with two arguments: an
-encoded block and a 32-byte reference octet vector. Returns a read-capability
-object.
+encoded block and a 32-byte reference octet vector, and it MUST return
+a (SIMPLE-ARRAY (UNSIGNED-BYTE 8)) of equal size to the one given, which will be
+destructively modified. Returns a read-capability object.
An optional 32-byte secret can be passed for additional encryption using the
SECRET keyword argument.
@@ -215,11 +214,11 @@ guarantee that a reference is only output once."))
(let ((reference-vector (make-array 16 :adjustable t :fill-pointer 0))
(*output-hashmap* (if hash-output (make-hash-table :test #'equalp) nil)))
(loop for block = (make-array block-size :element-type 'octet :initial-element 0)
+ ;; then (output-block reference-vector)
for i = 0 then (incf i)
until (= (length input) (* i block-size))
- do (progn
- (replace block input :start2 (* i block-size))
- (output-block reference-vector nil)))
+ do (progn (replace block input :start2 (* i block-size))
+ (setf block (output-block reference-vector))))
(eris-create-tree reference-vector block-size output-function :hash-output hash-output)))
(defmethod eris-encode ((input stream) block-size output-function &key (secret null-secret) hash-output)
@@ -230,11 +229,12 @@ guarantee that a reference is only output once."))
(let ((reference-vector (make-array 16 :adjustable t :fill-pointer 0))
(*output-hashmap* (if hash-output (make-hash-table :test #'equalp) nil)))
(loop for block = (make-array block-size :element-type 'octet :initial-element 0)
+ ;;then (output-block reference-vector)
for bytes-read = (read-sequence block input)
for i = 0 then (incf i)
if (< bytes-read block-size)
do (setf (aref block bytes-read) #x80)
- do (output-block reference-vector nil)
+ do (setf block (output-block reference-vector))
until (< bytes-read block-size))
(eris-create-tree reference-vector block-size output-function :hash-output hash-output)))
@@ -246,10 +246,10 @@ guarantee that a reference is only output once."))
with reference-vector-l = (make-array 16 :adjustable t :fill-pointer 0)
for nonce = (make-nonce (1+ level))
when (eql (length reference-vector) 1)
- do (return (make-instance 'read-capability
- :reference-pair (aref reference-vector 0)
- :level level
- :block-size block-size))
+ do (return (make-instance 'read-capability
+ :reference-pair (aref reference-vector 0)
+ :level level
+ :block-size block-size))
do (progn
(incf level)
;; loop across the key-reference vector and build the tree
@@ -257,9 +257,8 @@ guarantee that a reference is only output once."))
for rk across reference-vector
with i = 0
when (eql i block-keys)
- do (output-internal-block reference-vector-l nonce
- (setf block (make-array block-size :element-type 'octet :initial-element 0)
- i 0))
+ do (setf block (output-internal-block reference-vector-l nonce)
+ i 0)
do (progn (reference-pair-to-octets rk block (* 64 i))
(incf i))
finally (unless (zerop i)
diff --git a/src/file-backend.lisp b/src/file-backend.lisp
index 03e3ef7..1a1c5b0 100644
--- a/src/file-backend.lisp
+++ b/src/file-backend.lisp
@@ -51,9 +51,10 @@
(let* ((base32 (bytes-to-base32-unpadded reference))
(file (merge-pathnames directory base32)))
(unless (probe-file file)
- (alexandria:write-byte-vector-into-file block file)))))))
+ (alexandria:write-byte-vector-into-file block file)))
+ block))))
-(defmethod fetch-read-capability (read-capability (backend file-backend) &key &allow-other-keys)
+(defmethod fetch-data (read-capability (backend file-backend) &key &allow-other-keys)
(declare (type read-capability read-capability))
(with-slots (fetch-function) backend
(eris-decode read-capability fetch-function)))
@@ -65,7 +66,7 @@
(if (> (etypecase input
(stream (file-length input))
(vector (length input)))
- 16384)
+ (* 2 16384))
32kib
1kib)
output-function
diff --git a/src/hash-backend.lisp b/src/hash-backend.lisp
index 91dc673..c44c2d0 100644
--- a/src/hash-backend.lisp
+++ b/src/hash-backend.lisp
@@ -32,9 +32,10 @@
output-function (lambda (block reference)
(declare (type octet-vector block reference))
(setf (gethash reference hash-table)
- block))))))
+ block)
+ block)))))
-(defmethod fetch-read-capability (read-capability (backend hash-backend) &key &allow-other-keys)
+(defmethod fetch-data (read-capability (backend hash-backend) &key &allow-other-keys)
(declare (type read-capability read-capability))
(with-slots (fetch-function) backend
(eris-decode read-capability fetch-function :cache-capacity nil)))
diff --git a/src/package.lisp b/src/package.lisp
index c618c75..b5c7a4a 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -47,7 +47,7 @@
#:missing-block
#:store-data
- #:fetch-read-capability
+ #:fetch-data
#:encoding-backend
#:decoding-backend
#:file-backend