Files
Ayush RanjanandgVisor bot ce4f4283ba Make {Un}Marshal{Bytes/Unsafe} return remaining buffer.
Change marshal.Marshallable method signatures to return the remaining buffer.
This makes it easier to implement these method manually. Without this, we would
have to manually do buffer shifting which is error prone.

tools/go_marshal/test:benchmark test does not show change in performance.
Additionally fixed some marshalling bugs in fsimpl/fuse.

Updated multiple callpoints to get rid of redundant slice indexing work and
simplified code using this new signature.

Updates #6450

PiperOrigin-RevId: 407857019
2021-11-05 10:43:49 -07:00

84 lines
2.4 KiB
Go

// Copyright 2021 The gVisor Authors.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package test
import "gvisor.dev/gvisor/pkg/marshal/primitive"
// Type12Dynamic is a dynamically sized struct which depends on the
// autogenerator to generate some Marshallable methods for it.
//
// +marshal dynamic
type Type12Dynamic struct {
X primitive.Int64
Y []primitive.Int64
}
// SizeBytes implements marshal.Marshallable.SizeBytes.
func (t *Type12Dynamic) SizeBytes() int {
return (len(t.Y) * 8) + t.X.SizeBytes()
}
// MarshalBytes implements marshal.Marshallable.MarshalBytes.
func (t *Type12Dynamic) MarshalBytes(dst []byte) []byte {
dst = t.X.MarshalBytes(dst)
for _, x := range t.Y {
dst = x.MarshalBytes(dst)
}
return dst
}
// UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes.
func (t *Type12Dynamic) UnmarshalBytes(src []byte) []byte {
src = t.X.UnmarshalBytes(src)
if t.Y != nil {
t.Y = t.Y[:0]
}
for len(src) > 0 {
var x primitive.Int64
src = x.UnmarshalBytes(src)
t.Y = append(t.Y, x)
}
return src
}
// Type13Dynamic is a dynamically sized struct which depends on the
// autogenerator to generate some Marshallable methods for it.
//
// It represents a string in memory which is preceded by a uint32 indicating
// the string size.
//
// +marshal dynamic
type Type13Dynamic string
// SizeBytes implements marshal.Marshallable.SizeBytes.
func (t *Type13Dynamic) SizeBytes() int {
return (*primitive.Uint32)(nil).SizeBytes() + len(*t)
}
// MarshalBytes implements marshal.Marshallable.MarshalBytes.
func (t *Type13Dynamic) MarshalBytes(dst []byte) []byte {
strLen := primitive.Uint32(len(*t))
dst = strLen.MarshalBytes(dst)
return dst[copy(dst[:strLen], *t):]
}
// UnmarshalBytes implements marshal.Marshallable.UnmarshalBytes.
func (t *Type13Dynamic) UnmarshalBytes(src []byte) []byte {
var strLen primitive.Uint32
src = strLen.UnmarshalBytes(src)
*t = Type13Dynamic(src[:strLen])
return src[strLen:]
}