Merge pull request #1 from cloudflare/marek/serialize-without-interning

serialization: add method to serialize without ffi.string conversion

Author: vavrusa

Makefile

@@ -1,4 +1,4 @@
-VERSION:=0.1.3-1
+VERSION:=0.1.3-2
 CXXFLAGS:=-std=gnu++11 -g -Iproto -I/usr/local/include
 LDFLAGS:=-L/usr/local/lib -lcapnp -lkj -pthread
 CAPNP_TEST:=../capnp_test

capnp/compile.lua

@@ -524,8 +524,9 @@ end
 function comp_serialize(res, name)
     insert(res, format([[
 
-    serialize = function(data, p8, size)
-        if not p8 then
+    -- Serialize and return pointer to char[] and size
+    serialize_cdata = function(data, p8, size)
+        if p8 == nil then
             size = _M.%s.calc_size(data)
 
             p8 = get_str_buf(size)
@@ -543,9 +544,14 @@ function comp_serialize(res, name)
         -- skip header & struct pointer
         _M.%s.flat_serialize(data, p32 + 4)
 
+        return p8, size
+    end,
+
+    serialize = function(data, p8, size)
+        p8, size = _M.%s.serialize_cdata(data, p8, size)
         return ffi_string(p8, size)
     end,
-]], name, name, name))
+]], name, name, name, name))
 end
 
 function comp_flat_serialize(res, nodes, struct, fields, size, name)

lua-capnproto.rockspec

@@ -1,8 +1,8 @@
 package = "lua-capnproto"
-version = "0.1.3-1"
+version = "0.1.3-2"
 source = {
    url = "git://github.com/cloudflare/lua-capnproto",
-   tag = "v0.1.3-1",
+   tag = "v0.1.3-2",
 }
 description = {
    summary = "Lua-capnproto is a pure lua implementation of capnproto based on LuaJIT.",

tests/10-encode-decode.lua

@@ -741,4 +741,16 @@ function test_list_uint16_size()
     assert_equal(16 + 8 * 6 + 72, hw_capnp.T3.calc_size(data))
 end
 
+function test_serialize_cdata()
+    local data = {
+        i0 = 32,
+    }
+
+    assert_equal(128, hw_capnp.T1.calc_size(data))
+    local bin   = hw_capnp.T1.serialize(data)
+    local arr, len = hw_capnp.T1.serialize_cdata(data)
+    assert_equal(#bin, len)
+    assert_equal(bin, ffi.string(arr, len))
+end
+
 return _G