Tighten up the tights in the optimized (de)serialization code

git-svn-id: http://svn.internal.itasoftware.com/svn/ita/trunk/qres/lisp/quux/protobufs@542011 f8382938-511b-0410-9cdd-bb47b084005c

diff --git a/examples.lisp b/examples.lisp
index 3f60270ba9c84d7efa9225e1e2cf88e0fd69a083..897f7ce17d008c0ae24d3da6d8962b0bccca6b8c 100644 (file)
--- a/examples.lisp
+++ b/examples.lisp
@@ -69,9 +69,9 @@
                      qres-core::airport
                      qres-core::timezone
                      qres-core::tz-variation
-                     qres-core::carrier
                      qres-core::currency
                      qres-core::country-currencies
+                     qres-core::carrier
                      geodata)))
 
 (proto:write-protobuf bizd-schema)
@@ -94,9 +94,9 @@
                  qres-core::airport
                  qres-core::timezone
                  qres-core::tz-variation
-                 qres-core::carrier
                  qres-core::currency
                  qres-core::country-currencies
+                 qres-core::carrier
                  geodata))
   (let ((message (proto-impl:find-message bizd-schema class)))
     (eval (proto-impl:generate-object-size  message))

diff --git a/wire-format.lisp b/wire-format.lisp
index d58bded5d775cdca02b86d02175881beff895eca..388d3db0c85c07bcf6dfe9d2bd7ecbe1abbea069 100644 (file)
--- a/wire-format.lisp
+++ b/wire-format.lisp
@@ -162,7 +162,10 @@
   (if (member type '(:int32 :uint32 :int64 :uint64 :sint32 :sint64
                      :fixed32 :sfixed32 :fixed64 :sfixed64
                      :string :bytes :bool :float :double))
-    `(locally (declare (optimize (speed 3) (safety 0) (debug 0)))
+    `(locally (declare (optimize (speed 3) (safety 0) (debug 0))
+                       (type (simple-array (unsigned-byte 8)) ,buffer)
+                       ;; 'tag' is a constant, no need to declare its type
+                       (type fixnum ,index))
        (let ((idx (encode-uint32 ,tag ,buffer ,index)))
          (declare (type fixnum idx))
          ,(ecase type
@@ -245,7 +248,9 @@
   (if (member type '(:int32 :uint32 :int64 :uint64 :sint32 :sint64
                      :fixed32 :sfixed32 :fixed64 :sfixed64
                      :float :double))
-    `(locally (declare (optimize (speed 3) (safety 0) (debug 0)))
+    `(locally (declare (optimize (speed 3) (safety 0) (debug 0))
+                       (type (simple-array (unsigned-byte 8)) ,buffer)
+                       (type fixnum ,index))
        (let ((idx (encode-uint32 ,tag ,buffer ,index)))
          (declare (type fixnum idx))
          (multiple-value-bind (full-len len)
@@ -350,7 +355,9 @@
   (if (member type '(:int32 :uint32 :int64 :uint64 :sint32 :sint64
                      :fixed32 :sfixed32 :fixed64 :sfixed64
                      :string :bytes :bool :float :double))
-    `(locally (declare (optimize (speed 3) (safety 0) (debug 0)))
+    `(locally (declare (optimize (speed 3) (safety 0) (debug 0))
+                       (type (simple-array (unsigned-byte 8)) ,buffer)
+                       (type fixnum ,index))
        ,(ecase type
           ((:int32 :uint32)
            `(decode-uint32 ,buffer ,index))
@@ -433,6 +440,53 @@
               (collect-value val)
               (setq idx nidx))))))))
 
+(define-compiler-macro deserialize-packed (&whole form type buffer index)
+  (if (member type '(:int32 :uint32 :int64 :uint64 :sint32 :sint64
+                     :fixed32 :sfixed32 :fixed64 :sfixed64
+                     :float :double))
+    `(locally (declare (optimize (speed 3) (safety 0) (debug 0))
+                       (type (simple-array (unsigned-byte 8)) ,buffer)
+                       (type fixnum ,index))
+       (multiple-value-bind (len idx)
+           (decode-uint32 .buffer ,index)
+         (declare (type (unsigned-byte 32) len)
+                  (type fixnum idx))
+         (let ((end (i+ idx len)))
+           (declare (type (unsigned-byte 32) end))
+           (with-collectors ((values collect-value))
+             (loop
+               (when (>= idx end)
+                 (return-from deserialize-packed (values values idx)))
+               (multiple-value-bind (val nidx)
+                   ,(ecase type
+                      ((:int32 :uint32)
+                       `(decode-uint32 ,buffer idx))
+                      ((:int64 :uint64)
+                       `(decode-uint64 ,buffer idx))
+                      ((:sint32)
+                       `(multiple-value-bind (val idx)
+                            (decode-uint32 ,buffer idx)
+                          (values (zig-zag-decode32 val) idx)))
+                      ((:sint64)
+                       `(multiple-value-bind (val idx)
+                            (decode-uint64 ,buffer idx)
+                          (values (zig-zag-decode64 val) idx)))
+                      ((:fixed32)
+                       `(decode-fixed32 ,buffer idx))
+                      ((:sfixed32)
+                       `(decode-sfixed32 ,buffer idx))
+                      ((:fixed64)
+                       `(decode-fixed64 ,buffer idx))
+                      ((:sfixed64)
+                       `(decode-sfixed64 ,buffer idx))
+                      ((:float)
+                       `(decode-single ,buffer idx))
+                      ((:double)
+                       `(decode-double ,buffer idx)))
+                 (collect-value val)
+                 (setq idx nidx)))))))
+    form))
+
 (defun deserialize-enum (values buffer index)
   "Deserializes the next enum value take from 'values'.
    Deserializes from the byte vector 'buffer' starting at 'index'.