Add github.com/calmh/xdr

Does not support time.Time or floats.

Author: AudriusButkevicius

Makefile

@@ -1,7 +1,7 @@
 # This is necessary due to the use of two conflicting generator commands for capnproto
 .NOTPARALLEL:
 
-all: Colfer.go FlatBufferA.go msgp_gen.go structdef-gogo.pb.go structdef.pb.go structdef.capnp.go structdef.capnp2.go gencode.schema.gen.go gencode-unsafe.schema.gen.go
+all: Colfer.go FlatBufferA.go msgp_gen.go structdef-gogo.pb.go structdef.pb.go structdef.capnp.go structdef.capnp2.go gencode.schema.gen.go gencode-unsafe.schema.gen.go structdefxdr_generated.go
 
 Colfer.go:
 	colf go
@@ -33,16 +33,19 @@ structdef.capnp2.go: structdef.capnp2
 structdef.capnp.go: structdef.capnp
 	go get -u github.com/glycerine/go-capnproto/capnpc-go # conflicts with capnproto2
 	capnp compile -I${GOPATH}/src -ogo structdef.capnp
-	
+
 gencode.schema.gen.go: gencode.schema
 	gencode go -schema=gencode.schema -package=goserbench
-	
+
 gencode-unsafe.schema.gen.go: gencode-unsafe.schema
 	gencode go -schema=gencode-unsafe.schema -package=goserbench -unsafe
 
+structdefxdr_generated.go: structdefxdr.go
+	go generate
+
 .PHONY: clean
 clean:
-	rm -f Colfer.go FlatBufferA.go msgp_gen.go structdef-gogo.pb.go structdef.pb.go structdef.capnp.go structdef.capnp2.go gencode.schema.gen.go gencode-unsafe.schema.gen.go
+	rm -f Colfer.go FlatBufferA.go msgp_gen.go structdef-gogo.pb.go structdef.pb.go structdef.capnp.go structdef.capnp2.go gencode.schema.gen.go gencode-unsafe.schema.gen.go structdefxdr_generated.go
 
 .PHONY: install
 install:
@@ -65,3 +68,4 @@ install:
 	go get -u github.com/golang/protobuf/proto
 	go get -u github.com/hprose/hprose-go/io
 	go get -u github.com/pascaldekloe/colfer/cmd/colf
+	go get -u github.com/calmh/xdr

serialization_benchmarks_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/gob"
 	"encoding/json"
 	"fmt"
+	"math"
 	"math/rand"
 	"os"
 	"testing"
@@ -934,3 +935,58 @@ func BenchmarkGencodeUnsafeUnmarshal(b *testing.B) {
 		}
 	}
 }
+
+// github.com/calmh/xdr
+
+func generateXDR() []*XDRA {
+        a := make([]*XDRA, 0, 1000)
+        for i := 0; i < 1000; i++ {
+                a = append(a, &XDRA{
+                        Name:     randString(16),
+                        BirthDay: time.Now().UnixNano(),
+                        Phone:    randString(10),
+                        Siblings: rand.Int31n(5),
+                        Spouse:   rand.Intn(2) == 1,
+                        Money:    math.Float64bits(rand.Float64()),
+                })
+        }
+        return a
+}
+
+func BenchmarkXDR2Marshal(b *testing.B) {
+        b.StopTimer()
+        data := generateXDR()
+        b.ReportAllocs()
+        b.StartTimer()
+        for i := 0; i < b.N; i++ {
+                data[rand.Intn(len(data))].MarshalXDR()
+        }
+}
+
+func BenchmarkXDR2Unmarshal(b *testing.B) {
+        b.StopTimer()
+        data := generateXDR()
+        ser := make([][]byte, len(data))
+        for i, d := range data {
+                ser[i] = d.MustMarshalXDR()
+        }
+        b.ReportAllocs()
+        b.StartTimer()
+        for i := 0; i < b.N; i++ {
+                n := rand.Intn(len(ser))
+                o := XDRA{}
+                err := o.UnmarshalXDR(ser[n])
+                if err != nil {
+                        b.Fatalf("xdr failed to unmarshal: %s (%s)", err, ser[n])
+                }
+                // Validate unmarshalled data.
+                if validate != "" {
+                        i := data[n]
+                        correct := o.Name == i.Name && o.Phone == i.Phone && o.Siblings == i.Siblings && o.Spouse == i.Spouse && o.Money == i.Money && o.BirthDay == i.BirthDay
+                        if !correct {
+                                b.Fatalf("unmarshaled object differed:\n%v\n%v", i, o)
+                        }
+                }
+        }
+}
+

structdefxdr.go

@@ -0,0 +1,12 @@
+package goserbench
+
+//go:generate -command genxdr go run ../../calmh/xdr/cmd/genxdr/main.go
+//go:generate genxdr -o structdefxdr_generated.go structdefxdr.go
+type XDRA struct {
+	Name     string
+	BirthDay int64
+	Phone    string
+	Siblings int32
+	Spouse   bool
+	Money    uint64
+}

structdefxdr_generated.go

@@ -0,0 +1,92 @@
+// ************************************************************
+// This file is automatically generated by genxdr. Do not edit.
+// ************************************************************
+
+package goserbench
+
+import (
+	"github.com/calmh/xdr"
+)
+
+/*
+
+XDRA Structure:
+
+ 0                   1                   2                   3
+ 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+/                                                               /
+\                  Name (length + padded data)                  \
+/                                                               /
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                                                               |
++                      Birth Day (64 bits)                      +
+|                                                               |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+/                                                               /
+\                 Phone (length + padded data)                  \
+/                                                               /
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                           Siblings                            |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                      Spouse (V=0 or 1)                      |V|
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+|                                                               |
++                        Money (64 bits)                        +
+|                                                               |
++-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+
+struct XDRA {
+	string Name<>;
+	hyper BirthDay;
+	string Phone<>;
+	int Siblings;
+	bool Spouse;
+	unsigned hyper Money;
+}
+
+*/
+
+func (o XDRA) XDRSize() int {
+	return 4 + len(o.Name) + xdr.Padding(len(o.Name)) + 8 +
+		4 + len(o.Phone) + xdr.Padding(len(o.Phone)) + 4 + 4 + 8
+}
+
+func (o XDRA) MarshalXDR() ([]byte, error) {
+	buf := make([]byte, o.XDRSize())
+	m := &xdr.Marshaller{Data: buf}
+	return buf, o.MarshalXDRInto(m)
+}
+
+func (o XDRA) MustMarshalXDR() []byte {
+	bs, err := o.MarshalXDR()
+	if err != nil {
+		panic(err)
+	}
+	return bs
+}
+
+func (o XDRA) MarshalXDRInto(m *xdr.Marshaller) error {
+	m.MarshalString(o.Name)
+	m.MarshalUint64(uint64(o.BirthDay))
+	m.MarshalString(o.Phone)
+	m.MarshalUint32(uint32(o.Siblings))
+	m.MarshalBool(o.Spouse)
+	m.MarshalUint64(o.Money)
+	return m.Error
+}
+
+func (o *XDRA) UnmarshalXDR(bs []byte) error {
+	u := &xdr.Unmarshaller{Data: bs}
+	return o.UnmarshalXDRFrom(u)
+}
+func (o *XDRA) UnmarshalXDRFrom(u *xdr.Unmarshaller) error {
+	o.Name = u.UnmarshalString()
+	o.BirthDay = int64(u.UnmarshalUint64())
+	o.Phone = u.UnmarshalString()
+	o.Siblings = int32(u.UnmarshalUint32())
+	o.Spouse = u.UnmarshalBool()
+	o.Money = u.UnmarshalUint64()
+	return u.Error
+}